PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove CCallStack hack

This commit is contained in:
Phillip Stephens 2022-10-14 21:33:23 -07:00
parent b818531567
commit 20ccef8a33
28 changed files with 106 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/Kyoto/Alloc/CCallStackDolphin.s
View File

@ -1,5 +1,13 @@
.include "macros.inc"
.section .rodata
.balign 8
.global kUnknownType__10CCallStack
kUnknownType__10CCallStack:
# ROM: 0x3D3AA8
.asciz "UnknownType"
.4byte 0
.section .text, "ax"
.global GetTypeText__10CCallStackCFv

32
asm/Kyoto/Alloc/CCallStackUnknownType.s
View File

@ -1,32 +0,0 @@
# Once all references to this string are accounted for this can be removed entirely
# CARAMManager
# CARAMToken
# CResFactory
# CResLoader
# DolphinCDvdFile
# DolphinCMemoryCardSys
# CSegStatementSet
# DolphinCSkinnedModel
# CStaticAudioPlayer
# DolphinCAudioGroupSet
# SDSPStream
# CCubeMoviePlayer
# DolphinCPalette
# DolphinCTexture
# CParticleElectric
# CGameArea
# CGBASupport
# CMemoryCardDriver
# CNESEmulator
# CPauseScreen
# CWorld
# main
# Unfortunately none of these can be linked until they can all be linked at once
.section .rodata
.balign 8
.global lbl_803D6AA8
lbl_803D6AA8:
# ROM: 0x3D3AA8
.asciz "UnknownType"
.4byte 0

5
asm/Kyoto/Animation/CSegStatementSet.s
View File

@ -115,9 +115,9 @@ lbl_802FD3CC:
/* 802FD3D0 002FA330 42 00 FF D4 */ bdnz lbl_802FD3A4
lbl_802FD3D4:
/* 802FD3D4 002FA334 3C 60 80 3D */ lis r3, lbl_803D6E48@ha
/* 802FD3D8 002FA338 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 802FD3D8 002FA338 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 802FD3DC 002FA33C 38 A3 6E 48 */ addi r5, r3, lbl_803D6E48@l
/* 802FD3E0 002FA340 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 802FD3E0 002FA340 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 802FD3E4 002FA344 38 61 00 08 */ addi r3, r1, 8
/* 802FD3E8 002FA348 38 80 FF FF */ li r4, -1
/* 802FD3EC 002FA34C 4B FD 8F E9 */ bl __ct__10CCallStackFUiPCcPCc
@ -337,4 +337,3 @@ lbl_803D6E48:
# ROM: 0x3D3E48
.asciz "??(??)"
.balign 4

5
asm/Kyoto/Animation/DolphinCSkinnedModel.s
View File

@ -59,8 +59,8 @@ sub_80352668:
/* 80352684 0034F5E4 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80352688 0034F5E8 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8035268C 0034F5EC 80 E3 00 18 */ lwz r7, 0x18(r3)
/* 80352690 0034F5F0 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 80352694 0034F5F4 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 80352690 0034F5F0 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 80352694 0034F5F4 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 80352698 0034F5F8 80 07 00 14 */ lwz r0, 0x14(r7)
/* 8035269C 0034F5FC 38 61 00 08 */ addi r3, r1, 8
/* 803526A0 0034F600 83 C7 00 10 */ lwz r30, 0x10(r7)
@ -1396,4 +1396,3 @@ lbl_803D82F8:
# ROM: 0x3D52F8
.asciz "??(??)"
.balign 4

13
asm/Kyoto/Audio/CStaticAudioPlayer.s
View File

@ -542,10 +542,10 @@ __ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii:
/* 8036C304 00369264 90 1A 00 10 */ stw r0, 0x10(r26)
/* 8036C308 00369268 38 E0 00 00 */ li r7, 0
/* 8036C30C 0036926C 38 A4 85 60 */ addi r5, r4, lbl_803D8560@l
/* 8036C310 00369270 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8036C310 00369270 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8036C314 00369274 90 FA 00 18 */ stw r7, 0x18(r26)
/* 8036C318 00369278 57 A4 00 3C */ rlwinm r4, r29, 0, 0, 0x1e
/* 8036C31C 0036927C 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 8036C31C 0036927C 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 8036C320 00369280 57 80 00 3C */ rlwinm r0, r28, 0, 0, 0x1e
/* 8036C324 00369284 90 9A 00 1C */ stw r4, 0x1c(r26)
/* 8036C328 00369288 38 61 00 20 */ addi r3, r1, 0x20
@ -562,11 +562,11 @@ __ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii:
/* 8036C354 003692B4 7C 03 00 D0 */ neg r0, r3
/* 8036C358 003692B8 3C A0 80 3E */ lis r5, lbl_803D8560@ha
/* 8036C35C 003692BC 7C 00 1B 78 */ or r0, r0, r3
/* 8036C360 003692C0 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8036C360 003692C0 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8036C364 003692C4 54 00 0F FE */ srwi r0, r0, 0x1f
/* 8036C368 003692C8 38 A5 85 60 */ addi r5, r5, lbl_803D8560@l
/* 8036C36C 003692CC 98 1A 00 28 */ stb r0, 0x28(r26)
/* 8036C370 003692D0 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8036C370 003692D0 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8036C374 003692D4 38 80 FF FF */ li r4, -1
/* 8036C378 003692D8 90 7A 00 2C */ stw r3, 0x2c(r26)
/* 8036C37C 003692DC 38 61 00 18 */ addi r3, r1, 0x18
@ -611,10 +611,10 @@ __ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii:
/* 8036C418 00369378 38 7A 00 38 */ addi r3, r26, 0x38
/* 8036C41C 0036937C 48 00 01 C9 */ bl sub_8036c5e4
/* 8036C420 00369380 3C 80 80 3E */ lis r4, lbl_803D8560@ha
/* 8036C424 00369384 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8036C424 00369384 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8036C428 00369388 83 9A 00 10 */ lwz r28, 0x10(r26)
/* 8036C42C 0036938C 3B C4 85 60 */ addi r30, r4, lbl_803D8560@l
/* 8036C430 00369390 3B E3 6A A8 */ addi r31, r3, lbl_803D6AA8@l
/* 8036C430 00369390 3B E3 6A A8 */ addi r31, r3, kUnknownType__10CCallStack@l
/* 8036C434 00369394 3F A0 00 02 */ lis r29, 2
/* 8036C438 00369398 48 00 01 80 */ b lbl_8036C5B8
lbl_8036C43C:
@ -1081,4 +1081,3 @@ lbl_803D8560:
# ROM: 0x3D5560
.asciz "??(??)"
.balign 4

