PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 10:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Symbol renaming

Browse Source 
Former-commit-id: be9f7f1dc4
This commit is contained in:
Luke Street
2022-09-18 01:52:19 -04:00
parent 50047f2398
commit ad6fd10f21
53 changed files with 453 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/MetroidPrime/ScriptObjects/CScriptGenerator.s
View File

@@ -384,7 +384,7 @@ lbl_800B497C:
/* 800B49F4 000B1954 98 1F 0F 94 */ stb r0, 0xf94(r31)
/* 800B49F8 000B1958 54 D2 DF FE */ rlwinm r18, r6, 0x1b, 0x1f, 0x1f
/* 800B49FC 000B195C 38 61 00 E8 */ addi r3, r1, 0xe8
/* 800B4A00 000B1960 4B F9 38 E9 */ bl GenerateObject__13CStateManagerF9TEditorId
/* 800B4A00 000B1960 4B F9 38 E9 */ bl GenerateObject__13CStateManagerFRC9TEditorId
/* 800B4A04 000B1964 A0 81 00 EC */ lhz r4, 0xec(r1)
/* 800B4A08 000B1968 88 1F 0F 94 */ lbz r0, 0xf94(r31)
/* 800B4A0C 000B196C 52 40 2E B4 */ rlwimi r0, r18, 5, 0x1a, 0x1a

36
asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
View File

