From 8a13a04b78c7a85e03046f7b3a2b9fefd76109fb Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 4 Apr 2022 10:22:31 -0400 Subject: [PATCH] Symbol fixes & cleanup --- asm/Kyoto_CWD/main.s | 60 +++++----- asm/bss.s | 4 +- asm/data.s | 4 +- asm/sbss.s | 4 +- asm/text.s | 242 +++++++++++++++++++-------------------- include/macros.inc | 19 --- include/types.h | 70 +++++------ src/musyx/iram_image.c | 6 +- src/os/__ppc_eabi_init.c | 4 +- 9 files changed, 192 insertions(+), 221 deletions(-) diff --git a/asm/Kyoto_CWD/main.s b/asm/Kyoto_CWD/main.s index 58fc4696..ac64f857 100644 --- a/asm/Kyoto_CWD/main.s +++ b/asm/Kyoto_CWD/main.s @@ -2203,9 +2203,9 @@ lbl_800046C0: /* 800046C0 00001620 80 7C 01 28 */ lwz r3, 0x128(r28) /* 800046C4 00001624 38 63 01 34 */ addi r3, r3, 0x134 /* 800046C8 00001628 4B FF F5 C1 */ bl "__as__Q24rstl24single_ptr<10CGameState>FP10CGameState" -/* 800046CC 0000162C 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 800046CC 0000162C 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 800046D0 00001630 38 61 00 28 */ addi r3, r1, 0x28 -/* 800046D4 00001634 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 800046D4 00001634 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 800046D8 00001638 38 80 00 00 */ li r4, 0 /* 800046DC 0000163C 90 01 00 28 */ stw r0, 0x28(r1) /* 800046E0 00001640 48 33 A9 CD */ bl __dt__12CInputStreamFv @@ -2273,9 +2273,9 @@ __dt__15CMemoryInStreamFv: /* 800047C0 00001720 93 C1 00 08 */ stw r30, 8(r1) /* 800047C4 00001724 7C 7E 1B 79 */ or. r30, r3, r3 /* 800047C8 00001728 41 82 00 28 */ beq lbl_800047F0 -/* 800047CC 0000172C 3C A0 80 3F */ lis r5, lbl_803EE398@ha +/* 800047CC 0000172C 3C A0 80 3F */ lis r5, __vt__15CMemoryInStream@ha /* 800047D0 00001730 38 80 00 00 */ li r4, 0 -/* 800047D4 00001734 38 05 E3 98 */ addi r0, r5, lbl_803EE398@l +/* 800047D4 00001734 38 05 E3 98 */ addi r0, r5, __vt__15CMemoryInStream@l /* 800047D8 00001738 90 1E 00 00 */ stw r0, 0(r30) /* 800047DC 0000173C 48 33 A8 D1 */ bl __dt__12CInputStreamFv /* 800047E0 00001740 7F E0 07 35 */ extsh. r0, r31 @@ -2658,8 +2658,8 @@ lbl_80004CD0: /* 80004CE0 00001C40 90 03 00 08 */ stw r0, 8(r3) /* 80004CE4 00001C44 4E 80 00 20 */ blr -.global sub_80004ce8 -sub_80004ce8: +.global AsyncIdle__5CMainFUl +AsyncIdle__5CMainFUl: /* 80004CE8 00001C48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80004CEC 00001C4C 7C 08 02 A6 */ mflr r0 /* 80004CF0 00001C50 90 01 00 14 */ stw r0, 0x14(r1) @@ -2749,7 +2749,7 @@ RsMain__5CMainFiPCPCc: /* 80004E24 00001D84 41 82 00 14 */ beq lbl_80004E38 /* 80004E28 00001D88 7F A4 EB 78 */ mr r4, r29 /* 80004E2C 00001D8C 38 BD 00 6D */ addi r5, r29, 0x6d -/* 80004E30 00001D90 48 00 2C 8D */ bl __ct__18CGameGlobalObjectsFv +/* 80004E30 00001D90 48 00 2C 8D */ bl __ct__18CGameGlobalObjectsFP10COsContextP10CMemorySys /* 80004E34 00001D94 7C 60 1B 78 */ mr r0, r3 lbl_80004E38: /* 80004E38 00001D98 90 01 00 0C */ stw r0, 0xc(r1) @@ -2922,7 +2922,7 @@ lbl_8000505C: /* 800050A0 00002000 7F A3 EB 78 */ mr r3, r29 /* 800050A4 00002004 4B FF FA 49 */ bl AddWorldPaks__5CMainFv /* 800050A8 00002008 38 00 00 00 */ li r0, 0 -/* 800050AC 0000200C 38 8D A9 18 */ addi r4, r13, lbl_805A94D8@sda21 +/* 800050AC 0000200C 38 8D A9 18 */ addi r4, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 800050B0 00002010 3C 60 80 3D */ lis r3, lbl_803CBE74@ha /* 800050B4 00002014 90 81 00 50 */ stw r4, 0x50(r1) /* 800050B8 00002018 38 83 BE 74 */ addi r4, r3, lbl_803CBE74@l @@ -2983,9 +2983,9 @@ lbl_80005180: /* 80005188 000020E8 90 1D 01 64 */ stw r0, 0x164(r29) /* 8000518C 000020EC 48 00 19 89 */ bl PreloadAudio__24CGameArchitectureSupportFv /* 80005190 000020F0 48 38 02 19 */ bl OSGetTime -/* 80005194 000020F4 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80005194 000020F4 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 80005198 000020F8 7C 9A 20 10 */ subfc r4, r26, r4 -/* 8000519C 000020FC 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 8000519C 000020FC 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 800051A0 00002100 7C 7B 19 10 */ subfe r3, r27, r3 /* 800051A4 00002104 80 A6 00 08 */ lwz r5, 8(r6) /* 800051A8 00002108 80 C6 00 0C */ lwz r6, 0xc(r6) @@ -3018,19 +3018,19 @@ lbl_80005180: /* 80005214 00002174 38 80 00 01 */ li r4, 1 /* 80005218 00002178 48 33 9B 21 */ bl ReadBits__12CInputStreamFi /* 8000521C 0000217C 7C 03 00 D0 */ neg r0, r3 -/* 80005220 00002180 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80005220 00002180 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80005224 00002184 7C 00 1B 78 */ or r0, r0, r3 /* 80005228 00002188 38 61 00 60 */ addi r3, r1, 0x60 /* 8000522C 0000218C 54 05 0F FE */ srwi r5, r0, 0x1f -/* 80005230 00002190 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80005230 00002190 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80005234 00002194 98 AD 80 00 */ stb r5, lbl_805A6BC0@sda21(r13) /* 80005238 00002198 38 80 00 00 */ li r4, 0 /* 8000523C 0000219C 90 01 00 60 */ stw r0, 0x60(r1) /* 80005240 000021A0 48 33 9E 6D */ bl __dt__12CInputStreamFv lbl_80005244: -/* 80005244 000021A4 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 80005244 000021A4 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 80005248 000021A8 CB E2 80 10 */ lfd f31, lbl_805A9D30@sda21(r2) -/* 8000524C 000021AC 3B 63 FD 30 */ addi r27, r3, lbl_8059FD30@l +/* 8000524C 000021AC 3B 63 FD 30 */ addi r27, r3, mData__10CStopwatch@l /* 80005250 000021B0 48 00 05 50 */ b lbl_800057A0 lbl_80005254: /* 80005254 000021B4 80 1B 00 00 */ lwz r0, 0(r27) @@ -3041,8 +3041,8 @@ lbl_80005254: /* 80005268 000021C8 7C 83 1A 78 */ xor r3, r4, r3 /* 8000526C 000021CC 7C 60 03 79 */ or. r0, r3, r0 /* 80005270 000021D0 40 82 00 10 */ bne lbl_80005280 -/* 80005274 000021D4 3C 60 80 5A */ lis r3, lbl_8059FD30@ha -/* 80005278 000021D8 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 80005274 000021D4 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha +/* 80005278 000021D8 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 8000527C 000021DC 48 2D 14 A1 */ bl Initialize__Q210CStopwatch7CSWDataFv lbl_80005280: /* 80005280 000021E0 48 38 01 29 */ bl OSGetTime @@ -3157,7 +3157,7 @@ lbl_80005414: /* 80005414 00002374 D0 3E 00 00 */ stfs f1, 0(r30) /* 80005418 00002378 38 61 00 18 */ addi r3, r1, 0x18 /* 8000541C 0000237C 38 9D 00 F0 */ addi r4, r29, 0xf0 -/* 80005420 00002380 48 00 08 25 */ bl sub_80005c44 +/* 80005420 00002380 48 00 08 25 */ bl "GetAverage__21TReservedAverageFv" /* 80005424 00002384 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80005428 00002388 38 80 00 00 */ li r4, 0 /* 8000542C 0000238C 83 41 00 08 */ lwz r26, 8(r1) @@ -3169,8 +3169,8 @@ lbl_80005414: /* 80005444 000023A4 7C 63 22 78 */ xor r3, r3, r4 /* 80005448 000023A8 7C 60 03 79 */ or. r0, r3, r0 /* 8000544C 000023AC 40 82 00 10 */ bne lbl_8000545C -/* 80005450 000023B0 3C 60 80 5A */ lis r3, lbl_8059FD30@ha -/* 80005454 000023B4 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 80005450 000023B0 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha +/* 80005454 000023B4 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 80005458 000023B8 48 2D 12 C5 */ bl Initialize__Q210CStopwatch7CSWDataFv lbl_8000545C: /* 8000545C 000023BC 48 37 FF 4D */ bl OSGetTime @@ -3197,7 +3197,7 @@ lbl_8000547C: /* 800054AC 0000240C FC 20 F0 90 */ fmr f1, f30 /* 800054B0 00002410 7F A3 EB 78 */ mr r3, r29 /* 800054B4 00002414 38 84 00 28 */ addi r4, r4, 0x28 -/* 800054B8 00002418 48 00 0B 85 */ bl DrawDebugMetrics__5CMainFdR10CStopwatch +/* 800054B8 00002418 48 00 0B 85 */ bl DrawDebugMetrics__5CMainFR10CStopwatchf /* 800054BC 0000241C 83 41 00 08 */ lwz r26, 8(r1) /* 800054C0 00002420 48 37 FE E9 */ bl OSGetTime /* 800054C4 00002424 80 BA 00 2C */ lwz r5, 0x2c(r26) @@ -3283,7 +3283,7 @@ lbl_800055EC: /* 800055EC 0000254C D0 3F 00 00 */ stfs f1, 0(r31) /* 800055F0 00002550 38 61 00 10 */ addi r3, r1, 0x10 /* 800055F4 00002554 38 9D 01 04 */ addi r4, r29, 0x104 -/* 800055F8 00002558 48 00 06 4D */ bl sub_80005c44 +/* 800055F8 00002558 48 00 06 4D */ bl "GetAverage__21TReservedAverageFv" /* 800055FC 0000255C FC 1E E8 2A */ fadd f0, f30, f29 /* 80005600 00002560 C8 42 80 10 */ lfd f2, lbl_805A9D30@sda21(r2) /* 80005604 00002564 C0 61 00 10 */ lfs f3, 0x10(r1) @@ -3302,7 +3302,7 @@ lbl_800055EC: /* 80005638 00002598 7C 64 1B 78 */ mr r4, r3 lbl_8000563C: /* 8000563C 0000259C 7F A3 EB 78 */ mr r3, r29 -/* 80005640 000025A0 4B FF F6 A9 */ bl sub_80004ce8 +/* 80005640 000025A0 4B FF F6 A9 */ bl AsyncIdle__5CMainFUl /* 80005644 000025A4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80005648 000025A8 81 83 00 00 */ lwz r12, 0(r3) /* 8000564C 000025AC 81 8C 00 8C */ lwz r12, 0x8c(r12) @@ -3741,8 +3741,8 @@ lbl_80005C20: /* 80005C3C 00002B9C 38 21 00 30 */ addi r1, r1, 0x30 /* 80005C40 00002BA0 4E 80 00 20 */ blr -.global sub_80005c44 -sub_80005c44: +.global "GetAverage__21TReservedAverageFv" +"GetAverage__21TReservedAverageFv": /* 80005C44 00002BA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80005C48 00002BA8 7C 08 02 A6 */ mflr r0 /* 80005C4C 00002BAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4023,8 +4023,8 @@ CheckTerminate__5CMainFv: /* 80006034 00002F94 38 60 00 00 */ li r3, 0 /* 80006038 00002F98 4E 80 00 20 */ blr -.global DrawDebugMetrics__5CMainFdR10CStopwatch -DrawDebugMetrics__5CMainFdR10CStopwatch: +.global DrawDebugMetrics__5CMainFR10CStopwatchf +DrawDebugMetrics__5CMainFR10CStopwatchf: /* 8000603C 00002F9C 4E 80 00 20 */ blr .global DoPredrawMetrics__5CMainFv @@ -5883,8 +5883,8 @@ lbl_80007A90: /* 80007AB4 00004A14 38 21 00 10 */ addi r1, r1, 0x10 /* 80007AB8 00004A18 4E 80 00 20 */ blr -.global __ct__18CGameGlobalObjectsFv -__ct__18CGameGlobalObjectsFv: +.global __ct__18CGameGlobalObjectsFP10COsContextP10CMemorySys +__ct__18CGameGlobalObjectsFP10COsContextP10CMemorySys: /* 80007ABC 00004A1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80007AC0 00004A20 7C 08 02 A6 */ mflr r0 /* 80007AC4 00004A24 90 01 00 24 */ stw r0, 0x24(r1) @@ -6561,11 +6561,11 @@ sub_800083e4: /* 80008414 00005374 38 80 00 01 */ li r4, 1 /* 80008418 00005378 48 33 69 21 */ bl ReadBits__12CInputStreamFi /* 8000841C 0000537C 7C 03 00 D0 */ neg r0, r3 -/* 80008420 00005380 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80008420 00005380 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80008424 00005384 7C 00 1B 78 */ or r0, r0, r3 /* 80008428 00005388 38 61 00 08 */ addi r3, r1, 8 /* 8000842C 0000538C 54 05 0F FE */ srwi r5, r0, 0x1f -/* 80008430 00005390 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80008430 00005390 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80008434 00005394 98 AD A0 98 */ stb r5, lbl_805A8C58@sda21(r13) /* 80008438 00005398 38 80 00 00 */ li r4, 0 /* 8000843C 0000539C 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/bss.s b/asm/bss.s index 88f77b75..fe98c02a 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -934,8 +934,8 @@ lbl_8059FD08: .global lbl_8059FD18 lbl_8059FD18: .skip 0x18 -.global lbl_8059FD30 -lbl_8059FD30: +.global mData__10CStopwatch +mData__10CStopwatch: .skip 0x18 .global lbl_8059FD48 lbl_8059FD48: diff --git a/asm/data.s b/asm/data.s index d573244a..826fa1e0 100644 --- a/asm/data.s +++ b/asm/data.s @@ -2504,8 +2504,8 @@ lbl_803EE368: .global lbl_803EE388 lbl_803EE388: .incbin "baserom.dol", 0x3EB388, 0x10 -.global lbl_803EE398 -lbl_803EE398: +.global __vt__15CMemoryInStream +__vt__15CMemoryInStream: .incbin "baserom.dol", 0x3EB398, 0x10 .global lbl_803EE3A8 lbl_803EE3A8: diff --git a/asm/sbss.s b/asm/sbss.s index 36118f16..02ab3d0f 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -1575,8 +1575,8 @@ lbl_805A94D4: .global lbl_805A94D5 lbl_805A94D5: .skip 0x3 -.global lbl_805A94D8 -lbl_805A94D8: +.global "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>" +"_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>": .skip 0x2 .global lbl_805A94DA lbl_805A94DA: diff --git a/asm/text.s b/asm/text.s index c9b5ce26..351cdc98 100644 --- a/asm/text.s +++ b/asm/text.s @@ -67045,9 +67045,9 @@ lbl_8004757C: /* 8004758C 000444EC 7D 89 03 A6 */ mtctr r12 /* 80047590 000444F0 4E 80 04 21 */ bctrl /* 80047594 000444F4 48 33 DE 15 */ bl OSGetTime -/* 80047598 000444F8 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80047598 000444F8 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 8004759C 000444FC 7C 9E 20 10 */ subfc r4, r30, r4 -/* 800475A0 00044500 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 800475A0 00044500 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 800475A4 00044504 7C 7F 19 10 */ subfe r3, r31, r3 /* 800475A8 00044508 80 A6 00 08 */ lwz r5, 8(r6) /* 800475AC 0004450C 80 C6 00 0C */ lwz r6, 0xc(r6) @@ -68075,9 +68075,9 @@ GenerateObject__13CStateManagerF9TEditorId: /* 800483B4 00045314 80 DC 00 00 */ lwz r6, 0(r28) /* 800483B8 00045318 80 FC 00 08 */ lwz r7, 8(r28) /* 800483BC 0004531C 48 00 00 51 */ bl LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream -/* 800483C0 00045320 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 800483C0 00045320 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 800483C4 00045324 38 61 00 3C */ addi r3, r1, 0x3c -/* 800483C8 00045328 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 800483C8 00045328 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 800483CC 0004532C 38 80 00 00 */ li r4, 0 /* 800483D0 00045330 90 01 00 3C */ stw r0, 0x3c(r1) /* 800483D4 00045334 48 2F 6C D9 */ bl __dt__12CInputStreamFv @@ -84989,9 +84989,9 @@ lbl_80056DF4: /* 80056E14 00053D74 28 00 00 00 */ cmplwi r0, 0 /* 80056E18 00053D78 40 82 00 28 */ bne lbl_80056E40 /* 80056E1C 00053D7C 38 00 00 03 */ li r0, 3 -/* 80056E20 00053D80 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 80056E20 00053D80 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 80056E24 00053D84 90 1B 00 08 */ stw r0, 8(r27) -/* 80056E28 00053D88 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 80056E28 00053D88 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 80056E2C 00053D8C 38 61 00 58 */ addi r3, r1, 0x58 /* 80056E30 00053D90 38 80 00 00 */ li r4, 0 /* 80056E34 00053D94 90 01 00 58 */ stw r0, 0x58(r1) @@ -84999,9 +84999,9 @@ lbl_80056DF4: /* 80056E3C 00053D9C 48 00 00 DC */ b lbl_80056F18 lbl_80056E40: /* 80056E40 00053DA0 38 00 00 01 */ li r0, 1 -/* 80056E44 00053DA4 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 80056E44 00053DA4 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 80056E48 00053DA8 90 1B 00 08 */ stw r0, 8(r27) -/* 80056E4C 00053DAC 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 80056E4C 00053DAC 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 80056E50 00053DB0 38 61 00 58 */ addi r3, r1, 0x58 /* 80056E54 00053DB4 38 80 00 00 */ li r4, 0 /* 80056E58 00053DB8 90 01 00 58 */ stw r0, 0x58(r1) @@ -87090,10 +87090,10 @@ lbl_80058A78: /* 80058A80 000559E0 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80058A84 000559E4 48 2B CE AD */ bl Free__7CMemoryFPCv /* 80058A88 000559E8 38 80 00 00 */ li r4, 0 -/* 80058A8C 000559EC 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 80058A8C 000559EC 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 80058A90 000559F0 90 9F 00 40 */ stw r4, 0x40(r31) /* 80058A94 000559F4 38 A0 00 01 */ li r5, 1 -/* 80058A98 000559F8 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 80058A98 000559F8 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 80058A9C 000559FC 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80058AA0 00055A00 90 9F 00 44 */ stw r4, 0x44(r31) /* 80058AA4 00055A04 38 80 00 00 */ li r4, 0 @@ -87416,7 +87416,7 @@ __ct__6CWorldFR12IObjectStoreR11CResFactoryUi: /* 80058EDC 00055E3C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80058EE0 00055E40 7C BF 2B 78 */ mr r31, r5 /* 80058EE4 00055E44 38 E0 00 01 */ li r7, 1 -/* 80058EE8 00055E48 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 80058EE8 00055E48 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 80058EEC 00055E4C 93 C1 00 28 */ stw r30, 0x28(r1) /* 80058EF0 00055E50 7C 7E 1B 78 */ mr r30, r3 /* 80058EF4 00055E54 3C 60 4D 4C */ lis r3, 0x4D4C564C@ha @@ -87524,7 +87524,7 @@ __ct__Q26CWorld15CSoundGroupDataFiUi: /* 8005907C 00055FDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80059080 00055FE0 7C 08 02 A6 */ mflr r0 /* 80059084 00055FE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80059088 00055FE8 38 0D A9 18 */ addi r0, r13, lbl_805A94D8@sda21 +/* 80059088 00055FE8 38 0D A9 18 */ addi r0, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8005908C 00055FEC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80059090 00055FF0 7C BF 2B 78 */ mr r31, r5 /* 80059094 00055FF4 38 A0 00 00 */ li r5, 0 @@ -96843,9 +96843,9 @@ lbl_80060FB0: /* 80061014 0005DF74 38 C1 00 3C */ addi r6, r1, 0x3c /* 80061018 0005DF78 90 01 00 1C */ stw r0, 0x1c(r1) /* 8006101C 0005DF7C 4B FE 71 59 */ bl LoadScriptObjects__13CStateManagerF7TAreaIdR12CInputStreamQ213CStateManager18EScriptPersistence -/* 80061020 0005DF80 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80061020 0005DF80 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80061024 0005DF84 38 61 00 4C */ addi r3, r1, 0x4c -/* 80061028 0005DF88 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80061028 0005DF88 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8006102C 0005DF8C 38 80 00 00 */ li r4, 0 /* 80061030 0005DF90 90 01 00 4C */ stw r0, 0x4c(r1) /* 80061034 0005DF94 48 2D E0 79 */ bl __dt__12CInputStreamFv @@ -97349,9 +97349,9 @@ lbl_80061748: /* 80061748 0005E6A8 83 3F 01 2C */ lwz r25, 0x12c(r31) /* 8006174C 0005E6AC 80 79 00 5C */ lwz r3, 0x5c(r25) /* 80061750 0005E6B0 48 2B 41 E1 */ bl Free__7CMemoryFPCv -/* 80061754 0005E6B4 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 80061754 0005E6B4 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 80061758 0005E6B8 93 B9 00 5C */ stw r29, 0x5c(r25) -/* 8006175C 0005E6BC 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 8006175C 0005E6BC 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 80061760 0005E6C0 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 80061764 0005E6C4 90 01 01 C8 */ stw r0, 0x1c8(r1) /* 80061768 0005E6C8 38 80 00 00 */ li r4, 0 @@ -97462,9 +97462,9 @@ lbl_800618CC: /* 800618F0 0005E850 38 84 00 70 */ addi r4, r4, 0x70 /* 800618F4 0005E854 4B FE 41 75 */ bl sub_80045a68 lbl_800618F8: -/* 800618F8 0005E858 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 800618F8 0005E858 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 800618FC 0005E85C 38 61 01 A4 */ addi r3, r1, 0x1a4 -/* 80061900 0005E860 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80061900 0005E860 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80061904 0005E864 38 80 00 00 */ li r4, 0 /* 80061908 0005E868 90 01 01 A4 */ stw r0, 0x1a4(r1) /* 8006190C 0005E86C 48 2D D7 A1 */ bl __dt__12CInputStreamFv @@ -97549,9 +97549,9 @@ lbl_80061A38: /* 80061A38 0005E998 7F 23 CB 78 */ mr r3, r25 /* 80061A3C 0005E99C 48 2B 3E F5 */ bl Free__7CMemoryFPCv lbl_80061A40: -/* 80061A40 0005E9A0 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80061A40 0005E9A0 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80061A44 0005E9A4 38 61 01 80 */ addi r3, r1, 0x180 -/* 80061A48 0005E9A8 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80061A48 0005E9A8 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80061A4C 0005E9AC 38 80 00 00 */ li r4, 0 /* 80061A50 0005E9B0 90 01 01 80 */ stw r0, 0x180(r1) /* 80061A54 0005E9B4 48 2D D6 59 */ bl __dt__12CInputStreamFv @@ -97627,9 +97627,9 @@ lbl_80061B2C: /* 80061B5C 0005EABC 38 63 01 88 */ addi r3, r3, 0x188 /* 80061B60 0005EAC0 48 2B 0F E1 */ bl __as__12CTransform4fFRC12CTransform4f lbl_80061B64: -/* 80061B64 0005EAC4 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80061B64 0005EAC4 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80061B68 0005EAC8 38 61 01 5C */ addi r3, r1, 0x15c -/* 80061B6C 0005EACC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80061B6C 0005EACC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80061B70 0005EAD0 38 80 00 00 */ li r4, 0 /* 80061B74 0005EAD4 90 01 01 5C */ stw r0, 0x15c(r1) /* 80061B78 0005EAD8 48 2D D5 35 */ bl __dt__12CInputStreamFv @@ -98031,9 +98031,9 @@ lbl_800620F0: /* 800620F4 0005F054 38 03 00 01 */ addi r0, r3, 1 /* 800620F8 0005F058 90 19 00 04 */ stw r0, 4(r25) lbl_800620FC: -/* 800620FC 0005F05C 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 800620FC 0005F05C 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80062100 0005F060 38 61 01 38 */ addi r3, r1, 0x138 -/* 80062104 0005F064 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80062104 0005F064 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80062108 0005F068 38 80 00 00 */ li r4, 0 /* 8006210C 0005F06C 90 01 01 38 */ stw r0, 0x138(r1) /* 80062110 0005F070 48 2D CF 9D */ bl __dt__12CInputStreamFv @@ -102161,9 +102161,9 @@ lbl_800659E4: /* 80065A74 000629D4 90 1F 08 98 */ stw r0, 0x898(r31) /* 80065A78 000629D8 41 82 01 E0 */ beq lbl_80065C58 /* 80065A7C 000629DC 48 31 F9 2D */ bl OSGetTime -/* 80065A80 000629E0 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80065A80 000629E0 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 80065A84 000629E4 7C 9B 20 10 */ subfc r4, r27, r4 -/* 80065A88 000629E8 3B C5 FD 30 */ addi r30, r5, lbl_8059FD30@l +/* 80065A88 000629E8 3B C5 FD 30 */ addi r30, r5, mData__10CStopwatch@l /* 80065A8C 000629EC 7C 7A 19 10 */ subfe r3, r26, r3 /* 80065A90 000629F0 80 BE 00 08 */ lwz r5, 8(r30) /* 80065A94 000629F4 80 DE 00 0C */ lwz r6, 0xc(r30) @@ -102298,9 +102298,9 @@ lbl_80065C58: /* 80065C80 00062BE0 7F B6 EB 78 */ mr r22, r29 /* 80065C84 00062BE4 7F 3E CB 78 */ mr r30, r25 /* 80065C88 00062BE8 48 31 F7 21 */ bl OSGetTime -/* 80065C8C 00062BEC 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80065C8C 00062BEC 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 80065C90 00062BF0 7C 9B 20 10 */ subfc r4, r27, r4 -/* 80065C94 00062BF4 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 80065C94 00062BF4 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 80065C98 00062BF8 7C 7A 19 10 */ subfe r3, r26, r3 /* 80065C9C 00062BFC 80 A6 00 08 */ lwz r5, 8(r6) /* 80065CA0 00062C00 80 C6 00 0C */ lwz r6, 0xc(r6) @@ -102343,9 +102343,9 @@ lbl_80065D1C: /* 80065D24 00062C84 7F 84 E3 78 */ mr r4, r28 /* 80065D28 00062C88 48 12 C4 AD */ bl Draw__18CHudRadarInterfaceCFRC13CStateManagerf /* 80065D2C 00062C8C 48 31 F6 7D */ bl OSGetTime -/* 80065D30 00062C90 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80065D30 00062C90 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 80065D34 00062C94 7C 9B 20 10 */ subfc r4, r27, r4 -/* 80065D38 00062C98 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 80065D38 00062C98 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 80065D3C 00062C9C 7C 7A 19 10 */ subfe r3, r26, r3 /* 80065D40 00062CA0 80 A6 00 08 */ lwz r5, 8(r6) /* 80065D44 00062CA4 80 C6 00 0C */ lwz r6, 0xc(r6) @@ -102364,9 +102364,9 @@ lbl_80065D5C: /* 80065D74 00062CD4 4E 80 04 21 */ bctrl lbl_80065D78: /* 80065D78 00062CD8 48 31 F6 31 */ bl OSGetTime -/* 80065D7C 00062CDC 3C A0 80 5A */ lis r5, lbl_8059FD30@ha +/* 80065D7C 00062CDC 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 80065D80 00062CE0 7C 9B 20 10 */ subfc r4, r27, r4 -/* 80065D84 00062CE4 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 80065D84 00062CE4 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 80065D88 00062CE8 7C 7A 19 10 */ subfe r3, r26, r3 /* 80065D8C 00062CEC 80 A6 00 08 */ lwz r5, 8(r6) /* 80065D90 00062CF0 80 C6 00 0C */ lwz r6, 0xc(r6) @@ -118028,9 +118028,9 @@ lbl_80073AFC: /* 80073B18 00070A78 38 80 00 01 */ li r4, 1 /* 80073B1C 00070A7C 48 24 EF 61 */ bl __dt__9CGuiFrameFv lbl_80073B20: -/* 80073B20 00070A80 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80073B20 00070A80 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80073B24 00070A84 38 61 00 3C */ addi r3, r1, 0x3c -/* 80073B28 00070A88 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80073B28 00070A88 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80073B2C 00070A8C 38 80 00 00 */ li r4, 0 /* 80073B30 00070A90 90 01 00 3C */ stw r0, 0x3c(r1) /* 80073B34 00070A94 48 2C B5 79 */ bl __dt__12CInputStreamFv @@ -118067,9 +118067,9 @@ lbl_80073B90: /* 80073BAC 00070B0C 38 80 00 01 */ li r4, 1 /* 80073BB0 00070B10 48 24 EE CD */ bl __dt__9CGuiFrameFv lbl_80073BB4: -/* 80073BB4 00070B14 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80073BB4 00070B14 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80073BB8 00070B18 38 61 00 18 */ addi r3, r1, 0x18 -/* 80073BBC 00070B1C 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80073BBC 00070B1C 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80073BC0 00070B20 38 80 00 00 */ li r4, 0 /* 80073BC4 00070B24 90 01 00 18 */ stw r0, 0x18(r1) /* 80073BC8 00070B28 48 2C B4 E5 */ bl __dt__12CInputStreamFv @@ -416543,7 +416543,7 @@ CreatePlasmaLights__17CPlasmaProjectileFUiRC6CLightR13CStateManager: /* 80177174 001740D4 3B E3 06 68 */ addi r31, r3, lbl_803D0668@l lbl_80177178: /* 80177178 001740D8 38 00 00 00 */ li r0, 0 -/* 8017717C 001740DC 38 6D A9 18 */ addi r3, r13, lbl_805A94D8@sda21 +/* 8017717C 001740DC 38 6D A9 18 */ addi r3, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 80177180 001740E0 90 61 00 2C */ stw r3, 0x2c(r1) /* 80177184 001740E4 7F A4 EB 78 */ mr r4, r29 /* 80177188 001740E8 38 61 00 1C */ addi r3, r1, 0x1c @@ -439641,7 +439641,7 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018BF74 00188ED4 48 09 01 35 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo /* 8018BF78 00188ED8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) /* 8018BF7C 00188EDC 3C 60 80 5A */ lis r3, lbl_805A66A0@ha -/* 8018BF80 00188EE0 38 CD A9 18 */ addi r6, r13, lbl_805A94D8@sda21 +/* 8018BF80 00188EE0 38 CD A9 18 */ addi r6, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8018BF84 00188EE4 38 00 00 00 */ li r0, 0 /* 8018BF88 00188EE8 B0 98 05 D4 */ sth r4, 0x5d4(r24) /* 8018BF8C 00188EEC 38 A3 66 A0 */ addi r5, r3, lbl_805A66A0@l @@ -520538,9 +520538,9 @@ lbl_801D43D4: /* 801D4400 001D1360 D8 3F 00 18 */ stfd f1, 0x18(r31) /* 801D4404 001D1364 D8 1F 00 20 */ stfd f0, 0x20(r31) /* 801D4408 001D1368 4B E3 4B 61 */ bl __dt__12CPlayerStateFv -/* 801D440C 001D136C 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 801D440C 001D136C 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 801D4410 001D1370 38 61 00 10 */ addi r3, r1, 0x10 -/* 801D4414 001D1374 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 801D4414 001D1374 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 801D4418 001D1378 38 80 00 00 */ li r4, 0 /* 801D441C 001D137C 90 01 00 10 */ stw r0, 0x10(r1) /* 801D4420 001D1380 48 16 AC 8D */ bl __dt__12CInputStreamFv @@ -571127,7 +571127,7 @@ lbl_802017CC: lbl_802017D8: /* 802017D8 001FE738 80 63 00 00 */ lwz r3, 0(r3) /* 802017DC 001FE73C 38 00 00 00 */ li r0, 0 -/* 802017E0 001FE740 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 802017E0 001FE740 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 802017E4 001FE744 7F C4 F3 78 */ mr r4, r30 /* 802017E8 001FE748 90 61 00 58 */ stw r3, 0x58(r1) /* 802017EC 001FE74C 38 61 00 24 */ addi r3, r1, 0x24 @@ -571276,7 +571276,7 @@ lbl_802019FC: lbl_80201A08: /* 80201A08 001FE968 80 63 00 00 */ lwz r3, 0(r3) /* 80201A0C 001FE96C 38 00 00 00 */ li r0, 0 -/* 80201A10 001FE970 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 80201A10 001FE970 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 80201A14 001FE974 7F C4 F3 78 */ mr r4, r30 /* 80201A18 001FE978 90 61 00 58 */ stw r3, 0x58(r1) /* 80201A1C 001FE97C 38 61 00 24 */ addi r3, r1, 0x24 @@ -654603,9 +654603,9 @@ LoadGameState__13SGameFileSlotFi: /* 8024C334 00249294 7F E5 FB 78 */ mr r5, r31 /* 8024C338 00249298 38 81 00 08 */ addi r4, r1, 8 /* 8024C33C 0024929C 4B DB 81 69 */ bl StreamNewGameState__5CMainFR12CInputStream -/* 8024C340 002492A0 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8024C340 002492A0 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8024C344 002492A4 38 61 00 08 */ addi r3, r1, 8 -/* 8024C348 002492A8 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8024C348 002492A8 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8024C34C 002492AC 38 80 00 00 */ li r4, 0 /* 8024C350 002492B0 90 01 00 08 */ stw r0, 8(r1) /* 8024C354 002492B4 48 0F 2D 59 */ bl __dt__12CInputStreamFv @@ -654977,9 +654977,9 @@ ExportPersistentOptions__17CMemoryCardDriverFv: /* 8024C848 002497A8 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8024C84C 002497AC 38 80 FF FF */ li r4, -1 /* 8024C850 002497B0 4B DB 79 89 */ bl __dt__14CSystemOptionsFv -/* 8024C854 002497B4 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8024C854 002497B4 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8024C858 002497B8 38 61 00 08 */ addi r3, r1, 8 -/* 8024C85C 002497BC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8024C85C 002497BC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8024C860 002497C0 38 80 00 00 */ li r4, 0 /* 8024C864 002497C4 90 01 00 08 */ stw r0, 8(r1) /* 8024C868 002497C8 48 0F 28 45 */ bl __dt__12CInputStreamFv @@ -655008,9 +655008,9 @@ ImportPersistentOptions__17CMemoryCardDriverFv: /* 8024C8B8 00249818 38 61 00 2C */ addi r3, r1, 0x2c /* 8024C8BC 0024981C 38 80 FF FF */ li r4, -1 /* 8024C8C0 00249820 4B DB 79 19 */ bl __dt__14CSystemOptionsFv -/* 8024C8C4 00249824 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8024C8C4 00249824 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8024C8C8 00249828 38 61 00 08 */ addi r3, r1, 8 -/* 8024C8CC 0024982C 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8024C8CC 0024982C 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8024C8D0 00249830 38 80 00 00 */ li r4, 0 /* 8024C8D4 00249834 90 01 00 08 */ stw r0, 8(r1) /* 8024C8D8 00249838 48 0F 27 D5 */ bl __dt__12CInputStreamFv @@ -655280,9 +655280,9 @@ lbl_8024CC50: /* 8024CC6C 00249BCC 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8024CC70 00249BD0 38 81 00 10 */ addi r4, r1, 0x10 /* 8024CC74 00249BD4 4B F8 73 CD */ bl ReadSystemOptions__10CGameStateFR12CInputStream -/* 8024CC78 00249BD8 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8024CC78 00249BD8 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8024CC7C 00249BDC 38 61 00 10 */ addi r3, r1, 0x10 -/* 8024CC80 00249BE0 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8024CC80 00249BE0 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8024CC84 00249BE4 38 80 00 00 */ li r4, 0 /* 8024CC88 00249BE8 90 01 00 10 */ stw r0, 0x10(r1) /* 8024CC8C 00249BEC 48 0F 24 21 */ bl __dt__12CInputStreamFv @@ -655649,9 +655649,9 @@ lbl_8024D150: /* 8024D170 0024A0D0 7F 83 E3 78 */ mr r3, r28 /* 8024D174 0024A0D4 4B FF F7 0D */ bl ImportPersistentOptions__17CMemoryCardDriverFv lbl_8024D178: -/* 8024D178 0024A0D8 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8024D178 0024A0D8 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8024D17C 0024A0DC 38 61 00 20 */ addi r3, r1, 0x20 -/* 8024D180 0024A0E0 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8024D180 0024A0E0 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8024D184 0024A0E4 38 80 00 00 */ li r4, 0 /* 8024D188 0024A0E8 90 01 00 20 */ stw r0, 0x20(r1) /* 8024D18C 0024A0EC 48 0F 1F 21 */ bl __dt__12CInputStreamFv @@ -744536,7 +744536,7 @@ __ct__15CTweakSlideShowFR12CInputStream: /* 8029C618 00299578 7C 9F 23 78 */ mr r31, r4 /* 8029C61C 0029957C 93 C1 00 48 */ stw r30, 0x48(r1) /* 8029C620 00299580 7C 7E 1B 78 */ mr r30, r3 -/* 8029C624 00299584 38 6D A9 18 */ addi r3, r13, lbl_805A94D8@sda21 +/* 8029C624 00299584 38 6D A9 18 */ addi r3, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8029C628 00299588 90 1E 00 00 */ stw r0, 0(r30) /* 8029C62C 0029958C 38 00 00 00 */ li r0, 0 /* 8029C630 00299590 90 BE 00 00 */ stw r5, 0(r30) @@ -751610,10 +751610,10 @@ MakeFromMemory__12CAreaOctTreeFPvUiPP12CAreaOctTreePb: lbl_802A2C68: /* 802A2C68 0029FBC8 90 1E 00 00 */ stw r0, 0(r30) /* 802A2C6C 0029FBCC 38 00 00 01 */ li r0, 1 -/* 802A2C70 0029FBD0 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 802A2C70 0029FBD0 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 802A2C74 0029FBD4 38 61 00 40 */ addi r3, r1, 0x40 /* 802A2C78 0029FBD8 98 1F 00 00 */ stb r0, 0(r31) -/* 802A2C7C 0029FBDC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 802A2C7C 0029FBDC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 802A2C80 0029FBE0 38 80 00 00 */ li r4, 0 /* 802A2C84 0029FBE4 90 01 00 40 */ stw r0, 0x40(r1) /* 802A2C88 0029FBE8 48 09 C4 25 */ bl __dt__12CInputStreamFv @@ -764466,11 +764466,11 @@ __ct__11CPVSAreaSetFPCci: /* 802AE564 002AB4C4 7C 66 1B 78 */ mr r6, r3 lbl_802AE568: /* 802AE568 002AB4C8 7C 06 00 D0 */ neg r0, r6 -/* 802AE56C 002AB4CC 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 802AE56C 002AB4CC 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 802AE570 002AB4D0 7C 00 33 78 */ or r0, r0, r6 /* 802AE574 002AB4D4 38 61 00 10 */ addi r3, r1, 0x10 /* 802AE578 002AB4D8 54 05 0F FE */ srwi r5, r0, 0x1f -/* 802AE57C 002AB4DC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 802AE57C 002AB4DC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 802AE580 002AB4E0 98 BB 00 00 */ stb r5, 0(r27) /* 802AE584 002AB4E4 38 80 00 00 */ li r4, 0 /* 802AE588 002AB4E8 90 DB 00 04 */ stw r6, 4(r27) @@ -809911,14 +809911,14 @@ Wait__10CStopwatchFf: /* 802D627C 002D31DC 90 01 00 14 */ stw r0, 0x14(r1) /* 802D6280 002D31E0 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 802D6284 002D31E4 40 80 00 18 */ bge lbl_802D629C -/* 802D6288 002D31E8 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 802D6288 002D31E8 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 802D628C 002D31EC C0 22 C5 60 */ lfs f1, lbl_805AE280@sda21(r2) -/* 802D6290 002D31F0 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 802D6290 002D31F0 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 802D6294 002D31F4 48 00 05 05 */ bl Wait__Q210CStopwatch7CSWDataCFf /* 802D6298 002D31F8 48 00 00 10 */ b lbl_802D62A8 lbl_802D629C: -/* 802D629C 002D31FC 3C 60 80 5A */ lis r3, lbl_8059FD30@ha -/* 802D62A0 002D3200 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 802D629C 002D31FC 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha +/* 802D62A0 002D3200 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 802D62A4 002D3204 48 00 04 F5 */ bl Wait__Q210CStopwatch7CSWDataCFf lbl_802D62A8: /* 802D62A8 002D3208 80 01 00 14 */ lwz r0, 0x14(r1) @@ -809954,10 +809954,10 @@ lbl_802D62E8: __sinit_CStopwatch_cpp: /* 802D6308 002D3268 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802D630C 002D326C 7C 08 02 A6 */ mflr r0 -/* 802D6310 002D3270 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 802D6310 002D3270 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 802D6314 002D3274 C0 02 C5 60 */ lfs f0, lbl_805AE280@sda21(r2) /* 802D6318 002D3278 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D631C 002D327C 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 802D631C 002D327C 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 802D6320 002D3280 38 00 00 00 */ li r0, 0 /* 802D6324 002D3284 90 03 00 04 */ stw r0, 4(r3) /* 802D6328 002D3288 90 03 00 00 */ stw r0, 0(r3) @@ -871716,9 +871716,9 @@ VideoPostCallback__9CGraphicsFUl: /* 8030BD84 00308CE4 D0 0D A8 08 */ stfs f0, lbl_805A93C8@sda21(r13) /* 8030BD88 00308CE8 7C 60 19 10 */ subfe r3, r0, r3 /* 8030BD8C 00308CEC 48 07 E1 D9 */ bl __cvt_sll_flt -/* 8030BD90 00308CF0 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 8030BD90 00308CF0 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 8030BD94 00308CF4 C0 02 C8 10 */ lfs f0, lbl_805AE530@sda21(r2) -/* 8030BD98 00308CF8 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 8030BD98 00308CF8 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 8030BD9C 00308CFC 38 80 00 00 */ li r4, 0 /* 8030BDA0 00308D00 C0 43 00 10 */ lfs f2, 0x10(r3) /* 8030BDA4 00308D04 80 03 00 00 */ lwz r0, 0(r3) @@ -883367,9 +883367,9 @@ MakePVSVisOctree__13CPVSVisOctreeFPCci: /* 8031620C 0031316C 38 81 00 08 */ addi r4, r1, 8 /* 80316210 00313170 7C FD 02 14 */ add r7, r29, r0 /* 80316214 00313174 48 00 00 3D */ bl __ct__13CPVSVisOctreeFRC6CAABoxiiPCc -/* 80316218 00313178 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80316218 00313178 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8031621C 0031317C 38 61 00 20 */ addi r3, r1, 0x20 -/* 80316220 00313180 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80316220 00313180 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80316224 00313184 38 80 00 00 */ li r4, 0 /* 80316228 00313188 90 01 00 20 */ stw r0, 0x20(r1) /* 8031622C 0031318C 48 02 8E 81 */ bl __dt__12CInputStreamFv @@ -890239,9 +890239,9 @@ lbl_8031C62C: /* 8031C630 00319590 7C 9E 20 10 */ subfc r4, r30, r4 /* 8031C634 00319594 7C 7F 19 10 */ subfe r3, r31, r3 /* 8031C638 00319598 48 06 D9 2D */ bl __cvt_sll_flt -/* 8031C63C 0031959C 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 8031C63C 0031959C 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 8031C640 003195A0 34 01 00 08 */ addic. r0, r1, 8 -/* 8031C644 003195A4 38 63 FD 30 */ addi r3, r3, lbl_8059FD30@l +/* 8031C644 003195A4 38 63 FD 30 */ addi r3, r3, mData__10CStopwatch@l /* 8031C648 003195A8 C0 03 00 10 */ lfs f0, 0x10(r3) /* 8031C64C 003195AC EC 01 00 32 */ fmuls f0, f1, f0 /* 8031C650 003195B0 D0 1D 02 D0 */ stfs f0, 0x2d0(r29) @@ -892758,9 +892758,9 @@ lbl_8031EA18: /* 8031EA24 0031B984 7C 9E 20 10 */ subfc r4, r30, r4 /* 8031EA28 0031B988 7C 7F 19 10 */ subfe r3, r31, r3 /* 8031EA2C 0031B98C 48 06 B5 39 */ bl __cvt_sll_flt -/* 8031EA30 0031B990 3C 80 80 5A */ lis r4, lbl_8059FD30@ha +/* 8031EA30 0031B990 3C 80 80 5A */ lis r4, mData__10CStopwatch@ha /* 8031EA34 0031B994 38 61 00 30 */ addi r3, r1, 0x30 -/* 8031EA38 0031B998 38 A4 FD 30 */ addi r5, r4, lbl_8059FD30@l +/* 8031EA38 0031B998 38 A4 FD 30 */ addi r5, r4, mData__10CStopwatch@l /* 8031EA3C 0031B99C 38 80 FF FF */ li r4, -1 /* 8031EA40 0031B9A0 C0 05 00 10 */ lfs f0, 0x10(r5) /* 8031EA44 0031B9A4 EC 01 00 32 */ fmuls f0, f1, f0 @@ -910162,9 +910162,9 @@ lbl_8032DFD8: /* 8032DFDC 0032AF3C 7C 9E 20 10 */ subfc r4, r30, r4 /* 8032DFE0 0032AF40 7C 7F 19 10 */ subfe r3, r31, r3 /* 8032DFE4 0032AF44 48 05 BF 81 */ bl __cvt_sll_flt -/* 8032DFE8 0032AF48 3C 80 80 5A */ lis r4, lbl_8059FD30@ha +/* 8032DFE8 0032AF48 3C 80 80 5A */ lis r4, mData__10CStopwatch@ha /* 8032DFEC 0032AF4C 38 60 00 01 */ li r3, 1 -/* 8032DFF0 0032AF50 38 84 FD 30 */ addi r4, r4, lbl_8059FD30@l +/* 8032DFF0 0032AF50 38 84 FD 30 */ addi r4, r4, mData__10CStopwatch@l /* 8032DFF4 0032AF54 C0 04 00 10 */ lfs f0, 0x10(r4) /* 8032DFF8 0032AF58 EC 01 00 32 */ fmuls f0, f1, f0 /* 8032DFFC 0032AF5C D0 1D 01 C8 */ stfs f0, 0x1c8(r29) @@ -910968,9 +910968,9 @@ lbl_8032EB3C: /* 8032EB58 0032BAB8 7C 9E 20 10 */ subfc r4, r30, r4 /* 8032EB5C 0032BABC 7C 7F 19 10 */ subfe r3, r31, r3 /* 8032EB60 0032BAC0 48 05 B4 05 */ bl __cvt_sll_flt -/* 8032EB64 0032BAC4 3C 80 80 5A */ lis r4, lbl_8059FD30@ha +/* 8032EB64 0032BAC4 3C 80 80 5A */ lis r4, mData__10CStopwatch@ha /* 8032EB68 0032BAC8 38 61 00 24 */ addi r3, r1, 0x24 -/* 8032EB6C 0032BACC 38 A4 FD 30 */ addi r5, r4, lbl_8059FD30@l +/* 8032EB6C 0032BACC 38 A4 FD 30 */ addi r5, r4, mData__10CStopwatch@l /* 8032EB70 0032BAD0 38 80 FF FF */ li r4, -1 /* 8032EB74 0032BAD4 C0 05 00 10 */ lfs f0, 0x10(r5) /* 8032EB78 0032BAD8 EC 01 00 32 */ fmuls f0, f1, f0 @@ -911249,8 +911249,8 @@ lbl_8032EDC8: /* 8032EF48 0032BEA8 41 82 00 54 */ beq lbl_8032EF9C /* 8032EF4C 0032BEAC 48 05 64 5D */ bl OSGetTime /* 8032EF50 0032BEB0 80 ED A6 7C */ lwz r7, lbl_805A923C@sda21(r13) -/* 8032EF54 0032BEB4 3C A0 80 5A */ lis r5, lbl_8059FD30@ha -/* 8032EF58 0032BEB8 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 8032EF54 0032BEB4 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha +/* 8032EF58 0032BEB8 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 8032EF5C 0032BEBC 80 0D A6 78 */ lwz r0, lbl_805A9238@sda21(r13) /* 8032EF60 0032BEC0 7C 87 20 10 */ subfc r4, r7, r4 /* 8032EF64 0032BEC4 80 A6 00 08 */ lwz r5, 8(r6) @@ -922531,9 +922531,9 @@ lbl_80338AF0: /* 80338B4C 00335AAC 7D 89 03 A6 */ mtctr r12 /* 80338B50 00335AB0 4E 80 04 21 */ bctrl lbl_80338B54: -/* 80338B54 00335AB4 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80338B54 00335AB4 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80338B58 00335AB8 38 61 00 60 */ addi r3, r1, 0x60 -/* 80338B5C 00335ABC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80338B5C 00335ABC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80338B60 00335AC0 38 80 00 00 */ li r4, 0 /* 80338B64 00335AC4 90 01 00 60 */ stw r0, 0x60(r1) /* 80338B68 00335AC8 48 00 65 45 */ bl __dt__12CInputStreamFv @@ -923338,11 +923338,11 @@ lbl_80339630: /* 80339640 003365A0 4B FD C2 F1 */ bl Free__7CMemoryFPCv lbl_80339644: /* 80339644 003365A4 80 9E 00 2C */ lwz r4, 0x2c(r30) -/* 80339648 003365A8 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 80339648 003365A8 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 8033964C 003365AC 3A D8 00 04 */ addi r22, r24, 4 /* 80339650 003365B0 3B 00 00 00 */ li r24, 0 /* 80339654 003365B4 3B 24 FF FC */ addi r25, r4, -4 -/* 80339658 003365B8 3B A3 FD 30 */ addi r29, r3, lbl_8059FD30@l +/* 80339658 003365B8 3B A3 FD 30 */ addi r29, r3, mData__10CStopwatch@l /* 8033965C 003365BC 48 00 00 74 */ b lbl_803396D0 lbl_80339660: /* 80339660 003365C0 80 17 00 04 */ lwz r0, 4(r23) @@ -923764,8 +923764,8 @@ lbl_80339C30: /* 80339C30 00336B90 80 1A 00 B8 */ lwz r0, 0xb8(r26) /* 80339C34 00336B94 7C 1F 00 40 */ cmplw r31, r0 /* 80339C38 00336B98 40 82 FF C8 */ bne lbl_80339C00 -/* 80339C3C 00336B9C 3C 60 80 5A */ lis r3, lbl_8059FD30@ha -/* 80339C40 00336BA0 3B E3 FD 30 */ addi r31, r3, lbl_8059FD30@l +/* 80339C3C 00336B9C 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha +/* 80339C40 00336BA0 3B E3 FD 30 */ addi r31, r3, mData__10CStopwatch@l /* 80339C44 00336BA4 48 00 00 90 */ b lbl_80339CD4 lbl_80339C48: /* 80339C48 00336BA8 3B 80 00 00 */ li r28, 0 @@ -928891,7 +928891,7 @@ lbl_8033E124: /* 8033E1BC 0033B11C 88 1E 00 00 */ lbz r0, 0(r30) /* 8033E1C0 0033B120 7C 00 07 75 */ extsb. r0, r0 /* 8033E1C4 0033B124 40 82 00 1C */ bne lbl_8033E1E0 -/* 8033E1C8 0033B128 38 8D A9 18 */ addi r4, r13, lbl_805A94D8@sda21 +/* 8033E1C8 0033B128 38 8D A9 18 */ addi r4, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8033E1CC 0033B12C 38 00 00 00 */ li r0, 0 /* 8033E1D0 0033B130 90 9D 00 00 */ stw r4, 0(r29) /* 8033E1D4 0033B134 90 1D 00 08 */ stw r0, 8(r29) @@ -928983,7 +928983,7 @@ lbl_8033E2DC: /* 8033E2F8 0033B258 94 21 FB D0 */ stwu r1, -0x430(r1) /* 8033E2FC 0033B25C 7C 08 02 A6 */ mflr r0 /* 8033E300 0033B260 90 01 04 34 */ stw r0, 0x434(r1) -/* 8033E304 0033B264 38 0D A9 18 */ addi r0, r13, lbl_805A94D8@sda21 +/* 8033E304 0033B264 38 0D A9 18 */ addi r0, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8033E308 0033B268 BF 61 04 1C */ stmw r27, 0x41c(r1) /* 8033E30C 0033B26C 7C 7B 1B 78 */ mr r27, r3 /* 8033E310 0033B270 7C 9C 23 78 */ mr r28, r4 @@ -929041,7 +929041,7 @@ __sinit_rstl_strings_cpp: /* 8033E3C4 0033B324 40 82 00 14 */ bne lbl_8033E3D8 /* 8033E3C8 0033B328 38 60 00 00 */ li r3, 0 /* 8033E3CC 0033B32C 38 00 00 01 */ li r0, 1 -/* 8033E3D0 0033B330 98 6D A9 18 */ stb r3, lbl_805A94D8@sda21(r13) +/* 8033E3D0 0033B330 98 6D A9 18 */ stb r3, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21(r13) /* 8033E3D4 0033B334 98 0D A9 20 */ stb r0, lbl_805A94E0@sda21(r13) lbl_8033E3D8: /* 8033E3D8 0033B338 88 0D A9 21 */ lbz r0, lbl_805A94E1@sda21(r13) @@ -929237,7 +929237,7 @@ lbl_8033E644: ReadString__13CStringExtrasFR12CInputStream: /* 8033E658 0033B5B8 94 21 FD D0 */ stwu r1, -0x230(r1) /* 8033E65C 0033B5BC 7C 08 02 A6 */ mflr r0 -/* 8033E660 0033B5C0 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 8033E660 0033B5C0 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8033E664 0033B5C4 90 01 02 34 */ stw r0, 0x234(r1) /* 8033E668 0033B5C8 38 00 00 00 */ li r0, 0 /* 8033E66C 0033B5CC 93 E1 02 2C */ stw r31, 0x22c(r1) @@ -929340,7 +929340,7 @@ lbl_8033E78C: "ConvertToANSI__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": /* 8033E7C8 0033B728 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8033E7CC 0033B72C 7C 08 02 A6 */ mflr r0 -/* 8033E7D0 0033B730 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 8033E7D0 0033B730 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8033E7D4 0033B734 90 01 00 44 */ stw r0, 0x44(r1) /* 8033E7D8 0033B738 38 00 00 00 */ li r0, 0 /* 8033E7DC 0033B73C 93 E1 00 3C */ stw r31, 0x3c(r1) @@ -929436,7 +929436,7 @@ lbl_8033E924: /* 8033E924 0033B884 2C 08 00 00 */ cmpwi r8, 0 /* 8033E928 0033B888 41 81 FF C8 */ bgt lbl_8033E8F0 /* 8033E92C 0033B88C 38 00 00 00 */ li r0, 0 -/* 8033E930 0033B890 38 6D A9 18 */ addi r3, r13, lbl_805A94D8@sda21 +/* 8033E930 0033B890 38 6D A9 18 */ addi r3, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8033E934 0033B894 2C 04 00 00 */ cmpwi r4, 0 /* 8033E938 0033B898 90 61 00 08 */ stw r3, 8(r1) /* 8033E93C 0033B89C 90 01 00 0C */ stw r0, 0xc(r1) @@ -930097,9 +930097,9 @@ __ct__15CMemoryInStreamFPCvUl: /* 8033F1DC 0033C13C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8033F1E0 0033C140 7C 7F 1B 78 */ mr r31, r3 /* 8033F1E4 0033C144 4B FF FF 35 */ bl __ct__12CInputStreamFPCvib -/* 8033F1E8 0033C148 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8033F1E8 0033C148 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8033F1EC 0033C14C 7F E3 FB 78 */ mr r3, r31 -/* 8033F1F0 0033C150 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8033F1F0 0033C150 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8033F1F4 0033C154 90 1F 00 00 */ stw r0, 0(r31) /* 8033F1F8 0033C158 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033F1FC 0033C15C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -930117,9 +930117,9 @@ __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip: /* 8033F220 0033C180 93 E1 00 0C */ stw r31, 0xc(r1) /* 8033F224 0033C184 7C 7F 1B 78 */ mr r31, r3 /* 8033F228 0033C188 4B FF FE F1 */ bl __ct__12CInputStreamFPCvib -/* 8033F22C 0033C18C 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8033F22C 0033C18C 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8033F230 0033C190 7F E3 FB 78 */ mr r3, r31 -/* 8033F234 0033C194 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8033F234 0033C194 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8033F238 0033C198 90 1F 00 00 */ stw r0, 0(r31) /* 8033F23C 0033C19C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033F240 0033C1A0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -937472,8 +937472,8 @@ SetNewPlayerPositionAndTime__10CCubeModelFRC9CVector3fRC10CStopwatch: /* 80345824 00342784 D0 04 00 08 */ stfs f0, 8(r4) /* 80345828 00342788 48 00 01 19 */ bl KillCachedViewDepState__13CCubeMaterialFv /* 8034582C 0034278C 48 03 FB 7D */ bl OSGetTime -/* 80345830 00342790 3C A0 80 5A */ lis r5, lbl_8059FD30@ha -/* 80345834 00342794 38 C5 FD 30 */ addi r6, r5, lbl_8059FD30@l +/* 80345830 00342790 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha +/* 80345834 00342794 38 C5 FD 30 */ addi r6, r5, mData__10CStopwatch@l /* 80345838 00342798 80 A6 00 08 */ lwz r5, 8(r6) /* 8034583C 0034279C 80 C6 00 0C */ lwz r6, 0xc(r6) /* 80345840 003427A0 48 04 43 8D */ bl __div2i @@ -942807,7 +942807,7 @@ __ct__15CAudioGrpSetLocFR12CInputStream: /* 8034A3F8 00347358 7C 08 02 A6 */ mflr r0 /* 8034A3FC 0034735C 38 C0 00 00 */ li r6, 0 /* 8034A400 00347360 90 01 00 94 */ stw r0, 0x94(r1) -/* 8034A404 00347364 38 0D A9 18 */ addi r0, r13, lbl_805A94D8@sda21 +/* 8034A404 00347364 38 0D A9 18 */ addi r0, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8034A408 00347368 BE E1 00 6C */ stmw r23, 0x6c(r1) /* 8034A40C 0034736C 7C 78 1B 78 */ mr r24, r3 /* 8034A410 00347370 7C 9A 23 78 */ mr r26, r4 @@ -942854,9 +942854,9 @@ __ct__15CAudioGrpSetLocFR12CInputStream: /* 8034A4B4 00347414 4B FF 36 2D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 8034A4B8 00347418 38 61 00 40 */ addi r3, r1, 0x40 /* 8034A4BC 0034741C 4B FF 47 C9 */ bl ReadLong__12CInputStreamFv -/* 8034A4C0 00347420 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8034A4C0 00347420 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8034A4C4 00347424 7C 7F 1B 78 */ mr r31, r3 -/* 8034A4C8 00347428 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8034A4C8 00347428 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8034A4CC 0034742C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8034A4D0 00347430 90 01 00 40 */ stw r0, 0x40(r1) /* 8034A4D4 00347434 38 61 00 40 */ addi r3, r1, 0x40 @@ -947400,7 +947400,7 @@ __ct__13CCardFileInfoFRCQ24rstl6string: /* 8034E21C 0034B17C 90 03 00 00 */ stw r0, 0(r3) /* 8034E220 0034B180 38 7E 00 18 */ addi r3, r30, 0x18 /* 8034E224 0034B184 4B FE FF 3D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8034E228 0034B188 38 0D A9 18 */ addi r0, r13, lbl_805A94D8@sda21 +/* 8034E228 0034B188 38 0D A9 18 */ addi r0, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8034E22C 0034B18C 38 80 00 00 */ li r4, 0 /* 8034E230 0034B190 90 1E 00 28 */ stw r0, 0x28(r30) /* 8034E234 0034B194 38 00 FF FF */ li r0, -1 @@ -961247,8 +961247,8 @@ lbl_80359E5C: /* 80359E64 00356DC4 7C 03 00 40 */ cmplw r3, r0 /* 80359E68 00356DC8 41 80 FC E0 */ blt lbl_80359B48 /* 80359E6C 00356DCC 80 81 00 48 */ lwz r4, 0x48(r1) -/* 80359E70 00356DD0 3C 60 80 3F */ lis r3, lbl_803EE398@ha -/* 80359E74 00356DD4 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 80359E70 00356DD0 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha +/* 80359E74 00356DD4 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 80359E78 00356DD8 38 61 00 50 */ addi r3, r1, 0x50 /* 80359E7C 00356DDC 90 9A 00 00 */ stw r4, 0(r26) /* 80359E80 00356DE0 38 80 00 00 */ li r4, 0 @@ -961517,10 +961517,10 @@ lbl_8035A228: /* 8035A250 003571B0 4B FE 4A 35 */ bl ReadLong__12CInputStreamFv /* 8035A254 003571B4 90 7F 00 00 */ stw r3, 0(r31) /* 8035A258 003571B8 38 A0 00 00 */ li r5, 0 -/* 8035A25C 003571BC 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8035A25C 003571BC 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8035A260 003571C0 38 61 00 08 */ addi r3, r1, 8 /* 8035A264 003571C4 90 BF 00 04 */ stw r5, 4(r31) -/* 8035A268 003571C8 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8035A268 003571C8 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8035A26C 003571CC 38 80 00 00 */ li r4, 0 /* 8035A270 003571D0 B3 DF 00 08 */ sth r30, 8(r31) /* 8035A274 003571D4 B3 BF 00 0A */ sth r29, 0xa(r31) @@ -961543,10 +961543,10 @@ lbl_8035A28C: /* 8035A2B4 00357214 4B FE 49 D1 */ bl ReadLong__12CInputStreamFv /* 8035A2B8 00357218 90 7F 00 00 */ stw r3, 0(r31) /* 8035A2BC 0035721C 38 00 00 01 */ li r0, 1 -/* 8035A2C0 00357220 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 8035A2C0 00357220 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 8035A2C4 00357224 38 A0 00 00 */ li r5, 0 /* 8035A2C8 00357228 90 1F 00 04 */ stw r0, 4(r31) -/* 8035A2CC 0035722C 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 8035A2CC 0035722C 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 8035A2D0 00357230 38 61 00 08 */ addi r3, r1, 8 /* 8035A2D4 00357234 38 80 00 00 */ li r4, 0 /* 8035A2D8 00357238 B3 9F 00 08 */ sth r28, 8(r31) @@ -961558,10 +961558,10 @@ lbl_8035A28C: /* 8035A2F0 00357250 48 00 00 3C */ b lbl_8035A32C lbl_8035A2F4: /* 8035A2F4 00357254 38 A0 00 00 */ li r5, 0 -/* 8035A2F8 00357258 3C 60 80 3F */ lis r3, lbl_803EE398@ha +/* 8035A2F8 00357258 3C 60 80 3F */ lis r3, __vt__15CMemoryInStream@ha /* 8035A2FC 0035725C 90 BF 00 00 */ stw r5, 0(r31) /* 8035A300 00357260 38 80 FF FF */ li r4, -1 -/* 8035A304 00357264 38 03 E3 98 */ addi r0, r3, lbl_803EE398@l +/* 8035A304 00357264 38 03 E3 98 */ addi r0, r3, __vt__15CMemoryInStream@l /* 8035A308 00357268 38 61 00 08 */ addi r3, r1, 8 /* 8035A30C 0035726C 90 9F 00 04 */ stw r4, 4(r31) /* 8035A310 00357270 38 80 00 00 */ li r4, 0 @@ -962143,9 +962143,9 @@ lbl_8035AB74: /* 8035AB78 00357AD8 80 18 00 44 */ lwz r0, 0x44(r24) /* 8035AB7C 00357ADC 7C 03 00 40 */ cmplw r3, r0 /* 8035AB80 00357AE0 41 80 F9 98 */ blt lbl_8035A518 -/* 8035AB84 00357AE4 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 8035AB84 00357AE4 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8035AB88 00357AE8 38 61 00 40 */ addi r3, r1, 0x40 -/* 8035AB8C 00357AEC 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 8035AB8C 00357AEC 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 8035AB90 00357AF0 38 80 00 00 */ li r4, 0 /* 8035AB94 00357AF4 90 01 00 40 */ stw r0, 0x40(r1) /* 8035AB98 00357AF8 4B FE 45 15 */ bl __dt__12CInputStreamFv @@ -968813,9 +968813,9 @@ Render__17CParticleElectricFv: /* 80360868 0035D7C8 7C 85 20 10 */ subfc r4, r5, r4 /* 8036086C 0035D7CC 7C 60 19 10 */ subfe r3, r0, r3 /* 80360870 0035D7D0 48 02 96 F5 */ bl __cvt_sll_flt -/* 80360874 0035D7D4 3C 60 80 5A */ lis r3, lbl_8059FD30@ha +/* 80360874 0035D7D4 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 80360878 0035D7D8 80 1E 03 FC */ lwz r0, 0x3fc(r30) -/* 8036087C 0035D7DC 3B E3 FD 30 */ addi r31, r3, lbl_8059FD30@l +/* 8036087C 0035D7DC 3B E3 FD 30 */ addi r31, r3, mData__10CStopwatch@l /* 80360880 0035D7E0 C0 1F 00 10 */ lfs f0, 0x10(r31) /* 80360884 0035D7E4 2C 00 00 00 */ cmpwi r0, 0 /* 80360888 0035D7E8 EF E1 00 32 */ fmuls f31, f1, f0 @@ -974599,7 +974599,7 @@ lbl_80365950: /* 803659A4 00362904 48 00 00 38 */ b lbl_803659DC lbl_803659A8: /* 803659A8 00362908 38 00 00 00 */ li r0, 0 -/* 803659AC 0036290C 38 8D A9 18 */ addi r4, r13, lbl_805A94D8@sda21 +/* 803659AC 0036290C 38 8D A9 18 */ addi r4, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 803659B0 00362910 3C 60 80 5A */ lis r3, lbl_805A6B60@ha /* 803659B4 00362914 90 81 00 08 */ stw r4, 8(r1) /* 803659B8 00362918 38 63 6B 60 */ addi r3, r3, lbl_805A6B60@l @@ -975477,7 +975477,7 @@ __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 -/* 803665D8 00363538 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 803665D8 00363538 38 AD A9 18 */ addi r5, r13, "_EmptyString__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 /* 803665E4 00363544 3C C0 80 54 */ lis r6, lbl_80540550@ha @@ -975490,7 +975490,7 @@ __sinit_CStreamAudioManager_cpp: /* 80366600 00363560 90 03 00 04 */ stw r0, 4(r3) /* 80366604 00363564 90 03 00 08 */ stw r0, 8(r3) /* 80366608 00363568 48 02 30 85 */ bl __register_global_object -/* 8036660C 0036356C 38 AD A9 18 */ addi r5, r13, lbl_805A94D8@sda21 +/* 8036660C 0036356C 38 AD A9 18 */ addi r5, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 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 @@ -975500,7 +975500,7 @@ __sinit_CStreamAudioManager_cpp: /* 80366628 00363588 38 84 4A 9C */ addi r4, r4, sub_80004a9c@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, lbl_805A94D8@sda21 +/* 80366634 00363594 38 AD A9 18 */ addi r5, r13, "_EmptyString__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 @@ -977229,9 +977229,9 @@ lbl_80367E14: /* 80367E18 00364D78 7F E3 FB 78 */ mr r3, r31 /* 80367E1C 00364D7C 4B FF FC 95 */ bl GetFakeStaticSize__8CPakFileCFv /* 80367E20 00364D80 4B FA DA A1 */ bl OffsetFakeStatics__7CMemoryFi -/* 80367E24 00364D84 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80367E24 00364D84 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80367E28 00364D88 38 61 00 30 */ addi r3, r1, 0x30 -/* 80367E2C 00364D8C 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80367E2C 00364D8C 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80367E30 00364D90 38 80 00 00 */ li r4, 0 /* 80367E34 00364D94 90 01 00 30 */ stw r0, 0x30(r1) /* 80367E38 00364D98 4B FD 72 75 */ bl __dt__12CInputStreamFv @@ -977305,9 +977305,9 @@ lbl_80367F04: /* 80367F30 00364E90 38 C6 00 05 */ addi r6, r6, 0x00030005@l /* 80367F34 00364E94 4C C6 31 82 */ crclr 6 /* 80367F38 00364E98 48 02 5D A5 */ bl sprintf -/* 80367F3C 00364E9C 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80367F3C 00364E9C 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80367F40 00364EA0 38 61 00 50 */ addi r3, r1, 0x50 -/* 80367F44 00364EA4 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80367F44 00364EA4 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80367F48 00364EA8 38 80 00 00 */ li r4, 0 /* 80367F4C 00364EAC 90 01 00 50 */ stw r0, 0x50(r1) /* 80367F50 00364EB0 4B FD 71 5D */ bl __dt__12CInputStreamFv @@ -977450,9 +977450,9 @@ lbl_80368150: /* 80368150 003650B0 7F E3 FB 78 */ mr r3, r31 /* 80368154 003650B4 4B FF FB 61 */ bl DataLoad__8CPakFileFv lbl_80368158: -/* 80368158 003650B8 3C 80 80 3F */ lis r4, lbl_803EE398@ha +/* 80368158 003650B8 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 8036815C 003650BC 38 61 00 50 */ addi r3, r1, 0x50 -/* 80368160 003650C0 38 04 E3 98 */ addi r0, r4, lbl_803EE398@l +/* 80368160 003650C0 38 04 E3 98 */ addi r0, r4, __vt__15CMemoryInStream@l /* 80368164 003650C4 38 80 00 00 */ li r4, 0 /* 80368168 003650C8 90 01 00 50 */ stw r0, 0x50(r1) /* 8036816C 003650CC 4B FD 6F 41 */ bl __dt__12CInputStreamFv diff --git a/include/macros.inc b/include/macros.inc index ce08f098..c05e9842 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -1,22 +1,3 @@ -/* -Code sections: - .init: 0x00000100 0x80003100 0x800035A0 - .text: 0x000005A0 0x80003640 0x803CB1C0 -Data sections: - extab_: 0x003C8120 0x800035A0 0x800035E0 - extabindex_: 0x003C8160 0x800035E0 0x80003640 - .ctors: 0x003C81C0 0x803CB1C0 0x803CB380 - .dtors: 0x003C8380 0x803CB380 0x803CB3A0 - .rodata: 0x003C83A0 0x803CB3A0 0x803D8D60 - .data: 0x003D5D60 0x803D8D60 0x803F7560 - .sdata: 0x003F4560 0x805A6BC0 0x805A8C20 - .sbss: - .sdata2: 0x003F65C0 0x805A9D20 0x805AF460 - .sbss2: -BSS section: - .bss: 0x00000000 0x803F7560 0x805A6BBF -Entry Point: 0x80003140 -*/ # PowerPC Register Constants .set r0, 0 .set r1, 1 diff --git a/include/types.h b/include/types.h index 3ed8ec7d..315295bc 100644 --- a/include/types.h +++ b/include/types.h @@ -1,27 +1,25 @@ -#ifndef _TYPES_H -#define _TYPES_H +#ifndef __TYPES_H__ +#define __TYPES_H__ -//#include "BuildSettings.h" +#ifdef __cplusplus +extern "C" { +#endif -// r2 is 801DC960 -// r13 is 801DB420 - -typedef signed char s8; -typedef signed short s16; -typedef signed long s32; -typedef signed long long s64; typedef unsigned char u8; typedef unsigned short u16; typedef unsigned long u32; -typedef unsigned long size_t; typedef unsigned long long u64; -typedef unsigned int uint; +typedef char s8; +typedef short s16; +typedef long s32; +typedef long long s64; typedef volatile u8 vu8; typedef volatile u16 vu16; typedef volatile u32 vu32; typedef volatile u64 vu64; + typedef volatile s8 vs8; typedef volatile s16 vs16; typedef volatile s32 vs32; @@ -29,43 +27,37 @@ typedef volatile s64 vs64; typedef float f32; typedef double f64; -typedef volatile f32 vf32; -typedef volatile f64 vf64; -typedef int BOOL; +typedef volatile float vf32; +typedef volatile double vf64; -typedef unsigned int uintptr_t; // Manually added +typedef s32 size_t; +typedef u32 uintptr_t; // Pointer to unknown, to be determined at a later date. typedef void* unkptr; -typedef u32 unknown; - -#ifndef TRUE -#define TRUE 1 -#endif // ifndef TRUE - -#ifndef FALSE -#define FALSE 0 -#endif // ifndef FALSE - #ifndef NULL -#define NULL ((void*)0) -#endif // ifndef NULL - +#define NULL 0 +#endif #ifndef nullptr #define nullptr 0 -#endif // ifndef nullptr +#endif -// For functions that return 0 on a success and -1 on failure -#ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 -#define EXIT_FAILURE -1 -#endif // ifndef EXIT_SUCCESS +#ifndef BOOL +#ifdef __cplusplus +#define BOOL bool +#define TRUE true +#define FALSE false +#else +#define BOOL u8 +#define TRUE 1 +#define FALSE 0 +#endif +#endif -#define ASSERT_HANG(cond) \ - if (!(cond)) { \ - while (true) { } \ - } +#ifdef __cplusplus +} +#endif #endif diff --git a/src/musyx/iram_image.c b/src/musyx/iram_image.c index d6fbc3e1..bbbd30f7 100644 --- a/src/musyx/iram_image.c +++ b/src/musyx/iram_image.c @@ -1,6 +1,4 @@ - -__declspec(section ".data") -const char dspSlave[] = +char dspSlave[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x9F, 0x0C, 0x10, 0x02, 0x9F, 0x0C, 0x1F, 0x02, 0x9F, 0x0C, 0x3B, 0x02, 0x9F, 0x0C, 0x4A, 0x02, 0x9F, 0x0C, 0x50, 0x02, 0x9F, 0x0C, 0x82, 0x02, 0x9F, 0x0C, 0x88, 0x13, 0x02, 0x13, 0x03, 0x12, 0x04, 0x13, 0x05, 0x13, 0x06, 0x8E, 0x00, 0x8C, 0x00, 0x8B, 0x00, 0x00, 0x92, 0x00, 0xFF, 0x81, 0x00, 0x89, 0x00, 0x00, 0x9E, 0x0E, 0x80, 0x00, 0xFE, 0x0E, 0x1B, @@ -212,4 +210,4 @@ const char dspSlave[] = 0x0 }; -__declspec(section ".sdata") const int dspSlaveLength = 6624; +int dspSlaveLength = sizeof(dspSlave); diff --git a/src/os/__ppc_eabi_init.c b/src/os/__ppc_eabi_init.c index b1f70af4..eee1771e 100644 --- a/src/os/__ppc_eabi_init.c +++ b/src/os/__ppc_eabi_init.c @@ -4,7 +4,7 @@ extern void __OSPSInit(); extern void __OSCacheInit(); asm void __init_hardware(void) { - nofralloc; + nofralloc mfmsr r0 ori r0, r0, 0x2000 mtmsr r0 @@ -17,7 +17,7 @@ asm void __init_hardware(void) { } asm void __flush_cache(register void* address, register unsigned int size) { - nofralloc; + nofralloc lis r5, 0xFFFF ori r5, r5, 0xFFF1 and r5, r5, r3