5
asm/Kyoto/Audio/DolphinCAudioGroupSet.s
View File

@ -371,9 +371,9 @@ __ct__15CAudioGrpSetLocFR12CInputStream:
/* 8034A518 00347478 7F 43 C8 2E */ lwzx r26, r3, r25
/* 8034A51C 0034747C 48 00 02 F9 */ bl sub_8034a814
/* 8034A520 00347480 3C 60 80 3E */ lis r3, lbl_803D8108@ha
/* 8034A524 00347484 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8034A524 00347484 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8034A528 00347488 38 A3 81 08 */ addi r5, r3, lbl_803D8108@l
/* 8034A52C 0034748C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8034A52C 0034748C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8034A530 00347490 38 61 00 18 */ addi r3, r1, 0x18
/* 8034A534 00347494 38 80 FF FF */ li r4, -1
/* 8034A538 00347498 4B F8 BE 9D */ bl __ct__10CCallStackFUiPCcPCc
@ -628,4 +628,3 @@ lbl_803D8110:
.4byte 0x761E7810
.4byte 0x7A067C00
.4byte 0x7DFE8000

5
asm/Kyoto/Audio/SDSPStream.s
View File

@ -1011,9 +1011,9 @@ DoAllocateStream__10SDSPStreamFi:
/* 8036AFC8 00367F28 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8036AFCC 00367F2C 7C 08 02 A6 */ mflr r0
/* 8036AFD0 00367F30 3C A0 80 3E */ lis r5, lbl_803D8558@ha
/* 8036AFD4 00367F34 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8036AFD4 00367F34 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8036AFD8 00367F38 90 01 00 34 */ stw r0, 0x34(r1)
/* 8036AFDC 00367F3C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8036AFDC 00367F3C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8036AFE0 00367F40 38 A5 85 58 */ addi r5, r5, lbl_803D8558@l
/* 8036AFE4 00367F44 38 80 FF FF */ li r4, -1
/* 8036AFE8 00367F48 93 E1 00 2C */ stw r31, 0x2c(r1)
@ -1229,4 +1229,3 @@ lbl_803D8558:
# ROM: 0x3D5558
.asciz "??(??)"
.balign 4

5
asm/Kyoto/CARAMManager.s
View File

@ -603,9 +603,9 @@ Initialize__12CARAMManagerFUi:
/* 80344D44 00341CA4 93 ED A9 6C */ stw r31, lbl_805A952C@sda21(r13)
/* 80344D48 00341CA8 48 02 8C CD */ bl ARAlloc
/* 80344D4C 00341CAC 3C A0 80 3D */ lis r5, lbl_803D7F50@ha
/* 80344D50 00341CB0 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80344D50 00341CB0 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80344D54 00341CB4 90 6D A9 64 */ stw r3, lbl_805A9524@sda21(r13)
/* 80344D58 00341CB8 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80344D58 00341CB8 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80344D5C 00341CBC 38 A5 7F 50 */ addi r5, r5, lbl_803D7F50@l
/* 80344D60 00341CC0 38 61 00 08 */ addi r3, r1, 8
/* 80344D64 00341CC4 38 80 FF FF */ li r4, -1
@ -788,4 +788,3 @@ lbl_803D7F50:
# ROM: 0x3D4F50
.asciz "??(??)"
.balign 4

5
asm/Kyoto/CARAMToken.s
View File

@ -374,9 +374,9 @@ lbl_803587E4:
/* 803587EC 0035574C 48 00 00 6C */ b lbl_80358858
lbl_803587F0:
/* 803587F0 00355750 3C 60 80 3E */ lis r3, lbl_803D8338@ha
/* 803587F4 00355754 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 803587F4 00355754 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 803587F8 00355758 38 A3 83 38 */ addi r5, r3, lbl_803D8338@l
/* 803587FC 0035575C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 803587FC 0035575C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80358800 00355760 38 61 00 08 */ addi r3, r1, 8
/* 80358804 00355764 38 80 FF FF */ li r4, -1
/* 80358808 00355768 4B F7 DB CD */ bl __ct__10CCallStackFUiPCcPCc
@ -628,4 +628,3 @@ lbl_803D8338:
# ROM: 0x3D5338
.asciz "??(??)"
.balign 4

8
asm/Kyoto/CResFactory.s
View File

@ -88,9 +88,9 @@ lbl_80339598:
/* 803395A8 00336508 4B FD C3 89 */ bl Free__7CMemoryFPCv
lbl_803395AC:
/* 803395AC 0033650C 3C 60 80 3D */ lis r3, lbl_803D7A28@ha
/* 803395B0 00336510 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 803395B0 00336510 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 803395B4 00336514 38 A3 7A 28 */ addi r5, r3, lbl_803D7A28@l
/* 803395B8 00336518 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 803395B8 00336518 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 803395BC 0033651C 38 61 00 2C */ addi r3, r1, 0x2c
/* 803395C0 00336520 38 80 FF FF */ li r4, -1
/* 803395C4 00336524 4B F9 CE 11 */ bl __ct__10CCallStackFUiPCcPCc
@ -741,10 +741,10 @@ BuildAsync__11CResFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj:
/* 80339EB8 00336E18 90 06 00 00 */ stw r0, 0(r6)
/* 80339EBC 00336E1C 48 00 1D 95 */ bl ResourceSize__10CResLoaderCFRC10SObjectTag
/* 80339EC0 00336E20 3C A0 80 3D */ lis r5, lbl_803D7A28@ha
/* 80339EC4 00336E24 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80339EC4 00336E24 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80339EC8 00336E28 7C 7F 1B 78 */ mr r31, r3
/* 80339ECC 00336E2C 38 61 00 08 */ addi r3, r1, 8
/* 80339ED0 00336E30 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80339ED0 00336E30 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80339ED4 00336E34 38 A5 7A 28 */ addi r5, r5, lbl_803D7A28@l
/* 80339ED8 00336E38 38 80 FF FF */ li r4, -1
/* 80339EDC 00336E3C 4B F9 C4 F9 */ bl __ct__10CCallStackFUiPCcPCc