@@ -216,7 +216,7 @@ lbl_80288A1C:
/* 80288A30 00285990 48 00 07 C0 */ b lbl_802891F0
lbl_80288A34:
/* 80288A34 00285994 7F C3 F3 78 */ mr r3, r30
/* 80288A38 00285998 4B DB B6 51 */ bl sub_80044088
/* 80288A38 00285998 4B DB B6 51 */ bl CurrentMaze__13CStateManagerFv
/* 80288A3C 0028599C 28 03 00 00 */ cmplwi r3, 0
/* 80288A40 002859A0 40 82 07 B0 */ bne lbl_802891F0
/* 80288A44 002859A4 3C 80 80 3D */ lis r4, lbl_803D5980@ha
@@ -261,7 +261,7 @@ lbl_80288A7C:
/* 80288ADC 00285A3C 7F C3 F3 78 */ mr r3, r30
/* 80288AE0 00285A40 38 81 00 58 */ addi r4, r1, 0x58
/* 80288AE4 00285A44 90 01 00 5C */ stw r0, 0x5c(r1)
/* 80288AE8 00285A48 4B DB B5 49 */ bl sub_80044030
/* 80288AE8 00285A48 4B DB B5 49 */ bl "SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>"
/* 80288AEC 00285A4C 80 61 00 58 */ lwz r3, 0x58(r1)
/* 80288AF0 00285A50 48 08 CE 41 */ bl Free__7CMemoryFPCv
/* 80288AF4 00285A54 80 61 00 5C */ lwz r3, 0x5c(r1)
@@ -270,12 +270,12 @@ lbl_80288A7C:
lbl_80288B00:
/* 80288B00 00285A60 7F C3 F3 78 */ mr r3, r30
/* 80288B04 00285A64 3B 60 00 00 */ li r27, 0
/* 80288B08 00285A68 4B DB B5 81 */ bl sub_80044088
/* 80288B08 00285A68 4B DB B5 81 */ bl CurrentMaze__13CStateManagerFv
/* 80288B0C 00285A6C 28 03 00 00 */ cmplwi r3, 0
/* 80288B10 00285A70 41 82 06 E0 */ beq lbl_802891F0
/* 80288B14 00285A74 80 9F 00 E8 */ lwz r4, 0xe8(r31)
/* 80288B18 00285A78 80 BF 00 EC */ lwz r5, 0xec(r31)
/* 80288B1C 00285A7C 48 00 13 F9 */ bl GetCell__10CMazeStateFUiUi
/* 80288B1C 00285A7C 48 00 13 F9 */ bl GetCell__10CMazeStateCFUiUi
/* 80288B20 00285A80 80 9F 00 F0 */ lwz r4, 0xf0(r31)
/* 80288B24 00285A84 7C 7A 1B 78 */ mr r26, r3
/* 80288B28 00285A88 2C 04 00 00 */ cmpwi r4, 0
@@ -349,7 +349,7 @@ lbl_80288BF0:
/* 80288C20 00285B80 98 1E 0F 94 */ stb r0, 0xf94(r30)
/* 80288C24 00285B84 38 61 00 80 */ addi r3, r1, 0x80
/* 80288C28 00285B88 38 A6 00 08 */ addi r5, r6, 8
/* 80288C2C 00285B8C 4B DB F6 BD */ bl GenerateObject__13CStateManagerF9TEditorId
/* 80288C2C 00285B8C 4B DB F6 BD */ bl GenerateObject__13CStateManagerFRC9TEditorId
/* 80288C30 00285B90 A0 A1 00 84 */ lhz r5, 0x84(r1)
/* 80288C34 00285B94 7F C3 F3 78 */ mr r3, r30
/* 80288C38 00285B98 88 1E 0F 94 */ lbz r0, 0xf94(r30)
@@ -449,7 +449,7 @@ lbl_80288D68:
/* 80288D8C 00285CEC 98 1E 0F 94 */ stb r0, 0xf94(r30)
/* 80288D90 00285CF0 38 61 00 70 */ addi r3, r1, 0x70
/* 80288D94 00285CF4 38 BA 00 08 */ addi r5, r26, 8
/* 80288D98 00285CF8 4B DB F5 51 */ bl GenerateObject__13CStateManagerF9TEditorId
/* 80288D98 00285CF8 4B DB F5 51 */ bl GenerateObject__13CStateManagerFRC9TEditorId
/* 80288D9C 00285CFC A0 61 00 74 */ lhz r3, 0x74(r1)
/* 80288DA0 00285D00 88 1E 0F 94 */ lbz r0, 0xf94(r30)
/* 80288DA4 00285D04 53 60 2E B4 */ rlwimi r0, r27, 5, 0x1a, 0x1a
@@ -525,7 +525,7 @@ lbl_80288E90:
/* 80288EA8 00285E08 48 00 03 48 */ b lbl_802891F0
lbl_80288EAC:
/* 80288EAC 00285E0C 7F C3 F3 78 */ mr r3, r30
/* 80288EB0 00285E10 4B DB B1 D9 */ bl sub_80044088
/* 80288EB0 00285E10 4B DB B1 D9 */ bl CurrentMaze__13CStateManagerFv
/* 80288EB4 00285E14 88 1F 01 3C */ lbz r0, 0x13c(r31)
/* 80288EB8 00285E18 7C 7C 1B 78 */ mr r28, r3
/* 80288EBC 00285E1C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
@@ -621,7 +621,7 @@ lbl_80288FB8:
/* 80289004 00285F64 2C 00 00 01 */ cmpwi r0, 1
/* 80289008 00285F68 40 82 00 40 */ bne lbl_80289048
/* 8028900C 00285F6C 7F 83 E3 78 */ mr r3, r28
/* 80289010 00285F70 48 00 0E E9 */ bl GetCell2__10CMazeStateFUiUi
/* 80289010 00285F70 48 00 0E E9 */ bl GetCell__10CMazeStateFUiUi
/* 80289014 00285F74 88 A3 00 00 */ lbz r5, 0(r3)
/* 80289018 00285F78 54 A0 D7 FF */ rlwinm. r0, r5, 0x1a, 0x1f, 0x1f
/* 8028901C 00285F7C 40 82 00 2C */ bne lbl_80289048
@@ -648,7 +648,7 @@ lbl_80289048:
/* 8028906C 00285FCC 2C 00 00 01 */ cmpwi r0, 1
/* 80289070 00285FD0 40 82 00 40 */ bne lbl_802890B0
/* 80289074 00285FD4 7F 83 E3 78 */ mr r3, r28
/* 80289078 00285FD8 48 00 0E 81 */ bl GetCell2__10CMazeStateFUiUi
/* 80289078 00285FD8 48 00 0E 81 */ bl GetCell__10CMazeStateFUiUi
/* 8028907C 00285FDC 88 A3 00 00 */ lbz r5, 0(r3)
/* 80289080 00285FE0 54 A0 D7 FF */ rlwinm. r0, r5, 0x1a, 0x1f, 0x1f
/* 80289084 00285FE4 40 82 00 2C */ bne lbl_802890B0
@@ -675,7 +675,7 @@ lbl_802890B0:
/* 802890D4 00286034 2C 00 00 00 */ cmpwi r0, 0
/* 802890D8 00286038 40 82 00 40 */ bne lbl_80289118
/* 802890DC 0028603C 7F 83 E3 78 */ mr r3, r28
/* 802890E0 00286040 48 00 0E 19 */ bl GetCell2__10CMazeStateFUiUi
/* 802890E0 00286040 48 00 0E 19 */ bl GetCell__10CMazeStateFUiUi
/* 802890E4 00286044 88 A3 00 00 */ lbz r5, 0(r3)
/* 802890E8 00286048 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f
/* 802890EC 0028604C 40 82 00 2C */ bne lbl_80289118
@@ -703,7 +703,7 @@ lbl_80289118:
/* 80289140 002860A0 2C 00 00 00 */ cmpwi r0, 0
/* 80289144 002860A4 40 82 00 40 */ bne lbl_80289184
/* 80289148 002860A8 7F 83 E3 78 */ mr r3, r28
/* 8028914C 002860AC 48 00 0D AD */ bl GetCell2__10CMazeStateFUiUi
/* 8028914C 002860AC 48 00 0D AD */ bl GetCell__10CMazeStateFUiUi
/* 80289150 002860B0 88 A3 00 00 */ lbz r5, 0(r3)
/* 80289154 002860B4 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f
/* 80289158 002860B8 40 82 00 2C */ bne lbl_80289184
@@ -732,14 +732,14 @@ lbl_802891A0:
/* 802891A8 00286108 48 00 00 48 */ b lbl_802891F0
lbl_802891AC:
/* 802891AC 0028610C 7F C3 F3 78 */ mr r3, r30
/* 802891B0 00286110 4B DB AE E1 */ bl sub_80044090
/* 802891B0 00286110 4B DB AE E1 */ bl GetCurrentMaze__13CStateManagerCFv
/* 802891B4 00286114 28 03 00 00 */ cmplwi r3, 0
/* 802891B8 00286118 41 82 00 20 */ beq lbl_802891D8
/* 802891BC 0028611C 38 00 00 00 */ li r0, 0
/* 802891C0 00286120 7F C3 F3 78 */ mr r3, r30
/* 802891C4 00286124 90 01 00 40 */ stw r0, 0x40(r1)
/* 802891C8 00286128 38 81 00 40 */ addi r4, r1, 0x40
/* 802891CC 0028612C 4B DB AE 65 */ bl sub_80044030
/* 802891CC 0028612C 4B DB AE 65 */ bl "SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>"
/* 802891D0 00286130 80 61 00 40 */ lwz r3, 0x40(r1)
/* 802891D4 00286134 48 08 C7 5D */ bl Free__7CMemoryFPCv
lbl_802891D8:
@@ -947,7 +947,7 @@ lbl_802894AC:
/* 802894C4 00286424 98 1E 0F 94 */ stb r0, 0xf94(r30)
/* 802894C8 00286428 38 61 00 24 */ addi r3, r1, 0x24
/* 802894CC 0028642C 38 BF 00 08 */ addi r5, r31, 8
/* 802894D0 00286430 4B DB EE 19 */ bl GenerateObject__13CStateManagerF9TEditorId
/* 802894D0 00286430 4B DB EE 19 */ bl GenerateObject__13CStateManagerFRC9TEditorId
/* 802894D4 00286434 A0 A1 00 28 */ lhz r5, 0x28(r1)
/* 802894D8 00286438 7F C3 F3 78 */ mr r3, r30
/* 802894DC 0028643C 88 1E 0F 94 */ lbz r0, 0xf94(r30)
@@ -1648,8 +1648,8 @@ lbl_80289EE4:
/* 80289EF0 00286E50 38 21 00 20 */ addi r1, r1, 0x20
/* 80289EF4 00286E54 4E 80 00 20 */ blr
.global GetCell2__10CMazeStateFUiUi
GetCell2__10CMazeStateFUiUi:
.global GetCell__10CMazeStateFUiUi
GetCell__10CMazeStateFUiUi:
/* 80289EF8 00286E58 1C 05 00 09 */ mulli r0, r5, 9
/* 80289EFC 00286E5C 7C 65 1B 78 */ mr r5, r3
/* 80289F00 00286E60 7C 04 02 14 */ add r0, r4, r0
@@ -1658,8 +1658,8 @@ GetCell2__10CMazeStateFUiUi:
/* 80289F0C 00286E6C 7C 65 1A 14 */ add r3, r5, r3
/* 80289F10 00286E70 4E 80 00 20 */ blr
.global GetCell__10CMazeStateFUiUi
GetCell__10CMazeStateFUiUi:
.global GetCell__10CMazeStateCFUiUi
GetCell__10CMazeStateCFUiUi:
/* 80289F14 00286E74 1C 05 00 09 */ mulli r0, r5, 9
/* 80289F18 00286E78 7C 65 1B 78 */ mr r5, r3
/* 80289F1C 00286E7C 7C 04 02 14 */ add r0, r4, r0

