From 0d83ac87ee42e8a4d97f0b3e50b586d91eb56dc3 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 7 Jan 2023 13:24:16 -0800 Subject: [PATCH] Add DolphinCAudioSys Former-commit-id: cf0aa43e1627899ac3e2f095b35d272f3cdb5b80 --- asm/Kyoto/Audio/CStreamAudioManager.s | 12 +- asm/Kyoto/Audio/DolphinCAudioSys.s | 8 +- asm/MetroidPrime/CStateManager.s | 4 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 4 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 84 ++++---- asm/MetroidPrime/Enemies/CRidley.s | 232 ++++++++++----------- asm/MetroidPrime/Enemies/CSpacePirate.s | 64 +++--- asm/MetroidPrime/Player/CWorldLayerState.s | 4 +- asm/MetroidPrime/main.s | 6 +- configure.py | 2 +- include/Kyoto/Audio/CAudioSys.hpp | 32 ++- include/musyx/musyx.h | 4 +- src/Kyoto/Audio/DolphinCAudioSys.cpp | 62 ++++++ 13 files changed, 306 insertions(+), 212 deletions(-) create mode 100644 src/Kyoto/Audio/DolphinCAudioSys.cpp diff --git a/asm/Kyoto/Audio/CStreamAudioManager.s b/asm/Kyoto/Audio/CStreamAudioManager.s index 4dc6d5d4..00ad145a 100644 --- a/asm/Kyoto/Audio/CStreamAudioManager.s +++ b/asm/Kyoto/Audio/CStreamAudioManager.s @@ -1361,7 +1361,7 @@ __ct__20SDSPStreamCacheEntryFv: __sinit_CStreamAudioManager_cpp: /* 803665CC 0036352C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803665D0 00363530 7C 08 02 A6 */ mflr r0 -/* 803665D4 00363534 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 803665D4 00363534 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 803665D8 00363538 38 AD A9 18 */ addi r5, r13, "mNull__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 803665DC 0036353C 90 01 00 14 */ stw r0, 0x14(r1) /* 803665E0 00363540 3C 60 80 5A */ lis r3, lbl_805A6B60@ha @@ -1369,7 +1369,7 @@ __sinit_CStreamAudioManager_cpp: /* 803665E8 00363548 38 00 00 00 */ li r0, 0 /* 803665EC 0036354C 93 E1 00 0C */ stw r31, 0xc(r1) /* 803665F0 00363550 3B E6 05 50 */ addi r31, r6, lbl_80540550@l -/* 803665F4 00363554 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 803665F4 00363554 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 803665F8 00363558 94 A3 6B 60 */ stwu r5, lbl_805A6B60@l(r3) /* 803665FC 0036355C 38 BF 00 00 */ addi r5, r31, 0 /* 80366600 00363560 90 03 00 04 */ stw r0, 4(r3) @@ -1379,20 +1379,20 @@ __sinit_CStreamAudioManager_cpp: /* 80366610 00363570 3C 60 80 5A */ lis r3, lbl_805A6B90@ha /* 80366614 00363574 94 A3 6B 90 */ stwu r5, lbl_805A6B90@l(r3) /* 80366618 00363578 38 00 00 00 */ li r0, 0 -/* 8036661C 0036357C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8036661C 0036357C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80366620 00363580 38 BF 00 0C */ addi r5, r31, 0xc /* 80366624 00363584 90 03 00 04 */ stw r0, 4(r3) -/* 80366628 00363588 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80366628 00363588 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8036662C 0036358C 90 03 00 08 */ stw r0, 8(r3) /* 80366630 00363590 48 02 30 5D */ bl __register_global_object /* 80366634 00363594 38 AD A9 18 */ addi r5, r13, "mNull__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 80366638 00363598 3C 60 80 5A */ lis r3, lbl_805A6BA0@ha /* 8036663C 0036359C 94 A3 6B A0 */ stwu r5, lbl_805A6BA0@l(r3) /* 80366640 003635A0 38 00 00 00 */ li r0, 0 -/* 80366644 003635A4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80366644 003635A4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80366648 003635A8 38 BF 00 18 */ addi r5, r31, 0x18 /* 8036664C 003635AC 90 03 00 04 */ stw r0, 4(r3) -/* 80366650 003635B0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80366650 003635B0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80366654 003635B4 90 03 00 08 */ stw r0, 8(r3) /* 80366658 003635B8 48 02 30 35 */ bl __register_global_object /* 8036665C 003635BC 3C 60 80 36 */ lis r3, __ct__20SDSPStreamCacheEntryFv@ha diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s index ccc9c322..f1831790 100644 --- a/asm/Kyoto/Audio/DolphinCAudioSys.s +++ b/asm/Kyoto/Audio/DolphinCAudioSys.s @@ -2466,8 +2466,8 @@ lbl_8034C6D0: /* 8034C6E8 00349648 38 21 00 30 */ addi r1, r1, 0x30 /* 8034C6EC 0034964C 4E 80 00 20 */ blr -.global __ct__9CAudioSysFUcUcUcUcUi -__ct__9CAudioSysFUcUcUcUcUi: +.global __ct__9CAudioSysFccccUi +__ct__9CAudioSysFccccUi: /* 8034C6F0 00349650 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8034C6F4 00349654 7C 08 02 A6 */ mflr r0 /* 8034C6F8 00349658 39 40 00 01 */ li r10, 1 @@ -3457,9 +3457,9 @@ __sinit_DolphinCAudioSys_cpp: /* 8034D4A4 0034A404 38 81 00 08 */ addi r4, r1, 8 /* 8034D4A8 0034A408 38 63 67 CC */ addi r3, r3, mpDefaultInvalidString__9CAudioSys@l /* 8034D4AC 0034A40C 4B FF 0C B5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8034D4B0 0034A410 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8034D4B0 0034A410 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8034D4B4 0034A414 3C A0 80 4C */ lis r5, lbl_804BFF90@ha -/* 8034D4B8 0034A418 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8034D4B8 0034A418 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8034D4BC 0034A41C 38 A5 FF 90 */ addi r5, r5, lbl_804BFF90@l /* 8034D4C0 0034A420 48 03 C1 CD */ bl __register_global_object /* 8034D4C4 0034A424 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 84b7c281..d8403eb2 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -1932,9 +1932,9 @@ HashInstanceName__13CStateManagerFR12CInputStream: /* 8004521C 0004217C 38 81 00 08 */ addi r4, r1, 8 /* 80045220 00042180 38 63 C5 A4 */ addi r3, r3, lbl_8045C5A4@l /* 80045224 00042184 48 2F 8F 3D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80045228 00042188 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80045228 00042188 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8004522C 0004218C 3C A0 80 46 */ lis r5, lbl_8045C598@ha -/* 80045230 00042190 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80045230 00042190 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80045234 00042194 38 A5 C5 98 */ addi r5, r5, lbl_8045C598@l /* 80045238 00042198 48 34 44 55 */ bl __register_global_object /* 8004523C 0004219C 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 778432a9..ec3156bb 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -4130,9 +4130,9 @@ __sinit_CChozoGhost_cpp: /* 801428FC 0013F85C 38 81 00 08 */ addi r4, r1, 8 /* 80142900 0013F860 38 63 19 CC */ addi r3, r3, lbl_805719CC@l /* 80142904 0013F864 48 1F B8 5D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80142908 0013F868 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80142908 0013F868 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8014290C 0013F86C 3C A0 80 47 */ lis r5, lbl_8046C748@ha -/* 80142910 0013F870 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80142910 0013F870 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80142914 0013F874 38 A5 C7 48 */ addi r5, r5, lbl_8046C748@l /* 80142918 0013F878 48 24 6D 75 */ bl __register_global_object /* 8014291C 0013F87C 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index 4030a223..5c757172 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -14113,9 +14113,9 @@ __sinit_CFlyingPirate_cpp: /* 802006F4 001FD654 38 81 01 48 */ addi r4, r1, 0x148 /* 802006F8 001FD658 38 63 20 78 */ addi r3, r3, lbl_80572078@l /* 802006FC 001FD65C 48 13 DA 65 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200700 001FD660 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200700 001FD660 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200704 001FD664 38 BF 00 00 */ addi r5, r31, 0 -/* 80200708 001FD668 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200708 001FD668 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8020070C 001FD66C 48 18 8F 81 */ bl __register_global_object /* 80200710 001FD670 38 61 01 48 */ addi r3, r1, 0x148 /* 80200714 001FD674 48 13 D3 CD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14128,9 +14128,9 @@ __sinit_CFlyingPirate_cpp: /* 80200730 001FD690 38 81 01 38 */ addi r4, r1, 0x138 /* 80200734 001FD694 38 63 20 D8 */ addi r3, r3, lbl_805720D8@l /* 80200738 001FD698 48 13 DA 29 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8020073C 001FD69C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8020073C 001FD69C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200740 001FD6A0 38 BF 00 0C */ addi r5, r31, 0xc -/* 80200744 001FD6A4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200744 001FD6A4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200748 001FD6A8 48 18 8F 45 */ bl __register_global_object /* 8020074C 001FD6AC 38 61 01 38 */ addi r3, r1, 0x138 /* 80200750 001FD6B0 48 13 D3 91 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14143,9 +14143,9 @@ __sinit_CFlyingPirate_cpp: /* 8020076C 001FD6CC 38 81 01 28 */ addi r4, r1, 0x128 /* 80200770 001FD6D0 38 63 20 E8 */ addi r3, r3, lbl_805720E8@l /* 80200774 001FD6D4 48 13 D9 ED */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200778 001FD6D8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200778 001FD6D8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8020077C 001FD6DC 38 BF 00 18 */ addi r5, r31, 0x18 -/* 80200780 001FD6E0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200780 001FD6E0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200784 001FD6E4 48 18 8F 09 */ bl __register_global_object /* 80200788 001FD6E8 38 61 01 28 */ addi r3, r1, 0x128 /* 8020078C 001FD6EC 48 13 D3 55 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14158,9 +14158,9 @@ __sinit_CFlyingPirate_cpp: /* 802007A8 001FD708 38 81 01 18 */ addi r4, r1, 0x118 /* 802007AC 001FD70C 38 63 20 F8 */ addi r3, r3, lbl_805720F8@l /* 802007B0 001FD710 48 13 D9 B1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 802007B4 001FD714 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 802007B4 001FD714 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 802007B8 001FD718 38 BF 00 24 */ addi r5, r31, 0x24 -/* 802007BC 001FD71C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 802007BC 001FD71C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 802007C0 001FD720 48 18 8E CD */ bl __register_global_object /* 802007C4 001FD724 38 61 01 18 */ addi r3, r1, 0x118 /* 802007C8 001FD728 48 13 D3 19 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14173,9 +14173,9 @@ __sinit_CFlyingPirate_cpp: /* 802007E4 001FD744 38 81 01 08 */ addi r4, r1, 0x108 /* 802007E8 001FD748 38 63 21 08 */ addi r3, r3, lbl_80572108@l /* 802007EC 001FD74C 48 13 D9 75 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 802007F0 001FD750 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 802007F0 001FD750 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 802007F4 001FD754 38 BF 00 30 */ addi r5, r31, 0x30 -/* 802007F8 001FD758 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 802007F8 001FD758 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 802007FC 001FD75C 48 18 8E 91 */ bl __register_global_object /* 80200800 001FD760 38 61 01 08 */ addi r3, r1, 0x108 /* 80200804 001FD764 48 13 D2 DD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14188,9 +14188,9 @@ __sinit_CFlyingPirate_cpp: /* 80200820 001FD780 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80200824 001FD784 38 63 21 18 */ addi r3, r3, lbl_80572118@l /* 80200828 001FD788 48 13 D9 39 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8020082C 001FD78C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8020082C 001FD78C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200830 001FD790 38 BF 00 3C */ addi r5, r31, 0x3c -/* 80200834 001FD794 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200834 001FD794 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200838 001FD798 48 18 8E 55 */ bl __register_global_object /* 8020083C 001FD79C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80200840 001FD7A0 48 13 D2 A1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14202,9 +14202,9 @@ __sinit_CFlyingPirate_cpp: /* 80200858 001FD7B8 38 7F 00 FC */ addi r3, r31, 0xfc /* 8020085C 001FD7BC 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80200860 001FD7C0 48 13 D9 01 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200864 001FD7C4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200864 001FD7C4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200868 001FD7C8 38 BF 00 48 */ addi r5, r31, 0x48 -/* 8020086C 001FD7CC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8020086C 001FD7CC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200870 001FD7D0 48 18 8E 1D */ bl __register_global_object /* 80200874 001FD7D4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 80200878 001FD7D8 48 13 D2 69 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14217,9 +14217,9 @@ __sinit_CFlyingPirate_cpp: /* 80200894 001FD7F4 38 81 00 D8 */ addi r4, r1, 0xd8 /* 80200898 001FD7F8 38 63 00 10 */ addi r3, r3, 0x10 /* 8020089C 001FD7FC 48 13 D8 C5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 802008A0 001FD800 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 802008A0 001FD800 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 802008A4 001FD804 38 BF 00 54 */ addi r5, r31, 0x54 -/* 802008A8 001FD808 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 802008A8 001FD808 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 802008AC 001FD80C 48 18 8D E1 */ bl __register_global_object /* 802008B0 001FD810 38 61 00 D8 */ addi r3, r1, 0xd8 /* 802008B4 001FD814 48 13 D2 2D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14232,9 +14232,9 @@ __sinit_CFlyingPirate_cpp: /* 802008D0 001FD830 38 81 00 C8 */ addi r4, r1, 0xc8 /* 802008D4 001FD834 38 63 00 20 */ addi r3, r3, 0x20 /* 802008D8 001FD838 48 13 D8 89 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 802008DC 001FD83C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 802008DC 001FD83C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 802008E0 001FD840 38 BF 00 60 */ addi r5, r31, 0x60 -/* 802008E4 001FD844 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 802008E4 001FD844 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 802008E8 001FD848 48 18 8D A5 */ bl __register_global_object /* 802008EC 001FD84C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 802008F0 001FD850 48 13 D1 F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14247,9 +14247,9 @@ __sinit_CFlyingPirate_cpp: /* 8020090C 001FD86C 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80200910 001FD870 38 63 00 30 */ addi r3, r3, 0x30 /* 80200914 001FD874 48 13 D8 4D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200918 001FD878 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200918 001FD878 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8020091C 001FD87C 38 BF 00 6C */ addi r5, r31, 0x6c -/* 80200920 001FD880 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200920 001FD880 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200924 001FD884 48 18 8D 69 */ bl __register_global_object /* 80200928 001FD888 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8020092C 001FD88C 48 13 D1 B5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14262,9 +14262,9 @@ __sinit_CFlyingPirate_cpp: /* 80200948 001FD8A8 38 81 00 A8 */ addi r4, r1, 0xa8 /* 8020094C 001FD8AC 38 63 00 40 */ addi r3, r3, 0x40 /* 80200950 001FD8B0 48 13 D8 11 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200954 001FD8B4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200954 001FD8B4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200958 001FD8B8 38 BF 00 78 */ addi r5, r31, 0x78 -/* 8020095C 001FD8BC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8020095C 001FD8BC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200960 001FD8C0 48 18 8D 2D */ bl __register_global_object /* 80200964 001FD8C4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80200968 001FD8C8 48 13 D1 79 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14277,9 +14277,9 @@ __sinit_CFlyingPirate_cpp: /* 80200984 001FD8E4 38 81 00 98 */ addi r4, r1, 0x98 /* 80200988 001FD8E8 38 63 00 50 */ addi r3, r3, 0x50 /* 8020098C 001FD8EC 48 13 D7 D5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200990 001FD8F0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200990 001FD8F0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200994 001FD8F4 38 BF 00 84 */ addi r5, r31, 0x84 -/* 80200998 001FD8F8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200998 001FD8F8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8020099C 001FD8FC 48 18 8C F1 */ bl __register_global_object /* 802009A0 001FD900 38 61 00 98 */ addi r3, r1, 0x98 /* 802009A4 001FD904 48 13 D1 3D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14292,9 +14292,9 @@ __sinit_CFlyingPirate_cpp: /* 802009C0 001FD920 38 81 00 88 */ addi r4, r1, 0x88 /* 802009C4 001FD924 38 63 00 60 */ addi r3, r3, 0x60 /* 802009C8 001FD928 48 13 D7 99 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 802009CC 001FD92C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 802009CC 001FD92C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 802009D0 001FD930 38 BF 00 90 */ addi r5, r31, 0x90 -/* 802009D4 001FD934 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 802009D4 001FD934 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 802009D8 001FD938 48 18 8C B5 */ bl __register_global_object /* 802009DC 001FD93C 38 61 00 88 */ addi r3, r1, 0x88 /* 802009E0 001FD940 48 13 D1 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14307,9 +14307,9 @@ __sinit_CFlyingPirate_cpp: /* 802009FC 001FD95C 38 81 00 78 */ addi r4, r1, 0x78 /* 80200A00 001FD960 38 63 00 70 */ addi r3, r3, 0x70 /* 80200A04 001FD964 48 13 D7 5D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200A08 001FD968 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200A08 001FD968 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200A0C 001FD96C 38 BF 00 9C */ addi r5, r31, 0x9c -/* 80200A10 001FD970 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200A10 001FD970 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200A14 001FD974 48 18 8C 79 */ bl __register_global_object /* 80200A18 001FD978 38 61 00 78 */ addi r3, r1, 0x78 /* 80200A1C 001FD97C 48 13 D0 C5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14322,9 +14322,9 @@ __sinit_CFlyingPirate_cpp: /* 80200A38 001FD998 38 81 00 68 */ addi r4, r1, 0x68 /* 80200A3C 001FD99C 38 63 00 80 */ addi r3, r3, 0x80 /* 80200A40 001FD9A0 48 13 D7 21 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200A44 001FD9A4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200A44 001FD9A4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200A48 001FD9A8 38 BF 00 A8 */ addi r5, r31, 0xa8 -/* 80200A4C 001FD9AC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200A4C 001FD9AC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200A50 001FD9B0 48 18 8C 3D */ bl __register_global_object /* 80200A54 001FD9B4 38 61 00 68 */ addi r3, r1, 0x68 /* 80200A58 001FD9B8 48 13 D0 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14337,9 +14337,9 @@ __sinit_CFlyingPirate_cpp: /* 80200A74 001FD9D4 38 81 00 58 */ addi r4, r1, 0x58 /* 80200A78 001FD9D8 38 63 00 90 */ addi r3, r3, 0x90 /* 80200A7C 001FD9DC 48 13 D6 E5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200A80 001FD9E0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200A80 001FD9E0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200A84 001FD9E4 38 BF 00 B4 */ addi r5, r31, 0xb4 -/* 80200A88 001FD9E8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200A88 001FD9E8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200A8C 001FD9EC 48 18 8C 01 */ bl __register_global_object /* 80200A90 001FD9F0 38 61 00 58 */ addi r3, r1, 0x58 /* 80200A94 001FD9F4 48 13 D0 4D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14352,9 +14352,9 @@ __sinit_CFlyingPirate_cpp: /* 80200AB0 001FDA10 38 81 00 48 */ addi r4, r1, 0x48 /* 80200AB4 001FDA14 38 63 00 A0 */ addi r3, r3, 0xa0 /* 80200AB8 001FDA18 48 13 D6 A9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200ABC 001FDA1C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200ABC 001FDA1C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200AC0 001FDA20 38 BF 00 C0 */ addi r5, r31, 0xc0 -/* 80200AC4 001FDA24 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200AC4 001FDA24 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200AC8 001FDA28 48 18 8B C5 */ bl __register_global_object /* 80200ACC 001FDA2C 38 61 00 48 */ addi r3, r1, 0x48 /* 80200AD0 001FDA30 48 13 D0 11 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14367,9 +14367,9 @@ __sinit_CFlyingPirate_cpp: /* 80200AEC 001FDA4C 38 81 00 38 */ addi r4, r1, 0x38 /* 80200AF0 001FDA50 38 63 00 B0 */ addi r3, r3, 0xb0 /* 80200AF4 001FDA54 48 13 D6 6D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200AF8 001FDA58 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200AF8 001FDA58 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200AFC 001FDA5C 38 BF 00 CC */ addi r5, r31, 0xcc -/* 80200B00 001FDA60 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200B00 001FDA60 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200B04 001FDA64 48 18 8B 89 */ bl __register_global_object /* 80200B08 001FDA68 38 61 00 38 */ addi r3, r1, 0x38 /* 80200B0C 001FDA6C 48 13 CF D5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14382,9 +14382,9 @@ __sinit_CFlyingPirate_cpp: /* 80200B28 001FDA88 38 81 00 28 */ addi r4, r1, 0x28 /* 80200B2C 001FDA8C 38 63 00 C0 */ addi r3, r3, 0xc0 /* 80200B30 001FDA90 48 13 D6 31 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200B34 001FDA94 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200B34 001FDA94 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200B38 001FDA98 38 BF 00 D8 */ addi r5, r31, 0xd8 -/* 80200B3C 001FDA9C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200B3C 001FDA9C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200B40 001FDAA0 48 18 8B 4D */ bl __register_global_object /* 80200B44 001FDAA4 38 61 00 28 */ addi r3, r1, 0x28 /* 80200B48 001FDAA8 48 13 CF 99 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14397,9 +14397,9 @@ __sinit_CFlyingPirate_cpp: /* 80200B64 001FDAC4 38 81 00 18 */ addi r4, r1, 0x18 /* 80200B68 001FDAC8 38 63 00 D0 */ addi r3, r3, 0xd0 /* 80200B6C 001FDACC 48 13 D5 F5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200B70 001FDAD0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200B70 001FDAD0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200B74 001FDAD4 38 BF 00 E4 */ addi r5, r31, 0xe4 -/* 80200B78 001FDAD8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200B78 001FDAD8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200B7C 001FDADC 48 18 8B 11 */ bl __register_global_object /* 80200B80 001FDAE0 38 61 00 18 */ addi r3, r1, 0x18 /* 80200B84 001FDAE4 48 13 CF 5D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14412,9 +14412,9 @@ __sinit_CFlyingPirate_cpp: /* 80200BA0 001FDB00 38 81 00 08 */ addi r4, r1, 8 /* 80200BA4 001FDB04 38 63 00 E0 */ addi r3, r3, 0xe0 /* 80200BA8 001FDB08 48 13 D5 B9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 80200BAC 001FDB0C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80200BAC 001FDB0C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80200BB0 001FDB10 38 BF 00 F0 */ addi r5, r31, 0xf0 -/* 80200BB4 001FDB14 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80200BB4 001FDB14 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80200BB8 001FDB18 48 18 8A D5 */ bl __register_global_object /* 80200BBC 001FDB1C 38 61 00 08 */ addi r3, r1, 8 /* 80200BC0 001FDB20 48 13 CF 21 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 14166efb..c43accb9 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -9760,9 +9760,9 @@ __sinit_CRidley_cpp: /* 8025AA9C 002579FC 38 81 05 B8 */ addi r4, r1, 0x5b8 /* 8025AAA0 00257A00 38 63 24 04 */ addi r3, r3, lbl_80572404@l /* 8025AAA4 00257A04 48 0E 36 BD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AAA8 00257A08 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AAA8 00257A08 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AAAC 00257A0C 38 AE 00 00 */ addi r5, r14, 0 -/* 8025AAB0 00257A10 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AAB0 00257A10 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AAB4 00257A14 48 12 EB D9 */ bl __register_global_object /* 8025AAB8 00257A18 38 61 05 B8 */ addi r3, r1, 0x5b8 /* 8025AABC 00257A1C 48 0E 30 25 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9775,9 +9775,9 @@ __sinit_CRidley_cpp: /* 8025AAD8 00257A38 38 81 05 A8 */ addi r4, r1, 0x5a8 /* 8025AADC 00257A3C 38 63 25 14 */ addi r3, r3, lbl_80572514@l /* 8025AAE0 00257A40 48 0E 36 81 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AAE4 00257A44 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AAE4 00257A44 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AAE8 00257A48 38 AE 00 0C */ addi r5, r14, 0xc -/* 8025AAEC 00257A4C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AAEC 00257A4C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AAF0 00257A50 48 12 EB 9D */ bl __register_global_object /* 8025AAF4 00257A54 38 61 05 A8 */ addi r3, r1, 0x5a8 /* 8025AAF8 00257A58 48 0E 2F E9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9790,9 +9790,9 @@ __sinit_CRidley_cpp: /* 8025AB14 00257A74 38 81 05 98 */ addi r4, r1, 0x598 /* 8025AB18 00257A78 38 63 25 24 */ addi r3, r3, lbl_80572524@l /* 8025AB1C 00257A7C 48 0E 36 45 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AB20 00257A80 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AB20 00257A80 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AB24 00257A84 38 AE 00 18 */ addi r5, r14, 0x18 -/* 8025AB28 00257A88 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AB28 00257A88 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AB2C 00257A8C 48 12 EB 61 */ bl __register_global_object /* 8025AB30 00257A90 38 61 05 98 */ addi r3, r1, 0x598 /* 8025AB34 00257A94 48 0E 2F AD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9805,9 +9805,9 @@ __sinit_CRidley_cpp: /* 8025AB50 00257AB0 38 81 05 88 */ addi r4, r1, 0x588 /* 8025AB54 00257AB4 38 63 25 34 */ addi r3, r3, lbl_80572534@l /* 8025AB58 00257AB8 48 0E 36 09 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AB5C 00257ABC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AB5C 00257ABC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AB60 00257AC0 38 AE 00 24 */ addi r5, r14, 0x24 -/* 8025AB64 00257AC4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AB64 00257AC4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AB68 00257AC8 48 12 EB 25 */ bl __register_global_object /* 8025AB6C 00257ACC 38 61 05 88 */ addi r3, r1, 0x588 /* 8025AB70 00257AD0 48 0E 2F 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9819,9 +9819,9 @@ __sinit_CRidley_cpp: /* 8025AB88 00257AE8 38 6E 01 50 */ addi r3, r14, 0x150 /* 8025AB8C 00257AEC 38 81 05 78 */ addi r4, r1, 0x578 /* 8025AB90 00257AF0 48 0E 35 D1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AB94 00257AF4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AB94 00257AF4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AB98 00257AF8 38 AE 00 30 */ addi r5, r14, 0x30 -/* 8025AB9C 00257AFC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AB9C 00257AFC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025ABA0 00257B00 48 12 EA ED */ bl __register_global_object /* 8025ABA4 00257B04 38 61 05 78 */ addi r3, r1, 0x578 /* 8025ABA8 00257B08 48 0E 2F 39 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9834,9 +9834,9 @@ __sinit_CRidley_cpp: /* 8025ABC4 00257B24 38 81 05 68 */ addi r4, r1, 0x568 /* 8025ABC8 00257B28 38 63 00 10 */ addi r3, r3, 0x10 /* 8025ABCC 00257B2C 48 0E 35 95 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025ABD0 00257B30 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025ABD0 00257B30 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025ABD4 00257B34 38 AE 00 3C */ addi r5, r14, 0x3c -/* 8025ABD8 00257B38 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025ABD8 00257B38 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025ABDC 00257B3C 48 12 EA B1 */ bl __register_global_object /* 8025ABE0 00257B40 38 61 05 68 */ addi r3, r1, 0x568 /* 8025ABE4 00257B44 48 0E 2E FD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9849,9 +9849,9 @@ __sinit_CRidley_cpp: /* 8025AC00 00257B60 38 81 05 58 */ addi r4, r1, 0x558 /* 8025AC04 00257B64 38 63 00 20 */ addi r3, r3, 0x20 /* 8025AC08 00257B68 48 0E 35 59 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AC0C 00257B6C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AC0C 00257B6C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AC10 00257B70 38 AE 00 48 */ addi r5, r14, 0x48 -/* 8025AC14 00257B74 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AC14 00257B74 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AC18 00257B78 48 12 EA 75 */ bl __register_global_object /* 8025AC1C 00257B7C 38 61 05 58 */ addi r3, r1, 0x558 /* 8025AC20 00257B80 48 0E 2E C1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9864,9 +9864,9 @@ __sinit_CRidley_cpp: /* 8025AC3C 00257B9C 38 81 05 48 */ addi r4, r1, 0x548 /* 8025AC40 00257BA0 38 63 00 30 */ addi r3, r3, 0x30 /* 8025AC44 00257BA4 48 0E 35 1D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AC48 00257BA8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AC48 00257BA8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AC4C 00257BAC 38 AE 00 54 */ addi r5, r14, 0x54 -/* 8025AC50 00257BB0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AC50 00257BB0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AC54 00257BB4 48 12 EA 39 */ bl __register_global_object /* 8025AC58 00257BB8 38 61 05 48 */ addi r3, r1, 0x548 /* 8025AC5C 00257BBC 48 0E 2E 85 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9879,9 +9879,9 @@ __sinit_CRidley_cpp: /* 8025AC78 00257BD8 38 81 05 38 */ addi r4, r1, 0x538 /* 8025AC7C 00257BDC 38 63 00 40 */ addi r3, r3, 0x40 /* 8025AC80 00257BE0 48 0E 34 E1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AC84 00257BE4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AC84 00257BE4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AC88 00257BE8 38 AE 00 60 */ addi r5, r14, 0x60 -/* 8025AC8C 00257BEC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AC8C 00257BEC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AC90 00257BF0 48 12 E9 FD */ bl __register_global_object /* 8025AC94 00257BF4 38 61 05 38 */ addi r3, r1, 0x538 /* 8025AC98 00257BF8 48 0E 2E 49 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9894,9 +9894,9 @@ __sinit_CRidley_cpp: /* 8025ACB4 00257C14 38 81 05 28 */ addi r4, r1, 0x528 /* 8025ACB8 00257C18 38 63 00 50 */ addi r3, r3, 0x50 /* 8025ACBC 00257C1C 48 0E 34 A5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025ACC0 00257C20 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025ACC0 00257C20 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025ACC4 00257C24 38 AE 00 6C */ addi r5, r14, 0x6c -/* 8025ACC8 00257C28 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025ACC8 00257C28 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025ACCC 00257C2C 48 12 E9 C1 */ bl __register_global_object /* 8025ACD0 00257C30 38 61 05 28 */ addi r3, r1, 0x528 /* 8025ACD4 00257C34 48 0E 2E 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9909,9 +9909,9 @@ __sinit_CRidley_cpp: /* 8025ACF0 00257C50 38 81 05 18 */ addi r4, r1, 0x518 /* 8025ACF4 00257C54 38 63 00 60 */ addi r3, r3, 0x60 /* 8025ACF8 00257C58 48 0E 34 69 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025ACFC 00257C5C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025ACFC 00257C5C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AD00 00257C60 38 AE 00 78 */ addi r5, r14, 0x78 -/* 8025AD04 00257C64 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AD04 00257C64 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AD08 00257C68 48 12 E9 85 */ bl __register_global_object /* 8025AD0C 00257C6C 38 61 05 18 */ addi r3, r1, 0x518 /* 8025AD10 00257C70 48 0E 2D D1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9924,9 +9924,9 @@ __sinit_CRidley_cpp: /* 8025AD2C 00257C8C 38 81 05 08 */ addi r4, r1, 0x508 /* 8025AD30 00257C90 38 63 00 70 */ addi r3, r3, 0x70 /* 8025AD34 00257C94 48 0E 34 2D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AD38 00257C98 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AD38 00257C98 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AD3C 00257C9C 38 AE 00 84 */ addi r5, r14, 0x84 -/* 8025AD40 00257CA0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AD40 00257CA0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AD44 00257CA4 48 12 E9 49 */ bl __register_global_object /* 8025AD48 00257CA8 38 61 05 08 */ addi r3, r1, 0x508 /* 8025AD4C 00257CAC 48 0E 2D 95 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9939,9 +9939,9 @@ __sinit_CRidley_cpp: /* 8025AD68 00257CC8 38 81 04 F8 */ addi r4, r1, 0x4f8 /* 8025AD6C 00257CCC 38 63 00 80 */ addi r3, r3, 0x80 /* 8025AD70 00257CD0 48 0E 33 F1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AD74 00257CD4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AD74 00257CD4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AD78 00257CD8 38 AE 00 90 */ addi r5, r14, 0x90 -/* 8025AD7C 00257CDC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AD7C 00257CDC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AD80 00257CE0 48 12 E9 0D */ bl __register_global_object /* 8025AD84 00257CE4 38 61 04 F8 */ addi r3, r1, 0x4f8 /* 8025AD88 00257CE8 48 0E 2D 59 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9954,9 +9954,9 @@ __sinit_CRidley_cpp: /* 8025ADA4 00257D04 38 81 04 E8 */ addi r4, r1, 0x4e8 /* 8025ADA8 00257D08 38 63 00 90 */ addi r3, r3, 0x90 /* 8025ADAC 00257D0C 48 0E 33 B5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025ADB0 00257D10 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025ADB0 00257D10 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025ADB4 00257D14 38 AE 00 9C */ addi r5, r14, 0x9c -/* 8025ADB8 00257D18 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025ADB8 00257D18 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025ADBC 00257D1C 48 12 E8 D1 */ bl __register_global_object /* 8025ADC0 00257D20 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 8025ADC4 00257D24 48 0E 2D 1D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9969,9 +9969,9 @@ __sinit_CRidley_cpp: /* 8025ADE0 00257D40 38 81 04 D8 */ addi r4, r1, 0x4d8 /* 8025ADE4 00257D44 38 63 00 A0 */ addi r3, r3, 0xa0 /* 8025ADE8 00257D48 48 0E 33 79 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025ADEC 00257D4C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025ADEC 00257D4C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025ADF0 00257D50 38 AE 00 A8 */ addi r5, r14, 0xa8 -/* 8025ADF4 00257D54 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025ADF4 00257D54 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025ADF8 00257D58 48 12 E8 95 */ bl __register_global_object /* 8025ADFC 00257D5C 38 61 04 D8 */ addi r3, r1, 0x4d8 /* 8025AE00 00257D60 48 0E 2C E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9984,9 +9984,9 @@ __sinit_CRidley_cpp: /* 8025AE1C 00257D7C 38 81 04 C8 */ addi r4, r1, 0x4c8 /* 8025AE20 00257D80 38 63 00 B0 */ addi r3, r3, 0xb0 /* 8025AE24 00257D84 48 0E 33 3D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AE28 00257D88 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AE28 00257D88 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AE2C 00257D8C 38 AE 00 B4 */ addi r5, r14, 0xb4 -/* 8025AE30 00257D90 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AE30 00257D90 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AE34 00257D94 48 12 E8 59 */ bl __register_global_object /* 8025AE38 00257D98 38 61 04 C8 */ addi r3, r1, 0x4c8 /* 8025AE3C 00257D9C 48 0E 2C A5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -9999,9 +9999,9 @@ __sinit_CRidley_cpp: /* 8025AE58 00257DB8 38 81 04 B8 */ addi r4, r1, 0x4b8 /* 8025AE5C 00257DBC 38 63 00 C0 */ addi r3, r3, 0xc0 /* 8025AE60 00257DC0 48 0E 33 01 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AE64 00257DC4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AE64 00257DC4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AE68 00257DC8 38 AE 00 C0 */ addi r5, r14, 0xc0 -/* 8025AE6C 00257DCC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AE6C 00257DCC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AE70 00257DD0 48 12 E8 1D */ bl __register_global_object /* 8025AE74 00257DD4 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 8025AE78 00257DD8 48 0E 2C 69 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10014,9 +10014,9 @@ __sinit_CRidley_cpp: /* 8025AE94 00257DF4 38 81 04 A8 */ addi r4, r1, 0x4a8 /* 8025AE98 00257DF8 38 63 00 D0 */ addi r3, r3, 0xd0 /* 8025AE9C 00257DFC 48 0E 32 C5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AEA0 00257E00 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AEA0 00257E00 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AEA4 00257E04 38 AE 00 CC */ addi r5, r14, 0xcc -/* 8025AEA8 00257E08 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AEA8 00257E08 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AEAC 00257E0C 48 12 E7 E1 */ bl __register_global_object /* 8025AEB0 00257E10 38 61 04 A8 */ addi r3, r1, 0x4a8 /* 8025AEB4 00257E14 48 0E 2C 2D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10029,9 +10029,9 @@ __sinit_CRidley_cpp: /* 8025AED0 00257E30 38 81 04 98 */ addi r4, r1, 0x498 /* 8025AED4 00257E34 38 63 00 E0 */ addi r3, r3, 0xe0 /* 8025AED8 00257E38 48 0E 32 89 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AEDC 00257E3C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AEDC 00257E3C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AEE0 00257E40 38 AE 00 D8 */ addi r5, r14, 0xd8 -/* 8025AEE4 00257E44 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AEE4 00257E44 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AEE8 00257E48 48 12 E7 A5 */ bl __register_global_object /* 8025AEEC 00257E4C 38 61 04 98 */ addi r3, r1, 0x498 /* 8025AEF0 00257E50 48 0E 2B F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10044,9 +10044,9 @@ __sinit_CRidley_cpp: /* 8025AF0C 00257E6C 38 81 04 88 */ addi r4, r1, 0x488 /* 8025AF10 00257E70 38 63 00 F0 */ addi r3, r3, 0xf0 /* 8025AF14 00257E74 48 0E 32 4D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AF18 00257E78 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AF18 00257E78 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AF1C 00257E7C 38 AE 00 E4 */ addi r5, r14, 0xe4 -/* 8025AF20 00257E80 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AF20 00257E80 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AF24 00257E84 48 12 E7 69 */ bl __register_global_object /* 8025AF28 00257E88 38 61 04 88 */ addi r3, r1, 0x488 /* 8025AF2C 00257E8C 48 0E 2B B5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10059,9 +10059,9 @@ __sinit_CRidley_cpp: /* 8025AF48 00257EA8 38 81 04 78 */ addi r4, r1, 0x478 /* 8025AF4C 00257EAC 38 63 01 00 */ addi r3, r3, 0x100 /* 8025AF50 00257EB0 48 0E 32 11 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AF54 00257EB4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AF54 00257EB4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AF58 00257EB8 38 AE 00 F0 */ addi r5, r14, 0xf0 -/* 8025AF5C 00257EBC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AF5C 00257EBC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AF60 00257EC0 48 12 E7 2D */ bl __register_global_object /* 8025AF64 00257EC4 38 61 04 78 */ addi r3, r1, 0x478 /* 8025AF68 00257EC8 48 0E 2B 79 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10074,9 +10074,9 @@ __sinit_CRidley_cpp: /* 8025AF84 00257EE4 38 81 04 68 */ addi r4, r1, 0x468 /* 8025AF88 00257EE8 38 63 01 10 */ addi r3, r3, 0x110 /* 8025AF8C 00257EEC 48 0E 31 D5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AF90 00257EF0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AF90 00257EF0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AF94 00257EF4 38 AE 00 FC */ addi r5, r14, 0xfc -/* 8025AF98 00257EF8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AF98 00257EF8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AF9C 00257EFC 48 12 E6 F1 */ bl __register_global_object /* 8025AFA0 00257F00 38 61 04 68 */ addi r3, r1, 0x468 /* 8025AFA4 00257F04 48 0E 2B 3D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10089,9 +10089,9 @@ __sinit_CRidley_cpp: /* 8025AFC0 00257F20 38 81 04 58 */ addi r4, r1, 0x458 /* 8025AFC4 00257F24 38 63 01 20 */ addi r3, r3, 0x120 /* 8025AFC8 00257F28 48 0E 31 99 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025AFCC 00257F2C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025AFCC 00257F2C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025AFD0 00257F30 38 AE 01 08 */ addi r5, r14, 0x108 -/* 8025AFD4 00257F34 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025AFD4 00257F34 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025AFD8 00257F38 48 12 E6 B5 */ bl __register_global_object /* 8025AFDC 00257F3C 38 61 04 58 */ addi r3, r1, 0x458 /* 8025AFE0 00257F40 48 0E 2B 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10104,9 +10104,9 @@ __sinit_CRidley_cpp: /* 8025AFFC 00257F5C 38 81 04 48 */ addi r4, r1, 0x448 /* 8025B000 00257F60 38 63 01 30 */ addi r3, r3, 0x130 /* 8025B004 00257F64 48 0E 31 5D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B008 00257F68 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B008 00257F68 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B00C 00257F6C 38 AE 01 14 */ addi r5, r14, 0x114 -/* 8025B010 00257F70 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B010 00257F70 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B014 00257F74 48 12 E6 79 */ bl __register_global_object /* 8025B018 00257F78 38 61 04 48 */ addi r3, r1, 0x448 /* 8025B01C 00257F7C 48 0E 2A C5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10119,9 +10119,9 @@ __sinit_CRidley_cpp: /* 8025B038 00257F98 38 81 04 38 */ addi r4, r1, 0x438 /* 8025B03C 00257F9C 38 63 01 40 */ addi r3, r3, 0x140 /* 8025B040 00257FA0 48 0E 31 21 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B044 00257FA4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B044 00257FA4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B048 00257FA8 38 AE 01 20 */ addi r5, r14, 0x120 -/* 8025B04C 00257FAC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B04C 00257FAC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B050 00257FB0 48 12 E6 3D */ bl __register_global_object /* 8025B054 00257FB4 38 61 04 38 */ addi r3, r1, 0x438 /* 8025B058 00257FB8 48 0E 2A 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10134,9 +10134,9 @@ __sinit_CRidley_cpp: /* 8025B074 00257FD4 38 81 04 28 */ addi r4, r1, 0x428 /* 8025B078 00257FD8 38 63 01 50 */ addi r3, r3, 0x150 /* 8025B07C 00257FDC 48 0E 30 E5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B080 00257FE0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B080 00257FE0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B084 00257FE4 38 AE 01 2C */ addi r5, r14, 0x12c -/* 8025B088 00257FE8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B088 00257FE8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B08C 00257FEC 48 12 E6 01 */ bl __register_global_object /* 8025B090 00257FF0 38 61 04 28 */ addi r3, r1, 0x428 /* 8025B094 00257FF4 48 0E 2A 4D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10149,9 +10149,9 @@ __sinit_CRidley_cpp: /* 8025B0B0 00258010 38 81 04 18 */ addi r4, r1, 0x418 /* 8025B0B4 00258014 38 63 01 60 */ addi r3, r3, 0x160 /* 8025B0B8 00258018 48 0E 30 A9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B0BC 0025801C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B0BC 0025801C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B0C0 00258020 38 AE 01 38 */ addi r5, r14, 0x138 -/* 8025B0C4 00258024 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B0C4 00258024 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B0C8 00258028 48 12 E5 C5 */ bl __register_global_object /* 8025B0CC 0025802C 38 61 04 18 */ addi r3, r1, 0x418 /* 8025B0D0 00258030 48 0E 2A 11 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10164,9 +10164,9 @@ __sinit_CRidley_cpp: /* 8025B0EC 0025804C 38 81 04 08 */ addi r4, r1, 0x408 /* 8025B0F0 00258050 38 63 01 70 */ addi r3, r3, 0x170 /* 8025B0F4 00258054 48 0E 30 6D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B0F8 00258058 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B0F8 00258058 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B0FC 0025805C 38 AE 01 44 */ addi r5, r14, 0x144 -/* 8025B100 00258060 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B100 00258060 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B104 00258064 48 12 E5 89 */ bl __register_global_object /* 8025B108 00258068 38 61 04 08 */ addi r3, r1, 0x408 /* 8025B10C 0025806C 48 0E 29 D5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10178,9 +10178,9 @@ __sinit_CRidley_cpp: /* 8025B124 00258084 38 6E 04 38 */ addi r3, r14, 0x438 /* 8025B128 00258088 38 81 03 F8 */ addi r4, r1, 0x3f8 /* 8025B12C 0025808C 48 0E 30 35 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B130 00258090 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B130 00258090 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B134 00258094 38 AE 02 D0 */ addi r5, r14, 0x2d0 -/* 8025B138 00258098 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B138 00258098 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B13C 0025809C 48 12 E5 51 */ bl __register_global_object /* 8025B140 002580A0 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 8025B144 002580A4 48 0E 29 9D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10193,9 +10193,9 @@ __sinit_CRidley_cpp: /* 8025B160 002580C0 38 81 03 E8 */ addi r4, r1, 0x3e8 /* 8025B164 002580C4 38 63 00 10 */ addi r3, r3, 0x10 /* 8025B168 002580C8 48 0E 2F F9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B16C 002580CC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B16C 002580CC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B170 002580D0 38 AE 02 DC */ addi r5, r14, 0x2dc -/* 8025B174 002580D4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B174 002580D4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B178 002580D8 48 12 E5 15 */ bl __register_global_object /* 8025B17C 002580DC 38 61 03 E8 */ addi r3, r1, 0x3e8 /* 8025B180 002580E0 48 0E 29 61 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10208,9 +10208,9 @@ __sinit_CRidley_cpp: /* 8025B19C 002580FC 38 81 03 D8 */ addi r4, r1, 0x3d8 /* 8025B1A0 00258100 38 63 00 20 */ addi r3, r3, 0x20 /* 8025B1A4 00258104 48 0E 2F BD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B1A8 00258108 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B1A8 00258108 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B1AC 0025810C 38 AE 02 E8 */ addi r5, r14, 0x2e8 -/* 8025B1B0 00258110 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B1B0 00258110 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B1B4 00258114 48 12 E4 D9 */ bl __register_global_object /* 8025B1B8 00258118 38 61 03 D8 */ addi r3, r1, 0x3d8 /* 8025B1BC 0025811C 48 0E 29 25 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10223,9 +10223,9 @@ __sinit_CRidley_cpp: /* 8025B1D8 00258138 38 81 03 C8 */ addi r4, r1, 0x3c8 /* 8025B1DC 0025813C 38 63 00 30 */ addi r3, r3, 0x30 /* 8025B1E0 00258140 48 0E 2F 81 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B1E4 00258144 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B1E4 00258144 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B1E8 00258148 38 AE 02 F4 */ addi r5, r14, 0x2f4 -/* 8025B1EC 0025814C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B1EC 0025814C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B1F0 00258150 48 12 E4 9D */ bl __register_global_object /* 8025B1F4 00258154 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8025B1F8 00258158 48 0E 28 E9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10238,9 +10238,9 @@ __sinit_CRidley_cpp: /* 8025B214 00258174 38 81 03 B8 */ addi r4, r1, 0x3b8 /* 8025B218 00258178 38 63 00 40 */ addi r3, r3, 0x40 /* 8025B21C 0025817C 48 0E 2F 45 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B220 00258180 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B220 00258180 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B224 00258184 38 AE 03 00 */ addi r5, r14, 0x300 -/* 8025B228 00258188 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B228 00258188 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B22C 0025818C 48 12 E4 61 */ bl __register_global_object /* 8025B230 00258190 38 61 03 B8 */ addi r3, r1, 0x3b8 /* 8025B234 00258194 48 0E 28 AD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10253,9 +10253,9 @@ __sinit_CRidley_cpp: /* 8025B250 002581B0 38 81 03 A8 */ addi r4, r1, 0x3a8 /* 8025B254 002581B4 38 63 00 50 */ addi r3, r3, 0x50 /* 8025B258 002581B8 48 0E 2F 09 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B25C 002581BC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B25C 002581BC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B260 002581C0 38 AE 03 0C */ addi r5, r14, 0x30c -/* 8025B264 002581C4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B264 002581C4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B268 002581C8 48 12 E4 25 */ bl __register_global_object /* 8025B26C 002581CC 38 61 03 A8 */ addi r3, r1, 0x3a8 /* 8025B270 002581D0 48 0E 28 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10268,9 +10268,9 @@ __sinit_CRidley_cpp: /* 8025B28C 002581EC 38 81 03 98 */ addi r4, r1, 0x398 /* 8025B290 002581F0 38 63 00 60 */ addi r3, r3, 0x60 /* 8025B294 002581F4 48 0E 2E CD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B298 002581F8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B298 002581F8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B29C 002581FC 38 AE 03 18 */ addi r5, r14, 0x318 -/* 8025B2A0 00258200 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B2A0 00258200 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B2A4 00258204 48 12 E3 E9 */ bl __register_global_object /* 8025B2A8 00258208 38 61 03 98 */ addi r3, r1, 0x398 /* 8025B2AC 0025820C 48 0E 28 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10283,9 +10283,9 @@ __sinit_CRidley_cpp: /* 8025B2C8 00258228 38 81 03 88 */ addi r4, r1, 0x388 /* 8025B2CC 0025822C 38 63 00 70 */ addi r3, r3, 0x70 /* 8025B2D0 00258230 48 0E 2E 91 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B2D4 00258234 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B2D4 00258234 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B2D8 00258238 38 AE 03 24 */ addi r5, r14, 0x324 -/* 8025B2DC 0025823C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B2DC 0025823C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B2E0 00258240 48 12 E3 AD */ bl __register_global_object /* 8025B2E4 00258244 38 61 03 88 */ addi r3, r1, 0x388 /* 8025B2E8 00258248 48 0E 27 F9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10298,9 +10298,9 @@ __sinit_CRidley_cpp: /* 8025B304 00258264 38 81 03 78 */ addi r4, r1, 0x378 /* 8025B308 00258268 38 63 00 80 */ addi r3, r3, 0x80 /* 8025B30C 0025826C 48 0E 2E 55 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B310 00258270 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B310 00258270 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B314 00258274 38 AE 03 30 */ addi r5, r14, 0x330 -/* 8025B318 00258278 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B318 00258278 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B31C 0025827C 48 12 E3 71 */ bl __register_global_object /* 8025B320 00258280 38 61 03 78 */ addi r3, r1, 0x378 /* 8025B324 00258284 48 0E 27 BD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10313,9 +10313,9 @@ __sinit_CRidley_cpp: /* 8025B340 002582A0 38 81 03 68 */ addi r4, r1, 0x368 /* 8025B344 002582A4 38 63 00 90 */ addi r3, r3, 0x90 /* 8025B348 002582A8 48 0E 2E 19 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B34C 002582AC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B34C 002582AC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B350 002582B0 38 AE 03 3C */ addi r5, r14, 0x33c -/* 8025B354 002582B4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B354 002582B4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B358 002582B8 48 12 E3 35 */ bl __register_global_object /* 8025B35C 002582BC 38 61 03 68 */ addi r3, r1, 0x368 /* 8025B360 002582C0 48 0E 27 81 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10328,9 +10328,9 @@ __sinit_CRidley_cpp: /* 8025B37C 002582DC 38 81 03 58 */ addi r4, r1, 0x358 /* 8025B380 002582E0 38 63 00 A0 */ addi r3, r3, 0xa0 /* 8025B384 002582E4 48 0E 2D DD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B388 002582E8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B388 002582E8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B38C 002582EC 38 AE 03 48 */ addi r5, r14, 0x348 -/* 8025B390 002582F0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B390 002582F0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B394 002582F4 48 12 E2 F9 */ bl __register_global_object /* 8025B398 002582F8 38 61 03 58 */ addi r3, r1, 0x358 /* 8025B39C 002582FC 48 0E 27 45 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10343,9 +10343,9 @@ __sinit_CRidley_cpp: /* 8025B3B8 00258318 38 81 03 48 */ addi r4, r1, 0x348 /* 8025B3BC 0025831C 38 63 00 B0 */ addi r3, r3, 0xb0 /* 8025B3C0 00258320 48 0E 2D A1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B3C4 00258324 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B3C4 00258324 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B3C8 00258328 38 AE 03 54 */ addi r5, r14, 0x354 -/* 8025B3CC 0025832C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B3CC 0025832C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B3D0 00258330 48 12 E2 BD */ bl __register_global_object /* 8025B3D4 00258334 38 61 03 48 */ addi r3, r1, 0x348 /* 8025B3D8 00258338 48 0E 27 09 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10358,9 +10358,9 @@ __sinit_CRidley_cpp: /* 8025B3F4 00258354 38 81 03 38 */ addi r4, r1, 0x338 /* 8025B3F8 00258358 38 63 00 C0 */ addi r3, r3, 0xc0 /* 8025B3FC 0025835C 48 0E 2D 65 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B400 00258360 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B400 00258360 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B404 00258364 38 AE 03 60 */ addi r5, r14, 0x360 -/* 8025B408 00258368 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B408 00258368 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B40C 0025836C 48 12 E2 81 */ bl __register_global_object /* 8025B410 00258370 38 61 03 38 */ addi r3, r1, 0x338 /* 8025B414 00258374 48 0E 26 CD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10373,9 +10373,9 @@ __sinit_CRidley_cpp: /* 8025B430 00258390 38 81 03 28 */ addi r4, r1, 0x328 /* 8025B434 00258394 38 63 00 D0 */ addi r3, r3, 0xd0 /* 8025B438 00258398 48 0E 2D 29 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B43C 0025839C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B43C 0025839C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B440 002583A0 38 AE 03 6C */ addi r5, r14, 0x36c -/* 8025B444 002583A4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B444 002583A4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B448 002583A8 48 12 E2 45 */ bl __register_global_object /* 8025B44C 002583AC 38 61 03 28 */ addi r3, r1, 0x328 /* 8025B450 002583B0 48 0E 26 91 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10388,9 +10388,9 @@ __sinit_CRidley_cpp: /* 8025B46C 002583CC 38 81 03 18 */ addi r4, r1, 0x318 /* 8025B470 002583D0 38 63 00 E0 */ addi r3, r3, 0xe0 /* 8025B474 002583D4 48 0E 2C ED */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B478 002583D8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B478 002583D8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B47C 002583DC 38 AE 03 78 */ addi r5, r14, 0x378 -/* 8025B480 002583E0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B480 002583E0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B484 002583E4 48 12 E2 09 */ bl __register_global_object /* 8025B488 002583E8 38 61 03 18 */ addi r3, r1, 0x318 /* 8025B48C 002583EC 48 0E 26 55 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10403,9 +10403,9 @@ __sinit_CRidley_cpp: /* 8025B4A8 00258408 38 81 03 08 */ addi r4, r1, 0x308 /* 8025B4AC 0025840C 38 63 00 F0 */ addi r3, r3, 0xf0 /* 8025B4B0 00258410 48 0E 2C B1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B4B4 00258414 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B4B4 00258414 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B4B8 00258418 38 AE 03 84 */ addi r5, r14, 0x384 -/* 8025B4BC 0025841C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B4BC 0025841C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B4C0 00258420 48 12 E1 CD */ bl __register_global_object /* 8025B4C4 00258424 38 61 03 08 */ addi r3, r1, 0x308 /* 8025B4C8 00258428 48 0E 26 19 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10418,9 +10418,9 @@ __sinit_CRidley_cpp: /* 8025B4E4 00258444 38 81 02 F8 */ addi r4, r1, 0x2f8 /* 8025B4E8 00258448 38 63 01 00 */ addi r3, r3, 0x100 /* 8025B4EC 0025844C 48 0E 2C 75 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B4F0 00258450 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B4F0 00258450 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B4F4 00258454 38 AE 03 90 */ addi r5, r14, 0x390 -/* 8025B4F8 00258458 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B4F8 00258458 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B4FC 0025845C 48 12 E1 91 */ bl __register_global_object /* 8025B500 00258460 38 61 02 F8 */ addi r3, r1, 0x2f8 /* 8025B504 00258464 48 0E 25 DD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10433,9 +10433,9 @@ __sinit_CRidley_cpp: /* 8025B520 00258480 38 81 02 E8 */ addi r4, r1, 0x2e8 /* 8025B524 00258484 38 63 01 10 */ addi r3, r3, 0x110 /* 8025B528 00258488 48 0E 2C 39 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B52C 0025848C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B52C 0025848C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B530 00258490 38 AE 03 9C */ addi r5, r14, 0x39c -/* 8025B534 00258494 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B534 00258494 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B538 00258498 48 12 E1 55 */ bl __register_global_object /* 8025B53C 0025849C 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 8025B540 002584A0 48 0E 25 A1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10448,9 +10448,9 @@ __sinit_CRidley_cpp: /* 8025B55C 002584BC 38 81 02 D8 */ addi r4, r1, 0x2d8 /* 8025B560 002584C0 38 63 01 20 */ addi r3, r3, 0x120 /* 8025B564 002584C4 48 0E 2B FD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B568 002584C8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B568 002584C8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B56C 002584CC 38 AE 03 A8 */ addi r5, r14, 0x3a8 -/* 8025B570 002584D0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B570 002584D0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B574 002584D4 48 12 E1 19 */ bl __register_global_object /* 8025B578 002584D8 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8025B57C 002584DC 48 0E 25 65 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10463,9 +10463,9 @@ __sinit_CRidley_cpp: /* 8025B598 002584F8 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 8025B59C 002584FC 38 63 01 30 */ addi r3, r3, 0x130 /* 8025B5A0 00258500 48 0E 2B C1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B5A4 00258504 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B5A4 00258504 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B5A8 00258508 38 AE 03 B4 */ addi r5, r14, 0x3b4 -/* 8025B5AC 0025850C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B5AC 0025850C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B5B0 00258510 48 12 E0 DD */ bl __register_global_object /* 8025B5B4 00258514 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 8025B5B8 00258518 48 0E 25 29 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10478,9 +10478,9 @@ __sinit_CRidley_cpp: /* 8025B5D4 00258534 38 81 02 B8 */ addi r4, r1, 0x2b8 /* 8025B5D8 00258538 38 63 01 40 */ addi r3, r3, 0x140 /* 8025B5DC 0025853C 48 0E 2B 85 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B5E0 00258540 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B5E0 00258540 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B5E4 00258544 38 AE 03 C0 */ addi r5, r14, 0x3c0 -/* 8025B5E8 00258548 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B5E8 00258548 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B5EC 0025854C 48 12 E0 A1 */ bl __register_global_object /* 8025B5F0 00258550 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8025B5F4 00258554 48 0E 24 ED */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10493,9 +10493,9 @@ __sinit_CRidley_cpp: /* 8025B610 00258570 38 81 02 A8 */ addi r4, r1, 0x2a8 /* 8025B614 00258574 38 63 01 50 */ addi r3, r3, 0x150 /* 8025B618 00258578 48 0E 2B 49 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B61C 0025857C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B61C 0025857C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B620 00258580 38 AE 03 CC */ addi r5, r14, 0x3cc -/* 8025B624 00258584 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B624 00258584 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B628 00258588 48 12 E0 65 */ bl __register_global_object /* 8025B62C 0025858C 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 8025B630 00258590 48 0E 24 B1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10508,9 +10508,9 @@ __sinit_CRidley_cpp: /* 8025B64C 002585AC 38 81 02 98 */ addi r4, r1, 0x298 /* 8025B650 002585B0 38 63 01 60 */ addi r3, r3, 0x160 /* 8025B654 002585B4 48 0E 2B 0D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B658 002585B8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B658 002585B8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B65C 002585BC 38 AE 03 D8 */ addi r5, r14, 0x3d8 -/* 8025B660 002585C0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B660 002585C0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B664 002585C4 48 12 E0 29 */ bl __register_global_object /* 8025B668 002585C8 38 61 02 98 */ addi r3, r1, 0x298 /* 8025B66C 002585CC 48 0E 24 75 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10523,9 +10523,9 @@ __sinit_CRidley_cpp: /* 8025B688 002585E8 38 81 02 88 */ addi r4, r1, 0x288 /* 8025B68C 002585EC 38 63 01 70 */ addi r3, r3, 0x170 /* 8025B690 002585F0 48 0E 2A D1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B694 002585F4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B694 002585F4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B698 002585F8 38 AE 03 E4 */ addi r5, r14, 0x3e4 -/* 8025B69C 002585FC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B69C 002585FC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B6A0 00258600 48 12 DF ED */ bl __register_global_object /* 8025B6A4 00258604 38 61 02 88 */ addi r3, r1, 0x288 /* 8025B6A8 00258608 48 0E 24 39 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10538,9 +10538,9 @@ __sinit_CRidley_cpp: /* 8025B6C4 00258624 38 81 02 78 */ addi r4, r1, 0x278 /* 8025B6C8 00258628 38 63 01 80 */ addi r3, r3, 0x180 /* 8025B6CC 0025862C 48 0E 2A 95 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B6D0 00258630 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B6D0 00258630 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B6D4 00258634 38 AE 03 F0 */ addi r5, r14, 0x3f0 -/* 8025B6D8 00258638 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B6D8 00258638 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B6DC 0025863C 48 12 DF B1 */ bl __register_global_object /* 8025B6E0 00258640 38 61 02 78 */ addi r3, r1, 0x278 /* 8025B6E4 00258644 48 0E 23 FD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10553,9 +10553,9 @@ __sinit_CRidley_cpp: /* 8025B700 00258660 38 81 02 68 */ addi r4, r1, 0x268 /* 8025B704 00258664 38 63 01 90 */ addi r3, r3, 0x190 /* 8025B708 00258668 48 0E 2A 59 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B70C 0025866C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B70C 0025866C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B710 00258670 38 AE 03 FC */ addi r5, r14, 0x3fc -/* 8025B714 00258674 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B714 00258674 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B718 00258678 48 12 DF 75 */ bl __register_global_object /* 8025B71C 0025867C 38 61 02 68 */ addi r3, r1, 0x268 /* 8025B720 00258680 48 0E 23 C1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10568,9 +10568,9 @@ __sinit_CRidley_cpp: /* 8025B73C 0025869C 38 81 02 58 */ addi r4, r1, 0x258 /* 8025B740 002586A0 38 63 01 A0 */ addi r3, r3, 0x1a0 /* 8025B744 002586A4 48 0E 2A 1D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B748 002586A8 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B748 002586A8 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B74C 002586AC 38 AE 04 08 */ addi r5, r14, 0x408 -/* 8025B750 002586B0 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B750 002586B0 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B754 002586B4 48 12 DF 39 */ bl __register_global_object /* 8025B758 002586B8 38 61 02 58 */ addi r3, r1, 0x258 /* 8025B75C 002586BC 48 0E 23 85 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10583,9 +10583,9 @@ __sinit_CRidley_cpp: /* 8025B778 002586D8 38 81 02 48 */ addi r4, r1, 0x248 /* 8025B77C 002586DC 38 63 01 B0 */ addi r3, r3, 0x1b0 /* 8025B780 002586E0 48 0E 29 E1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B784 002586E4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B784 002586E4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B788 002586E8 38 AE 04 14 */ addi r5, r14, 0x414 -/* 8025B78C 002586EC 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B78C 002586EC 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B790 002586F0 48 12 DE FD */ bl __register_global_object /* 8025B794 002586F4 38 61 02 48 */ addi r3, r1, 0x248 /* 8025B798 002586F8 48 0E 23 49 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10598,9 +10598,9 @@ __sinit_CRidley_cpp: /* 8025B7B4 00258714 38 81 02 38 */ addi r4, r1, 0x238 /* 8025B7B8 00258718 38 63 01 C0 */ addi r3, r3, 0x1c0 /* 8025B7BC 0025871C 48 0E 29 A5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B7C0 00258720 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B7C0 00258720 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B7C4 00258724 38 AE 04 20 */ addi r5, r14, 0x420 -/* 8025B7C8 00258728 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B7C8 00258728 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B7CC 0025872C 48 12 DE C1 */ bl __register_global_object /* 8025B7D0 00258730 38 61 02 38 */ addi r3, r1, 0x238 /* 8025B7D4 00258734 48 0E 23 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -10613,9 +10613,9 @@ __sinit_CRidley_cpp: /* 8025B7F0 00258750 38 81 02 28 */ addi r4, r1, 0x228 /* 8025B7F4 00258754 38 63 01 D0 */ addi r3, r3, 0x1d0 /* 8025B7F8 00258758 48 0E 29 69 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025B7FC 0025875C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8025B7FC 0025875C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8025B800 00258760 38 AE 04 2C */ addi r5, r14, 0x42c -/* 8025B804 00258764 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8025B804 00258764 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8025B808 00258768 48 12 DE 85 */ bl __register_global_object /* 8025B80C 0025876C 38 61 02 28 */ addi r3, r1, 0x228 /* 8025B810 00258770 48 0E 22 D1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 74148edf..699ac3a0 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -14811,9 +14811,9 @@ __sinit_CSpacePirate_cpp: /* 8012CF18 00129E78 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 8012CF1C 00129E7C 38 81 00 F8 */ addi r4, r1, 0xf8 /* 8012CF20 00129E80 48 21 12 41 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012CF24 00129E84 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012CF24 00129E84 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012CF28 00129E88 38 BF 00 00 */ addi r5, r31, 0 -/* 8012CF2C 00129E8C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012CF2C 00129E8C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012CF30 00129E90 48 25 C7 5D */ bl __register_global_object /* 8012CF34 00129E94 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8012CF38 00129E98 48 21 0B A9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14826,9 +14826,9 @@ __sinit_CSpacePirate_cpp: /* 8012CF54 00129EB4 38 81 00 E8 */ addi r4, r1, 0xe8 /* 8012CF58 00129EB8 38 63 00 10 */ addi r3, r3, 0x10 /* 8012CF5C 00129EBC 48 21 12 05 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012CF60 00129EC0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012CF60 00129EC0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012CF64 00129EC4 38 BF 00 0C */ addi r5, r31, 0xc -/* 8012CF68 00129EC8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012CF68 00129EC8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012CF6C 00129ECC 48 25 C7 21 */ bl __register_global_object /* 8012CF70 00129ED0 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8012CF74 00129ED4 48 21 0B 6D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14841,9 +14841,9 @@ __sinit_CSpacePirate_cpp: /* 8012CF90 00129EF0 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8012CF94 00129EF4 38 63 00 20 */ addi r3, r3, 0x20 /* 8012CF98 00129EF8 48 21 11 C9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012CF9C 00129EFC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012CF9C 00129EFC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012CFA0 00129F00 38 BF 00 18 */ addi r5, r31, 0x18 -/* 8012CFA4 00129F04 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012CFA4 00129F04 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012CFA8 00129F08 48 25 C6 E5 */ bl __register_global_object /* 8012CFAC 00129F0C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8012CFB0 00129F10 48 21 0B 31 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14856,9 +14856,9 @@ __sinit_CSpacePirate_cpp: /* 8012CFCC 00129F2C 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8012CFD0 00129F30 38 63 00 30 */ addi r3, r3, 0x30 /* 8012CFD4 00129F34 48 21 11 8D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012CFD8 00129F38 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012CFD8 00129F38 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012CFDC 00129F3C 38 BF 00 24 */ addi r5, r31, 0x24 -/* 8012CFE0 00129F40 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012CFE0 00129F40 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012CFE4 00129F44 48 25 C6 A9 */ bl __register_global_object /* 8012CFE8 00129F48 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8012CFEC 00129F4C 48 21 0A F5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14871,9 +14871,9 @@ __sinit_CSpacePirate_cpp: /* 8012D008 00129F68 38 81 00 B8 */ addi r4, r1, 0xb8 /* 8012D00C 00129F6C 38 63 00 40 */ addi r3, r3, 0x40 /* 8012D010 00129F70 48 21 11 51 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D014 00129F74 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D014 00129F74 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D018 00129F78 38 BF 00 30 */ addi r5, r31, 0x30 -/* 8012D01C 00129F7C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D01C 00129F7C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D020 00129F80 48 25 C6 6D */ bl __register_global_object /* 8012D024 00129F84 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8012D028 00129F88 48 21 0A B9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14886,9 +14886,9 @@ __sinit_CSpacePirate_cpp: /* 8012D044 00129FA4 38 81 00 A8 */ addi r4, r1, 0xa8 /* 8012D048 00129FA8 38 63 00 50 */ addi r3, r3, 0x50 /* 8012D04C 00129FAC 48 21 11 15 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D050 00129FB0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D050 00129FB0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D054 00129FB4 38 BF 00 3C */ addi r5, r31, 0x3c -/* 8012D058 00129FB8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D058 00129FB8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D05C 00129FBC 48 25 C6 31 */ bl __register_global_object /* 8012D060 00129FC0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8012D064 00129FC4 48 21 0A 7D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14901,9 +14901,9 @@ __sinit_CSpacePirate_cpp: /* 8012D080 00129FE0 38 81 00 98 */ addi r4, r1, 0x98 /* 8012D084 00129FE4 38 63 00 60 */ addi r3, r3, 0x60 /* 8012D088 00129FE8 48 21 10 D9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D08C 00129FEC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D08C 00129FEC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D090 00129FF0 38 BF 00 48 */ addi r5, r31, 0x48 -/* 8012D094 00129FF4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D094 00129FF4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D098 00129FF8 48 25 C5 F5 */ bl __register_global_object /* 8012D09C 00129FFC 38 61 00 98 */ addi r3, r1, 0x98 /* 8012D0A0 0012A000 48 21 0A 41 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14916,9 +14916,9 @@ __sinit_CSpacePirate_cpp: /* 8012D0BC 0012A01C 38 81 00 88 */ addi r4, r1, 0x88 /* 8012D0C0 0012A020 38 63 00 70 */ addi r3, r3, 0x70 /* 8012D0C4 0012A024 48 21 10 9D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D0C8 0012A028 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D0C8 0012A028 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D0CC 0012A02C 38 BF 00 54 */ addi r5, r31, 0x54 -/* 8012D0D0 0012A030 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D0D0 0012A030 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D0D4 0012A034 48 25 C5 B9 */ bl __register_global_object /* 8012D0D8 0012A038 38 61 00 88 */ addi r3, r1, 0x88 /* 8012D0DC 0012A03C 48 21 0A 05 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14931,9 +14931,9 @@ __sinit_CSpacePirate_cpp: /* 8012D0F8 0012A058 38 81 00 78 */ addi r4, r1, 0x78 /* 8012D0FC 0012A05C 38 63 00 80 */ addi r3, r3, 0x80 /* 8012D100 0012A060 48 21 10 61 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D104 0012A064 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D104 0012A064 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D108 0012A068 38 BF 00 60 */ addi r5, r31, 0x60 -/* 8012D10C 0012A06C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D10C 0012A06C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D110 0012A070 48 25 C5 7D */ bl __register_global_object /* 8012D114 0012A074 38 61 00 78 */ addi r3, r1, 0x78 /* 8012D118 0012A078 48 21 09 C9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14946,9 +14946,9 @@ __sinit_CSpacePirate_cpp: /* 8012D134 0012A094 38 81 00 68 */ addi r4, r1, 0x68 /* 8012D138 0012A098 38 63 00 90 */ addi r3, r3, 0x90 /* 8012D13C 0012A09C 48 21 10 25 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D140 0012A0A0 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D140 0012A0A0 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D144 0012A0A4 38 BF 00 6C */ addi r5, r31, 0x6c -/* 8012D148 0012A0A8 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D148 0012A0A8 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D14C 0012A0AC 48 25 C5 41 */ bl __register_global_object /* 8012D150 0012A0B0 38 61 00 68 */ addi r3, r1, 0x68 /* 8012D154 0012A0B4 48 21 09 8D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14961,9 +14961,9 @@ __sinit_CSpacePirate_cpp: /* 8012D170 0012A0D0 38 81 00 58 */ addi r4, r1, 0x58 /* 8012D174 0012A0D4 38 63 00 A0 */ addi r3, r3, 0xa0 /* 8012D178 0012A0D8 48 21 0F E9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D17C 0012A0DC 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D17C 0012A0DC 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D180 0012A0E0 38 BF 00 78 */ addi r5, r31, 0x78 -/* 8012D184 0012A0E4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D184 0012A0E4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D188 0012A0E8 48 25 C5 05 */ bl __register_global_object /* 8012D18C 0012A0EC 38 61 00 58 */ addi r3, r1, 0x58 /* 8012D190 0012A0F0 48 21 09 51 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14976,9 +14976,9 @@ __sinit_CSpacePirate_cpp: /* 8012D1AC 0012A10C 38 81 00 48 */ addi r4, r1, 0x48 /* 8012D1B0 0012A110 38 63 00 B0 */ addi r3, r3, 0xb0 /* 8012D1B4 0012A114 48 21 0F AD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D1B8 0012A118 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D1B8 0012A118 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D1BC 0012A11C 38 BF 00 84 */ addi r5, r31, 0x84 -/* 8012D1C0 0012A120 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D1C0 0012A120 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D1C4 0012A124 48 25 C4 C9 */ bl __register_global_object /* 8012D1C8 0012A128 38 61 00 48 */ addi r3, r1, 0x48 /* 8012D1CC 0012A12C 48 21 09 15 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -14991,9 +14991,9 @@ __sinit_CSpacePirate_cpp: /* 8012D1E8 0012A148 38 81 00 38 */ addi r4, r1, 0x38 /* 8012D1EC 0012A14C 38 63 00 C0 */ addi r3, r3, 0xc0 /* 8012D1F0 0012A150 48 21 0F 71 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D1F4 0012A154 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D1F4 0012A154 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D1F8 0012A158 38 BF 00 90 */ addi r5, r31, 0x90 -/* 8012D1FC 0012A15C 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D1FC 0012A15C 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D200 0012A160 48 25 C4 8D */ bl __register_global_object /* 8012D204 0012A164 38 61 00 38 */ addi r3, r1, 0x38 /* 8012D208 0012A168 48 21 08 D9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -15006,9 +15006,9 @@ __sinit_CSpacePirate_cpp: /* 8012D224 0012A184 38 81 00 28 */ addi r4, r1, 0x28 /* 8012D228 0012A188 38 63 00 D0 */ addi r3, r3, 0xd0 /* 8012D22C 0012A18C 48 21 0F 35 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D230 0012A190 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D230 0012A190 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D234 0012A194 38 BF 00 9C */ addi r5, r31, 0x9c -/* 8012D238 0012A198 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D238 0012A198 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D23C 0012A19C 48 25 C4 51 */ bl __register_global_object /* 8012D240 0012A1A0 38 61 00 28 */ addi r3, r1, 0x28 /* 8012D244 0012A1A4 48 21 08 9D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -15034,9 +15034,9 @@ __sinit_CSpacePirate_cpp: /* 8012D294 0012A1F4 38 81 00 18 */ addi r4, r1, 0x18 /* 8012D298 0012A1F8 38 63 F8 94 */ addi r3, r3, lbl_8056F894@l /* 8012D29C 0012A1FC 48 21 0E C5 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D2A0 0012A200 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D2A0 0012A200 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D2A4 0012A204 38 BF 01 94 */ addi r5, r31, 0x194 -/* 8012D2A8 0012A208 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D2A8 0012A208 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D2AC 0012A20C 48 25 C3 E1 */ bl __register_global_object /* 8012D2B0 0012A210 38 61 00 18 */ addi r3, r1, 0x18 /* 8012D2B4 0012A214 48 21 08 2D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -15049,9 +15049,9 @@ __sinit_CSpacePirate_cpp: /* 8012D2D0 0012A230 38 81 00 08 */ addi r4, r1, 8 /* 8012D2D4 0012A234 38 63 F8 A4 */ addi r3, r3, lbl_8056F8A4@l /* 8012D2D8 0012A238 48 21 0E 89 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8012D2DC 0012A23C 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 8012D2DC 0012A23C 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 8012D2E0 0012A240 38 BF 01 A0 */ addi r5, r31, 0x1a0 -/* 8012D2E4 0012A244 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 8012D2E4 0012A244 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 8012D2E8 0012A248 48 25 C3 A5 */ bl __register_global_object /* 8012D2EC 0012A24C 38 61 00 08 */ addi r3, r1, 8 /* 8012D2F0 0012A250 48 21 07 F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" diff --git a/asm/MetroidPrime/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s index 2fa3bc0e..3e609846 100644 --- a/asm/MetroidPrime/Player/CWorldLayerState.s +++ b/asm/MetroidPrime/Player/CWorldLayerState.s @@ -509,11 +509,11 @@ lbl_80234628: /* 80234638 00231598 3C 60 80 47 */ lis r3, lbl_8046D34C@ha /* 8023463C 0023159C 38 A4 42 E0 */ addi r5, r4, lbl_803D42E0@l /* 80234640 002315A0 38 05 00 07 */ addi r0, r5, 7 -/* 80234644 002315A4 3C 80 80 00 */ lis r4, sub_80004a9c@ha +/* 80234644 002315A4 3C 80 80 00 */ lis r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@ha /* 80234648 002315A8 38 63 D3 4C */ addi r3, r3, lbl_8046D34C@l /* 8023464C 002315AC 3C A0 80 47 */ lis r5, lbl_8046D340@ha /* 80234650 002315B0 7C 00 30 50 */ subf r0, r0, r6 -/* 80234654 002315B4 38 84 4A 9C */ addi r4, r4, sub_80004a9c@l +/* 80234654 002315B4 38 84 4A 9C */ addi r4, r4, "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv"@l /* 80234658 002315B8 90 03 00 08 */ stw r0, 8(r3) /* 8023465C 002315BC 38 A5 D3 40 */ addi r5, r5, lbl_8046D340@l /* 80234660 002315C0 48 15 50 2D */ bl __register_global_object diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index 2f035973..438e0bf0 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -2497,8 +2497,8 @@ lbl_80004A78: /* 80004A94 000019F4 38 21 00 30 */ addi r1, r1, 0x30 /* 80004A98 000019F8 4E 80 00 20 */ blr -.global sub_80004a9c -sub_80004a9c: +.global "__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" +"__dt__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv": /* 80004A9C 000019FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80004AA0 00001A00 7C 08 02 A6 */ mflr r0 /* 80004AA4 00001A04 90 01 00 14 */ stw r0, 0x14(r1) @@ -5852,7 +5852,7 @@ __ct__24CGameArchitectureSupportFR10COsContext: /* 80007164 000040C4 93 A1 00 34 */ stw r29, 0x34(r1) /* 80007168 000040C8 7C 9D 23 78 */ mr r29, r4 /* 8000716C 000040CC 38 80 00 30 */ li r4, 0x30 -/* 80007170 000040D0 48 34 55 81 */ bl __ct__9CAudioSysFUcUcUcUcUi +/* 80007170 000040D0 48 34 55 81 */ bl __ct__9CAudioSysFccccUi /* 80007174 000040D4 38 7E 00 10 */ addi r3, r30, 0x10 /* 80007178 000040D8 38 00 00 00 */ li r0, 0 /* 8000717C 000040DC 90 7E 00 08 */ stw r3, 8(r30) diff --git a/configure.py b/configure.py index 9f3a8cbc..59efd0ba 100755 --- a/configure.py +++ b/configure.py @@ -650,7 +650,7 @@ LIBS = [ ["Kyoto/Input/CFinalInput", True], ["Kyoto/Graphics/CColor", True], "Kyoto/Audio/DolphinCAudioGroupSet", - "Kyoto/Audio/DolphinCAudioSys", + ["Kyoto/Audio/DolphinCAudioSys", False], "Kyoto/DolphinCMemoryCardSys", ["Kyoto/Input/DolphinIController", True], ["Kyoto/Input/CDolphinController", True], diff --git a/include/Kyoto/Audio/CAudioSys.hpp b/include/Kyoto/Audio/CAudioSys.hpp index 40ec6e37..24500821 100644 --- a/include/Kyoto/Audio/CAudioSys.hpp +++ b/include/Kyoto/Audio/CAudioSys.hpp @@ -3,8 +3,15 @@ #include "types.h" +#include "rstl/map.hpp" +#include "rstl/rc_ptr.hpp" +#include "rstl/string.hpp" +#include "rstl/vector.hpp" + #include "Kyoto/Math/CVector3f.hpp" +class CAudioGroupSet; + enum ETRKSampleRate { kTSR_Zero, kTSR_One, @@ -16,8 +23,13 @@ enum ETRKRepeatMode { }; class CAudioSys { + static const rstl::string mpDefaultInvalidString; + public: enum ESurroundModes { kSM_Mono, kSM_Stereo, kSM_Surround }; + class CEmitterData { + + }; struct C3DEmitterParmData { C3DEmitterParmData(const CVector3f& pos, const CVector3f& dir, float maxDist, float distComp, @@ -46,7 +58,9 @@ public: uchar x29_prio; }; - CAudioSys(uchar, uchar, uchar, uchar, uint); + class CTrkData {}; + + CAudioSys(char, char, char, char, uint); ~CAudioSys(); static void SysSetVolume(uchar, uint, uchar); @@ -59,6 +73,22 @@ public: static short GetDefaultVolumeScale(); + static bool mInitialized; + static bool mIsLIstenerActive; + static bool mVerbose; + static uchar mMaxNumEmitters; + static rstl::map< rstl::string, rstl::ncrc_ptr< CAudioGroupSet > >* mpGroupSetDB; + static rstl::map< uint, rstl::string >* mpGroupSetResNameDB; + static rstl::map< rstl::string, rstl::ncrc_ptr< CTrkData > >* mpDVDTrackDB; + static rstl::vector* mpEmitterDB; + static unkptr mpListener; + + /* TODO: Remaining globals */ + + static ESurroundModes mSurroundMode; + static uint mMaxAramUsage; + static uint mCurrentAramUsage; + static bool mProLogic2; static const uchar kMaxVolume; }; diff --git a/include/musyx/musyx.h b/include/musyx/musyx.h index 7981a76a..bb0d1526 100644 --- a/include/musyx/musyx.h +++ b/include/musyx/musyx.h @@ -21,7 +21,7 @@ typedef double f64; #ifndef bool8 typedef unsigned char bool8; #endif -#ifndef bool +#ifndef __cplusplus typedef signed long bool; #define FALSE 0 #define TRUE 1 @@ -65,6 +65,8 @@ typedef struct SND_HOOKS { void (*free)(void* addr); } SND_HOOKS; +void sndSetHooks(SND_HOOKS* hooks); + typedef struct SND_FVECTOR { f32 x; f32 y; diff --git a/src/Kyoto/Audio/DolphinCAudioSys.cpp b/src/Kyoto/Audio/DolphinCAudioSys.cpp new file mode 100644 index 00000000..2258ae46 --- /dev/null +++ b/src/Kyoto/Audio/DolphinCAudioSys.cpp @@ -0,0 +1,62 @@ +#include "Kyoto/Audio/CAudioSys.hpp" + +#include "Kyoto/Alloc/CMemory.hpp" + +#include "dolphin/ai.h" +#include "dolphin/dtk.h" +#include "dolphin/os.h" + +#include "musyx/musyx.h" + +bool CAudioSys::mInitialized = false; +bool CAudioSys::mIsLIstenerActive = false; +bool CAudioSys::mVerbose = false; +uchar CAudioSys::mMaxNumEmitters = 0; +rstl::map< rstl::string, rstl::ncrc_ptr< CAudioGroupSet > >* CAudioSys::mpGroupSetDB = nullptr; +rstl::map< uint, rstl::string >* CAudioSys::mpGroupSetResNameDB = nullptr; +rstl::map< rstl::string, rstl::ncrc_ptr< CAudioSys::CTrkData > >* CAudioSys::mpDVDTrackDB = nullptr; + +const uchar CAudioSys::kMaxVolume = 0x7f; +bool CAudioSys::mProLogic2 = true; + +const rstl::string CAudioSys::mpDefaultInvalidString(rstl::string_l("NULL")); + +void* DoMalloc(size_t len) { return new char[len]; } + +void DoFree(void* ptr) { + if (!ptr) { + return; + } + delete[] ptr; +} + +CAudioSys::CAudioSys(char numVoices, char numMusic, char numSfx, char maxNumEmitters, + uint aramSize) { + mInitialized = true; + SND_HOOKS hooks = {DoMalloc, DoFree}; + AIInit(NULL); + sndSetHooks(&hooks); + if (mProLogic2) { + sndInit(numVoices, numMusic, numSfx, 1, 1, aramSize); + } else { + sndInit(numVoices, numMusic, numSfx, 1, 0, aramSize); + } + DTKInit(); + + mpGroupSetDB = new rstl::map< rstl::string, rstl::ncrc_ptr< CAudioGroupSet > >(); + mpGroupSetResNameDB = new rstl::map< uint, rstl::string >(); + mpDVDTrackDB = new rstl::map< rstl::string, rstl::ncrc_ptr< CTrkData > >(); + mpEmitterDB = new rstl::vector< CEmitterData >(maxNumEmitters); + mpListener = nullptr; // TODO: Add listener allocation + mIsLIstenerActive = false; + + if (OSGetSoundMode() == OS_SOUND_MODE_MONO) { + sndOutputMode(SND_OUTPUTMODE_MONO); + mSurroundMode = kSM_Mono; + } else { + sndOutputMode(SND_OUTPUTMODE_SURROUND); + mSurroundMode = kSM_Surround; + } + + mMaxAramUsage = aramSize; +}