13
asm/Kyoto/CResLoader.s
View File

@ -780,9 +780,9 @@ LoadNewResourcePartSync__10CResLoaderFRC10SObjectTagiiPc:
/* 8033B6E8 00338648 48 00 00 3C */ b lbl_8033B724
lbl_8033B6EC:
/* 8033B6EC 0033864C 3C 60 80 3D */ lis r3, lbl_803D7A38@ha
/* 8033B6F0 00338650 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8033B6F0 00338650 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8033B6F4 00338654 38 A3 7A 38 */ addi r5, r3, lbl_803D7A38@l
/* 8033B6F8 00338658 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8033B6F8 00338658 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8033B6FC 0033865C 38 61 00 08 */ addi r3, r1, 8
/* 8033B700 00338660 38 80 FF FF */ li r4, -1
/* 8033B704 00338664 4B F9 AC D1 */ bl __ct__10CCallStackFUiPCcPCc
@ -841,9 +841,9 @@ LoadMemResourceSync__10CResLoaderFRC10SObjectTagPPcPi:
/* 8033B7C4 00338724 48 02 CE BD */ bl GetSize__Q28CPakFile8SResInfoCFv
/* 8033B7C8 00338728 38 03 00 1F */ addi r0, r3, 0x1f
/* 8033B7CC 0033872C 3C A0 80 3D */ lis r5, lbl_803D7A38@ha
/* 8033B7D0 00338730 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8033B7D0 00338730 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8033B7D4 00338734 38 61 00 08 */ addi r3, r1, 8
/* 8033B7D8 00338738 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8033B7D8 00338738 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8033B7DC 0033873C 38 A5 7A 38 */ addi r5, r5, lbl_803D7A38@l
/* 8033B7E0 00338740 54 1D 00 34 */ rlwinm r29, r0, 0, 0, 0x1a
/* 8033B7E4 00338744 38 80 FF FF */ li r4, -1
@ -973,9 +973,9 @@ LoadNewResourceSync__10CResLoaderFRC10SObjectTagPc:
/* 8033B9A8 00338908 48 00 00 3C */ b lbl_8033B9E4
lbl_8033B9AC:
/* 8033B9AC 0033890C 3C 60 80 3D */ lis r3, lbl_803D7A38@ha
/* 8033B9B0 00338910 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8033B9B0 00338910 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8033B9B4 00338914 38 A3 7A 38 */ addi r5, r3, lbl_803D7A38@l
/* 8033B9B8 00338918 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8033B9B8 00338918 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8033B9BC 0033891C 38 61 00 10 */ addi r3, r1, 0x10
/* 8033B9C0 00338920 38 80 FF FF */ li r4, -1
/* 8033B9C4 00338924 4B F9 AA 11 */ bl __ct__10CCallStackFUiPCcPCc
@ -1913,4 +1913,3 @@ lbl_803D7A38:
.byte 0x2E
.4byte 0x70616B00
.4byte 0

9
asm/Kyoto/DolphinCDvdFile.s
View File

@ -425,9 +425,9 @@ lbl_8034FDA8:
StartARAMFileLoad__8CDvdFileFv:
/* 8034FDC8 0034CD28 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 8034FDCC 0034CD2C 7C 08 02 A6 */ mflr r0
/* 8034FDD0 0034CD30 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8034FDD0 0034CD30 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8034FDD4 0034CD34 90 01 00 44 */ stw r0, 0x44(r1)
/* 8034FDD8 0034CD38 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8034FDD8 0034CD38 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8034FDDC 0034CD3C 38 80 FF FF */ li r4, -1
/* 8034FDE0 0034CD40 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 8034FDE4 0034CD44 93 C1 00 38 */ stw r30, 0x38(r1)
@ -470,9 +470,9 @@ lbl_8034FE58:
/* 8034FE74 0034CDD4 4B FC 5A BD */ bl Free__7CMemoryFPCv
lbl_8034FE78:
/* 8034FE78 0034CDD8 3C 60 80 3E */ lis r3, lbl_803D8230@ha
/* 8034FE7C 0034CDDC 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8034FE7C 0034CDDC 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8034FE80 0034CDE0 38 A3 82 30 */ addi r5, r3, lbl_803D8230@l
/* 8034FE84 0034CDE4 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8034FE84 0034CDE4 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8034FE88 0034CDE8 38 61 00 10 */ addi r3, r1, 0x10
/* 8034FE8C 0034CDEC 38 80 FF FF */ li r4, -1
/* 8034FE90 0034CDF0 4B F8 65 45 */ bl __ct__10CCallStackFUiPCcPCc
@ -978,4 +978,3 @@ lbl_803D8230:
.byte 0x61
.asciz "ram:"
.balign 4

8
asm/Kyoto/DolphinCMemoryCardSys.s
View File

@ -1912,9 +1912,9 @@ sub_8034ed30:
/* 8034ED68 0034BCC8 48 00 00 3C */ b lbl_8034EDA4
lbl_8034ED6C:
/* 8034ED6C 0034BCCC 3C 60 80 3E */ lis r3, lbl_803D8220@ha
/* 8034ED70 0034BCD0 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8034ED70 0034BCD0 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8034ED74 0034BCD4 38 A3 82 20 */ addi r5, r3, lbl_803D8220@l
/* 8034ED78 0034BCD8 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8034ED78 0034BCD8 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8034ED7C 0034BCDC 38 61 00 18 */ addi r3, r1, 0x18
/* 8034ED80 0034BCE0 38 80 FF FF */ li r4, -1
/* 8034ED84 0034BCE4 4B F8 76 51 */ bl __ct__10CCallStackFUiPCcPCc
@ -1989,9 +1989,9 @@ lbl_8034EE1C:
/* 8034EE70 0034BDD0 48 00 00 3C */ b lbl_8034EEAC
lbl_8034EE74:
/* 8034EE74 0034BDD4 3C 60 80 3E */ lis r3, lbl_803D8220@ha
/* 8034EE78 0034BDD8 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8034EE78 0034BDD8 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8034EE7C 0034BDDC 38 A3 82 20 */ addi r5, r3, lbl_803D8220@l
/* 8034EE80 0034BDE0 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8034EE80 0034BDE0 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8034EE84 0034BDE4 38 61 00 18 */ addi r3, r1, 0x18
/* 8034EE88 0034BDE8 38 80 FF FF */ li r4, -1
/* 8034EE8C 0034BDEC 4B F8 75 49 */ bl __ct__10CCallStackFUiPCcPCc