2
asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s
View File

@@ -343,7 +343,7 @@ GeneratePickup__22CScriptPickupGeneratorFR13CStateManager9TUniqueId9TEditorId:
/* 8015E2E4 0015B244 98 1F 0F 94 */ stb r0, 0xf94(r31)
/* 8015E2E8 0015B248 54 DD DF FE */ rlwinm r29, r6, 0x1b, 0x1f, 0x1f
/* 8015E2EC 0015B24C 38 61 00 4C */ addi r3, r1, 0x4c
/* 8015E2F0 0015B250 4B EE 9F F9 */ bl GenerateObject__13CStateManagerF9TEditorId
/* 8015E2F0 0015B250 4B EE 9F F9 */ bl GenerateObject__13CStateManagerFRC9TEditorId
/* 8015E2F4 0015B254 A0 81 00 50 */ lhz r4, 0x50(r1)
/* 8015E2F8 0015B258 88 1F 0F 94 */ lbz r0, 0xf94(r31)
/* 8015E2FC 0015B25C 53 A0 2E B4 */ rlwimi r0, r29, 5, 0x1a, 0x1a

18
asm/MetroidPrime/ScriptObjects/CScriptPlatform.s
View File

@@ -3713,12 +3713,12 @@ __dt__23CCollidableOBBTreeGroupFv:
/* 800B3DB0 000B0D10 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800B3DB4 000B0D14 7C 7F 1B 79 */ or. r31, r3, r3
/* 800B3DB8 000B0D18 41 82 00 30 */ beq lbl_800B3DE8
/* 800B3DBC 000B0D1C 3C 60 80 3F */ lis r3, lbl_803EC470@ha
/* 800B3DC0 000B0D20 38 03 C4 70 */ addi r0, r3, lbl_803EC470@l
/* 800B3DBC 000B0D1C 3C 60 80 3F */ lis r3, __vt__23CCollidableOBBTreeGroup@ha
/* 800B3DC0 000B0D20 38 03 C4 70 */ addi r0, r3, __vt__23CCollidableOBBTreeGroup@l
/* 800B3DC4 000B0D24 90 1F 00 00 */ stw r0, 0(r31)
/* 800B3DC8 000B0D28 41 82 00 10 */ beq lbl_800B3DD8
/* 800B3DCC 000B0D2C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha
/* 800B3DD0 000B0D30 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l
/* 800B3DCC 000B0D2C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha
/* 800B3DD0 000B0D30 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l
/* 800B3DD4 000B0D34 90 1F 00 00 */ stw r0, 0(r31)
lbl_800B3DD8:
/* 800B3DD8 000B0D38 7C 80 07 35 */ extsh. r0, r4
@@ -3733,8 +3733,8 @@ lbl_800B3DE8:
/* 800B3DF8 000B0D58 38 21 00 10 */ addi r1, r1, 0x10
/* 800B3DFC 000B0D5C 4E 80 00 20 */ blr
.global "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii"
"__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii":
.global "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi"
"__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi":
/* 800B3E00 000B0D60 94 21 FF 20 */ stwu r1, -0xe0(r1)
/* 800B3E04 000B0D64 7C 08 02 A6 */ mflr r0
/* 800B3E08 000B0D68 90 01 00 E4 */ stw r0, 0xe4(r1)
@@ -4067,7 +4067,7 @@ lbl_800B42F4:
/* 800B4318 000B1278 41 82 00 14 */ beq lbl_800B432C
/* 800B431C 000B127C 80 9F 03 0C */ lwz r4, 0x30c(r31)
/* 800B4320 000B1280 38 BF 00 68 */ addi r5, r31, 0x68
/* 800B4324 000B1284 48 1F 96 41 */ bl "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList"
/* 800B4324 000B1284 48 1F 96 41 */ bl "__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList"
/* 800B4328 000B1288 7C 6E 1B 78 */ mr r14, r3
lbl_800B432C:
/* 800B432C 000B128C 80 7F 03 14 */ lwz r3, 0x314(r31)
@@ -4112,7 +4112,7 @@ update_fog__3CGXFUi:
/* 800B43B4 000B1314 3C 60 F2 00 */ lis r3, 0xf200
/* 800B43B8 000B1318 38 00 00 00 */ li r0, 0
/* 800B43BC 000B131C 90 64 80 00 */ stw r3, 0xCC008000@l(r4)
/* 800B43C0 000B1320 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2)
/* 800B43C0 000B1320 80 62 CE 08 */ lwz r3, __GXData@sda21(r2)
/* 800B43C4 000B1324 B0 03 00 02 */ sth r0, 2(r3)
/* 800B43C8 000B1328 4E 80 00 20 */ blr
lbl_800B43CC:
@@ -4127,7 +4127,7 @@ lbl_800B43CC:
/* 800B43EC 000B134C 50 A4 82 1E */ rlwimi r4, r5, 0x10, 8, 0xf
/* 800B43F0 000B1350 64 83 F2 00 */ oris r3, r4, 0xf200
/* 800B43F4 000B1354 90 66 80 00 */ stw r3, 0xCC008000@l(r6)
/* 800B43F8 000B1358 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2)
/* 800B43F8 000B1358 80 62 CE 08 */ lwz r3, __GXData@sda21(r2)
/* 800B43FC 000B135C B0 03 00 02 */ sth r0, 2(r3)
/* 800B4400 000B1360 4E 80 00 20 */ blr