13
asm/Kyoto/Graphics/CCubeMoviePlayer.s
View File

@ -1388,9 +1388,9 @@ PostDVDReadRequestIfNeeded__12CMoviePlayerFv:
/* 8035C3A8 00359308 7C 03 00 40 */ cmplw r3, r0
/* 8035C3AC 0035930C 40 80 00 E0 */ bge lbl_8035C48C
/* 8035C3B0 00359310 3C 60 80 3E */ lis r3, lbl_803D83D8@ha
/* 8035C3B4 00359314 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8035C3B4 00359314 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8035C3B8 00359318 38 A3 83 D8 */ addi r5, r3, lbl_803D83D8@l
/* 8035C3BC 0035931C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8035C3BC 0035931C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8035C3C0 00359320 38 61 00 10 */ addi r3, r1, 0x10
/* 8035C3C4 00359324 38 80 FF FF */ li r4, -1
/* 8035C3C8 00359328 4B F7 A0 0D */ bl __ct__10CCallStackFUiPCcPCc
@ -1465,9 +1465,9 @@ InitializeTextures__12CMoviePlayerFv:
/* 8035C4BC 0035941C 39 C1 00 30 */ addi r14, r1, 0x30
/* 8035C4C0 00359420 3B 03 83 D8 */ addi r24, r3, lbl_803D83D8@l
/* 8035C4C4 00359424 39 E1 00 38 */ addi r15, r1, 0x38
/* 8035C4C8 00359428 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8035C4C8 00359428 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8035C4CC 0035942C 3A 01 00 40 */ addi r16, r1, 0x40
/* 8035C4D0 00359430 3B 23 6A A8 */ addi r25, r3, lbl_803D6AA8@l
/* 8035C4D0 00359430 3B 23 6A A8 */ addi r25, r3, kUnknownType__10CCallStack@l
/* 8035C4D4 00359434 7F 1A C3 78 */ mr r26, r24
/* 8035C4D8 00359438 7F 37 CB 78 */ mr r23, r25
/* 8035C4DC 0035943C 7F 15 C3 78 */ mr r21, r24
@ -2233,11 +2233,11 @@ __ct__12CMoviePlayerFPCcfb:
/* 8035CF98 00359EF8 38 00 00 00 */ li r0, 0
/* 8035CF9C 00359EFC 3C 80 80 3E */ lis r4, lbl_803D83D8@ha
/* 8035CFA0 00359F00 90 1C 00 00 */ stw r0, 0(r28)
/* 8035CFA4 00359F04 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8035CFA4 00359F04 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8035CFA8 00359F08 38 A4 83 D8 */ addi r5, r4, lbl_803D83D8@l
/* 8035CFAC 00359F0C 38 80 FF FF */ li r4, -1
/* 8035CFB0 00359F10 90 1C 00 04 */ stw r0, 4(r28)
/* 8035CFB4 00359F14 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 8035CFB4 00359F14 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 8035CFB8 00359F18 38 61 00 08 */ addi r3, r1, 8
/* 8035CFBC 00359F1C 90 1C 00 08 */ stw r0, 8(r28)
/* 8035CFC0 00359F20 4B F7 94 15 */ bl __ct__10CCallStackFUiPCcPCc
@ -3098,4 +3098,3 @@ lbl_803D83D8:
# ROM: 0x3D53D8
.asciz "??(??)"
.balign 4

9
asm/Kyoto/Graphics/DolphinCPalette.s
View File

@ -117,9 +117,9 @@ __ct__16CGraphicsPaletteFR12CInputStream:
/* 8030DFC8 0030AF28 7C 60 07 34 */ extsh r0, r3
/* 8030DFCC 0030AF2C 3C 80 80 3D */ lis r4, lbl_803D73E8@ha
/* 8030DFD0 0030AF30 7C 00 F9 D6 */ mullw r0, r0, r31
/* 8030DFD4 0030AF34 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8030DFD4 0030AF34 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8030DFD8 0030AF38 38 A4 73 E8 */ addi r5, r4, lbl_803D73E8@l
/* 8030DFDC 0030AF3C 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 8030DFDC 0030AF3C 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 8030DFE0 0030AF40 38 61 00 08 */ addi r3, r1, 8
/* 8030DFE4 0030AF44 38 80 FF FF */ li r4, -1
/* 8030DFE8 0030AF48 90 1D 00 08 */ stw r0, 8(r29)
@ -170,8 +170,8 @@ __ct__16CGraphicsPaletteF14EPaletteFormati:
/* 8030E090 0030AFF0 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8030E094 0030AFF4 7C 7E 1B 78 */ mr r30, r3
/* 8030E098 0030AFF8 90 83 00 00 */ stw r4, 0(r3)
/* 8030E09C 0030AFFC 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8030E0A0 0030B000 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 8030E09C 0030AFFC 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 8030E0A0 0030B000 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 8030E0A4 0030B004 38 80 FF FF */ li r4, -1
/* 8030E0A8 0030B008 93 FE 00 08 */ stw r31, 8(r30)
/* 8030E0AC 0030B00C 38 61 00 08 */ addi r3, r1, 8
@ -206,4 +206,3 @@ lbl_803D73E8:
# ROM: 0x3D43E8
.asciz "??(??)"
.balign 4

13
asm/Kyoto/Graphics/DolphinCTexture.s
View File

@ -760,9 +760,9 @@ lbl_8030EA94:
/* 8030EA94 0030B9F4 54 E7 06 3E */ clrlwi r7, r7, 0x18
/* 8030EA98 0030B9F8 48 06 B1 A9 */ bl GXGetTexBufferSize
/* 8030EA9C 0030B9FC 3C A0 80 3D */ lis r5, lbl_803D7400@ha
/* 8030EAA0 0030BA00 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8030EAA0 0030BA00 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8030EAA4 0030BA04 90 7F 00 0C */ stw r3, 0xc(r31)
/* 8030EAA8 0030BA08 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8030EAA8 0030BA08 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8030EAAC 0030BA0C 38 A5 74 00 */ addi r5, r5, lbl_803D7400@l
/* 8030EAB0 0030BA10 38 61 00 08 */ addi r3, r1, 8
/* 8030EAB4 0030BA14 38 80 FF FF */ li r4, -1
@ -1057,9 +1057,9 @@ lbl_8030EE6C:
/* 8030EE98 0030BDF8 42 00 FF D4 */ bdnz lbl_8030EE6C
lbl_8030EE9C:
/* 8030EE9C 0030BDFC 3C 60 80 3D */ lis r3, lbl_803D7400@ha
/* 8030EEA0 0030BE00 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8030EEA0 0030BE00 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8030EEA4 0030BE04 38 A3 74 00 */ addi r5, r3, lbl_803D7400@l
/* 8030EEA8 0030BE08 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8030EEA8 0030BE08 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8030EEAC 0030BE0C 38 61 00 0C */ addi r3, r1, 0xc
/* 8030EEB0 0030BE10 38 80 FF FF */ li r4, -1
/* 8030EEB4 0030BE14 4B FC 75 21 */ bl __ct__10CCallStackFUiPCcPCc
@ -1138,9 +1138,9 @@ BeginReloadBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory:
/* 8030EFB4 0030BF14 90 A1 00 14 */ stw r5, 0x14(r1)
/* 8030EFB8 0030BF18 48 02 CC 99 */ bl ResourceSize__10CResLoaderCFRC10SObjectTag
/* 8030EFBC 0030BF1C 3C A0 80 3D */ lis r5, lbl_803D7400@ha
/* 8030EFC0 0030BF20 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8030EFC0 0030BF20 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8030EFC4 0030BF24 90 7D 00 08 */ stw r3, 8(r29)
/* 8030EFC8 0030BF28 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8030EFC8 0030BF28 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8030EFCC 0030BF2C 38 A5 74 00 */ addi r5, r5, lbl_803D7400@l
/* 8030EFD0 0030BF30 38 61 00 08 */ addi r3, r1, 8
/* 8030EFD4 0030BF34 38 80 FF FF */ li r4, -1
@ -2256,4 +2256,3 @@ lbl_803D7400:
# ROM: 0x3D4400
.asciz "??(??)"
.balign 4

8
asm/Kyoto/Particles/CParticleElectric.s
View File

@ -4477,9 +4477,9 @@ lbl_803626A0:
/* 803626D0 0035F630 48 00 00 38 */ b lbl_80362708
lbl_803626D4:
/* 803626D4 0035F634 3C 60 80 3E */ lis r3, lbl_803D83F8@ha
/* 803626D8 0035F638 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 803626D8 0035F638 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 803626DC 0035F63C 38 A3 83 F8 */ addi r5, r3, lbl_803D83F8@l
/* 803626E0 0035F640 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 803626E0 0035F640 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 803626E4 0035F644 38 61 00 38 */ addi r3, r1, 0x38
/* 803626E8 0035F648 38 80 FF FF */ li r4, -1
/* 803626EC 0035F64C 4B F7 3C E9 */ bl __ct__10CCallStackFUiPCcPCc
@ -5025,9 +5025,9 @@ lbl_80362E10:
/* 80362E6C 0035FDCC 48 00 00 3C */ b lbl_80362EA8
lbl_80362E70:
/* 80362E70 0035FDD0 3C 60 80 3E */ lis r3, lbl_803D83F8@ha
/* 80362E74 0035FDD4 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80362E74 0035FDD4 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80362E78 0035FDD8 38 A3 83 F8 */ addi r5, r3, lbl_803D83F8@l
/* 80362E7C 0035FDDC 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80362E7C 0035FDDC 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80362E80 0035FDE0 38 61 00 18 */ addi r3, r1, 0x18
/* 80362E84 0035FDE4 38 80 FF FF */ li r4, -1
/* 80362E88 0035FDE8 4B F7 35 4D */ bl __ct__10CCallStackFUiPCcPCc

9
asm/MetroidPrime/CGBASupport.s
View File

@ -961,11 +961,11 @@ lbl_80248E38:
/* 80248E3C 00245D9C 80 DF 00 14 */ lwz r6, 0x14(r31)
/* 80248E40 00245DA0 3C A0 80 3D */ lis r5, lbl_803D4768@ha
/* 80248E44 00245DA4 38 A5 48 68 */ addi r5, r5, lbl_803D4768@l
/* 80248E48 00245DA8 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80248E48 00245DA8 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80248E4C 00245DAC 38 06 00 1F */ addi r0, r6, 0x1f
/* 80248E50 00245DB0 38 61 00 08 */ addi r3, r1, 0x8
/* 80248E54 00245DB4 54 00 00 34 */ rlwinm r0, r0, 0, 0, 26
/* 80248E58 00245DB8 38 C4 6B B8 */ addi r6, r4, lbl_803D6AA8@l
/* 80248E58 00245DB8 38 C4 6B B8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80248E5C 00245DBC 90 1F 00 28 */ stw r0, 0x28(r31)
/* 80248E60 00245DC0 38 A5 00 1E */ addi r5, r5, 0x1e
/* 80248E64 00245DC4 38 80 FF FF */ li r4, -0x1
@ -1016,11 +1016,11 @@ __ct__11CGBASupportFv:
/* 80248D34 00245C94 80 DF 00 14 */ lwz r6, 0x14(r31)
/* 80248D38 00245C98 3C A0 80 3D */ lis r5, lbl_803D4768@ha
/* 80248D3C 00245C9C 38 A5 47 68 */ addi r5, r5, lbl_803D4768@l
/* 80248D40 00245CA0 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80248D40 00245CA0 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80248D44 00245CA4 38 06 00 1F */ addi r0, r6, 0x1f
/* 80248D48 00245CA8 38 61 00 08 */ addi r3, r1, 8
/* 80248D4C 00245CAC 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a
/* 80248D50 00245CB0 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80248D50 00245CB0 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80248D54 00245CB4 90 1F 00 28 */ stw r0, 0x28(r31)
/* 80248D58 00245CB8 38 A5 00 0F */ addi r5, r5, 0xf
/* 80248D5C 00245CBC 38 80 FF FF */ li r4, -1
@ -1095,4 +1095,3 @@ lbl_803D4768:
.asciz "client_pad.bin"
.asciz "??(??)"
.balign 4

8
asm/MetroidPrime/CGameArea.s
View File

@ -2630,9 +2630,9 @@ lbl_8005FDA8:
/* 8005FDB4 0005CD14 42 00 FF DC */ bdnz lbl_8005FD90
lbl_8005FDB8:
/* 8005FDB8 0005CD18 3C 60 80 3D */ lis r3, lbl_803CCFAC@ha
/* 8005FDBC 0005CD1C 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8005FDBC 0005CD1C 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8005FDC0 0005CD20 38 A3 CF AC */ addi r5, r3, lbl_803CCFAC@l
/* 8005FDC4 0005CD24 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8005FDC4 0005CD24 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8005FDC8 0005CD28 38 61 00 10 */ addi r3, r1, 0x10
/* 8005FDCC 0005CD2C 38 80 FF FF */ li r4, -1
/* 8005FDD0 0005CD30 48 27 66 05 */ bl __ct__10CCallStackFUiPCcPCc
@ -3361,11 +3361,11 @@ GetNumPartSizes__9CGameAreaCFv:
AllocNewAreaData__9CGameAreaFii:
/* 8006079C 0005D6FC 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 800607A0 0005D700 7C 08 02 A6 */ mflr r0
/* 800607A4 0005D704 3C C0 80 3D */ lis r6, lbl_803D6AA8@ha
/* 800607A4 0005D704 3C C0 80 3D */ lis r6, kUnknownType__10CCallStack@ha
/* 800607A8 0005D708 3C E0 80 3D */ lis r7, lbl_803CCFAC@ha
/* 800607AC 0005D70C 90 01 00 54 */ stw r0, 0x54(r1)
/* 800607B0 0005D710 38 07 CF AC */ addi r0, r7, lbl_803CCFAC@l
/* 800607B4 0005D714 38 C6 6A A8 */ addi r6, r6, lbl_803D6AA8@l
/* 800607B4 0005D714 38 C6 6A A8 */ addi r6, r6, kUnknownType__10CCallStack@l
/* 800607B8 0005D718 93 E1 00 4C */ stw r31, 0x4c(r1)
/* 800607BC 0005D71C 93 C1 00 48 */ stw r30, 0x48(r1)
/* 800607C0 0005D720 7C BE 2B 78 */ mr r30, r5

4
asm/MetroidPrime/CMemoryCardDriver.s
View File

@ -3430,9 +3430,9 @@ lbl_8024EFB4:
/* 8024EFC4 0024BF24 48 00 00 3C */ b lbl_8024F000
lbl_8024EFC8:
/* 8024EFC8 0024BF28 3C 60 80 3D */ lis r3, lbl_803D47CC@ha
/* 8024EFCC 0024BF2C 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8024EFCC 0024BF2C 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8024EFD0 0024BF30 38 A3 47 CC */ addi r5, r3, lbl_803D47CC@l
/* 8024EFD4 0024BF34 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8024EFD4 0024BF34 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8024EFD8 0024BF38 38 61 00 08 */ addi r3, r1, 8
/* 8024EFDC 0024BF3C 38 80 FF FF */ li r4, -1
/* 8024EFE0 0024BF40 38 A5 02 A1 */ addi r5, r5, 0x2a1

41
asm/MetroidPrime/CNESEmulator.s
View File

@ -469,9 +469,9 @@ Update__12CNESEmulatorFv:
/* 80294180 002910E0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80294184 002910E4 41 82 01 58 */ beq lbl_802942DC
/* 80294188 002910E8 3C 60 80 3D */ lis r3, lbl_803D5BA4@ha
/* 8029418C 002910EC 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 8029418C 002910EC 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80294190 002910F0 38 A3 5B A4 */ addi r5, r3, lbl_803D5BA4@l
/* 80294194 002910F4 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80294194 002910F4 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80294198 002910F8 38 61 00 08 */ addi r3, r1, 8
/* 8029419C 002910FC 38 80 FF FF */ li r4, -1
/* 802941A0 00291100 48 04 22 35 */ bl __ct__10CCallStackFUiPCcPCc
@ -837,9 +837,9 @@ __ct__12CNESEmulatorFv:
/* 80294680 002915E0 38 80 FF FF */ li r4, -1
/* 80294684 002915E4 93 E1 00 8C */ stw r31, 0x8c(r1)
/* 80294688 002915E8 7C 7F 1B 78 */ mr r31, r3
/* 8029468C 002915EC 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 8029468C 002915EC 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 80294690 002915F0 93 C1 00 88 */ stw r30, 0x88(r1)
/* 80294694 002915F4 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 80294694 002915F4 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 80294698 002915F8 38 61 00 48 */ addi r3, r1, 0x48
/* 8029469C 002915FC 90 1F 00 00 */ stw r0, 0(r31)
/* 802946A0 00291600 48 04 1D 35 */ bl __ct__10CCallStackFUiPCcPCc
@ -853,10 +853,10 @@ __ct__12CNESEmulatorFv:
/* 802946C0 00291620 90 7F 00 04 */ stw r3, 4(r31)
/* 802946C4 00291624 38 00 00 00 */ li r0, 0
/* 802946C8 00291628 3C 80 80 3D */ lis r4, lbl_803D5BA4@ha
/* 802946CC 0029162C 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 802946CC 0029162C 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 802946D0 00291630 90 1F 00 08 */ stw r0, 8(r31)
/* 802946D4 00291634 38 A4 5B A4 */ addi r5, r4, lbl_803D5BA4@l
/* 802946D8 00291638 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 802946D8 00291638 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 802946DC 0029163C 38 61 00 40 */ addi r3, r1, 0x40
/* 802946E0 00291640 90 1F 00 0C */ stw r0, 0xc(r31)
/* 802946E4 00291644 38 80 FF FF */ li r4, -1
@ -875,9 +875,9 @@ __ct__12CNESEmulatorFv:
/* 80294718 00291678 38 C0 00 00 */ li r6, 0
/* 8029471C 0029167C 48 08 12 79 */ bl Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack
/* 80294720 00291680 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 80294724 00291684 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80294724 00291684 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80294728 00291688 90 6D A5 A0 */ stw r3, lbl_805A9160@sda21(r13)
/* 8029472C 0029168C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8029472C 0029168C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80294730 00291690 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 80294734 00291694 38 61 00 38 */ addi r3, r1, 0x38
/* 80294738 00291698 38 80 FF FF */ li r4, -1
@ -891,11 +891,11 @@ __ct__12CNESEmulatorFv:
/* 80294758 002916B8 48 08 12 3D */ bl Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack
/* 8029475C 002916BC 90 7F 00 08 */ stw r3, 8(r31)
/* 80294760 002916C0 3C 80 80 3D */ lis r4, lbl_803D5BA4@ha
/* 80294764 002916C4 3C 60 80 3D */ lis r3, lbl_803D6AA8@ha
/* 80294764 002916C4 3C 60 80 3D */ lis r3, kUnknownType__10CCallStack@ha
/* 80294768 002916C8 3C 00 00 02 */ lis r0, 2
/* 8029476C 002916CC 80 FF 00 08 */ lwz r7, 8(r31)
/* 80294770 002916D0 38 A4 5B A4 */ addi r5, r4, lbl_803D5BA4@l
/* 80294774 002916D4 38 C3 6A A8 */ addi r6, r3, lbl_803D6AA8@l
/* 80294774 002916D4 38 C3 6A A8 */ addi r6, r3, kUnknownType__10CCallStack@l
/* 80294778 002916D8 38 61 00 30 */ addi r3, r1, 0x30
/* 8029477C 002916DC 90 07 00 48 */ stw r0, 0x48(r7)
/* 80294780 002916E0 38 80 FF FF */ li r4, -1
@ -910,9 +910,9 @@ __ct__12CNESEmulatorFv:
/* 802947A4 00291704 80 DF 00 08 */ lwz r6, 8(r31)
/* 802947A8 00291708 3C E0 00 01 */ lis r7, 0x00008000@ha
/* 802947AC 0029170C 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 802947B0 00291710 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 802947B0 00291710 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 802947B4 00291714 90 66 00 00 */ stw r3, 0(r6)
/* 802947B8 00291718 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 802947B8 00291718 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 802947BC 0029171C 38 07 80 00 */ addi r0, r7, 0x00008000@l
/* 802947C0 00291720 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 802947C4 00291724 80 9F 00 08 */ lwz r4, 8(r31)
@ -929,11 +929,11 @@ __ct__12CNESEmulatorFv:
/* 802947F0 00291750 48 08 11 A5 */ bl Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack
/* 802947F4 00291754 80 FF 00 08 */ lwz r7, 8(r31)
/* 802947F8 00291758 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 802947FC 0029175C 3C C0 80 3D */ lis r6, lbl_803D6AA8@ha
/* 802947FC 0029175C 3C C0 80 3D */ lis r6, kUnknownType__10CCallStack@ha
/* 80294800 00291760 38 80 FF FF */ li r4, -1
/* 80294804 00291764 90 67 00 0C */ stw r3, 0xc(r7)
/* 80294808 00291768 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 8029480C 0029176C 38 C6 6A A8 */ addi r6, r6, lbl_803D6AA8@l
/* 8029480C 0029176C 38 C6 6A A8 */ addi r6, r6, kUnknownType__10CCallStack@l
/* 80294810 00291770 38 61 00 20 */ addi r3, r1, 0x20
/* 80294814 00291774 80 1F 00 04 */ lwz r0, 4(r31)
/* 80294818 00291778 80 FF 00 08 */ lwz r7, 8(r31)
@ -946,9 +946,9 @@ __ct__12CNESEmulatorFv:
/* 80294834 00291794 38 C0 00 00 */ li r6, 0
/* 80294838 00291798 48 08 11 5D */ bl Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack
/* 8029483C 0029179C 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 80294840 002917A0 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80294840 002917A0 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80294844 002917A4 90 7F 00 0C */ stw r3, 0xc(r31)
/* 80294848 002917A8 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80294848 002917A8 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 8029484C 002917AC 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 80294850 002917B0 38 61 00 18 */ addi r3, r1, 0x18
/* 80294854 002917B4 38 80 FF FF */ li r4, -1
@ -960,9 +960,9 @@ __ct__12CNESEmulatorFv:
/* 8029486C 002917CC 38 C0 00 00 */ li r6, 0
/* 80294870 002917D0 48 08 11 25 */ bl Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack
/* 80294874 002917D4 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 80294878 002917D8 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80294878 002917D8 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 8029487C 002917DC 90 7F 00 18 */ stw r3, 0x18(r31)
/* 80294880 002917E0 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80294880 002917E0 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80294884 002917E4 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 80294888 002917E8 38 61 00 10 */ addi r3, r1, 0x10
/* 8029488C 002917EC 38 80 FF FF */ li r4, -1
@ -988,11 +988,11 @@ __ct__12CNESEmulatorFv:
/* 802948DC 0029183C 48 0B B3 F5 */ bl __ct__8CDvdFileFPCc
/* 802948E0 00291840 80 C1 00 70 */ lwz r6, 0x70(r1)
/* 802948E4 00291844 3C A0 80 3D */ lis r5, lbl_803D5BA4@ha
/* 802948E8 00291848 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 802948E8 00291848 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 802948EC 0029184C 38 61 00 08 */ addi r3, r1, 8
/* 802948F0 00291850 38 06 00 1F */ addi r0, r6, 0x1f
/* 802948F4 00291854 38 A5 5B A4 */ addi r5, r5, lbl_803D5BA4@l
/* 802948F8 00291858 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 802948F8 00291858 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 802948FC 0029185C 38 80 FF FF */ li r4, -1
/* 80294900 00291860 54 1E 00 34 */ rlwinm r30, r0, 0, 0, 0x1a
/* 80294904 00291864 48 04 1A D1 */ bl __ct__10CCallStackFUiPCcPCc
@ -1427,4 +1427,3 @@ lbl_803D5BA4:
.asciz "??(??)"
.balign 4
.4byte 0

4
asm/MetroidPrime/CPauseScreen.s
View File

@ -4042,10 +4042,10 @@ __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup:
/* 80074158 000710B8 90 A1 00 28 */ stw r5, 0x28(r1)
/* 8007415C 000710BC 48 2C 7A F5 */ bl ResourceSize__10CResLoaderCFRC10SObjectTag
/* 80074160 000710C0 3C A0 80 3D */ lis r5, lbl_803CD2D8@ha
/* 80074164 000710C4 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80074164 000710C4 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80074168 000710C8 90 7F 00 58 */ stw r3, 0x58(r31)
/* 8007416C 000710CC 38 A5 D2 D8 */ addi r5, r5, lbl_803CD2D8@l
/* 80074170 000710D0 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80074170 000710D0 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80074174 000710D4 38 61 00 1C */ addi r3, r1, 0x1c
/* 80074178 000710D8 38 A5 02 60 */ addi r5, r5, 0x260
/* 8007417C 000710DC 38 80 FF FF */ li r4, -1

8
asm/MetroidPrime/CWorld.s
View File

@ -1893,10 +1893,10 @@ __ct__11CDummyWorldFUi:
/* 80057504 00054464 90 01 00 10 */ stw r0, 0x10(r1)
/* 80057508 00054468 48 2E 47 49 */ bl ResourceSize__10CResLoaderCFRC10SObjectTag
/* 8005750C 0005446C 3C A0 80 3D */ lis r5, lbl_803CCF70@ha
/* 80057510 00054470 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80057510 00054470 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80057514 00054474 90 7F 00 38 */ stw r3, 0x38(r31)
/* 80057518 00054478 38 A5 CF 70 */ addi r5, r5, lbl_803CCF70@l
/* 8005751C 0005447C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 8005751C 0005447C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80057520 00054480 38 61 00 08 */ addi r3, r1, 8
/* 80057524 00054484 38 A5 00 01 */ addi r5, r5, 1
/* 80057528 00054488 38 80 FF FF */ li r4, -1
@ -3866,10 +3866,10 @@ __ct__6CWorldFR12IObjectStoreR11CResFactoryUi:
/* 80058FCC 00055F2C 90 C1 00 14 */ stw r6, 0x14(r1)
/* 80058FD0 00055F30 48 2E 2C 81 */ bl ResourceSize__10CResLoaderCFRC10SObjectTag
/* 80058FD4 00055F34 3C A0 80 3D */ lis r5, lbl_803CCF70@ha
/* 80058FD8 00055F38 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 80058FD8 00055F38 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 80058FDC 00055F3C 90 7E 00 44 */ stw r3, 0x44(r30)
/* 80058FE0 00055F40 38 A5 CF 70 */ addi r5, r5, lbl_803CCF70@l
/* 80058FE4 00055F44 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 80058FE4 00055F44 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 80058FE8 00055F48 38 61 00 08 */ addi r3, r1, 8
/* 80058FEC 00055F4C 38 A5 00 01 */ addi r5, r5, 1
/* 80058FF0 00055F50 38 80 FF FF */ li r4, -1

4
asm/MetroidPrime/main.s
View File

@ -7215,10 +7215,10 @@ sub_800084a4:
/* 800084A4 00005404 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800084A8 00005408 7C 08 02 A6 */ mflr r0
/* 800084AC 0000540C 3C A0 80 3D */ lis r5, lbl_803CBE74@ha
/* 800084B0 00005410 3C 80 80 3D */ lis r4, lbl_803D6AA8@ha
/* 800084B0 00005410 3C 80 80 3D */ lis r4, kUnknownType__10CCallStack@ha
/* 800084B4 00005414 90 01 00 24 */ stw r0, 0x24(r1)
/* 800084B8 00005418 38 A5 BE 74 */ addi r5, r5, lbl_803CBE74@l
/* 800084BC 0000541C 38 C4 6A A8 */ addi r6, r4, lbl_803D6AA8@l
/* 800084BC 0000541C 38 C4 6A A8 */ addi r6, r4, kUnknownType__10CCallStack@l
/* 800084C0 00005420 38 80 FF FF */ li r4, -1
/* 800084C4 00005424 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 800084C8 00005428 7C 7F 1B 78 */ mr r31, r3

1
configure.py
View File

@ -483,7 +483,6 @@ LIBS = [
"Kyoto/Basics/CBasics",
["Kyoto/Basics/CStopwatch", True],
"Kyoto/Basics/CBasicsDolphin",
["Kyoto/Alloc/CCallStackUnknownType", False], # This is a hack until all usages of CCallStack's constructor are accounted for
["Kyoto/Alloc/CCallStackDolphin", True],
["Kyoto/Basics/COsContextDolphin", True],
["Kyoto/Basics/CSWDataDolphin", True],

3
include/Kyoto/Alloc/CCallStack.hpp
View File

@ -4,8 +4,9 @@
#include <types.h>
class CCallStack {
static const char kUnknownType[];
public:
CCallStack(uint lineNum, const char* lineStr, const char* type = "UnknownType");
CCallStack(uint lineNum, const char* lineStr, const char* type = kUnknownType);
const char* GetFileAndLineText() const;
const char* GetTypeText() const;

1
obj_files.mk
View File

@ -422,7 +422,6 @@ KYOTO_1 :=\
$(BUILD_DIR)/asm/Kyoto/Basics/CBasics.o\
$(BUILD_DIR)/src/Kyoto/Basics/CStopwatch.o\
$(BUILD_DIR)/asm/Kyoto/Basics/CBasicsDolphin.o\
$(BUILD_DIR)/asm/Kyoto/Alloc/CCallStackUnknownType.o\
$(BUILD_DIR)/src/Kyoto/Alloc/CCallStackDolphin.o\
$(BUILD_DIR)/src/Kyoto/Basics/COsContextDolphin.o\
$(BUILD_DIR)/src/Kyoto/Basics/CSWDataDolphin.o\

2
src/Kyoto/Alloc/CCallStackDolphin.cpp
View File

@ -1,5 +1,7 @@
#include "Kyoto/Alloc/CCallStack.hpp"
const char CCallStack::kUnknownType[] = "UnknownType\0";
CCallStack::CCallStack(uint lineNum, const char* fileAndLine, const char* type)
: x0_line(fileAndLine), x4_type(type) {}