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

Fix symbol name for CPlayerState::GetIsFusionEnabled

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-04 17:12:27 +03:00
parent d2b61199e4
commit e03f153312
No known key found for this signature in database
GPG Key ID: E224F951761145F8
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/MetroidPrime/CInGameGuiManager.s
View File

@ -852,7 +852,7 @@ lbl_801074C8:
/* 801074D4 00104434 80 7B 08 B8 */ lwz r3, 0x8b8(r27) /* 801074D4 00104434 80 7B 08 B8 */ lwz r3, 0x8b8(r27)
/* 801074D8 00104438 80 63 00 00 */ lwz r3, 0(r3) /* 801074D8 00104438 80 63 00 00 */ lwz r3, 0(r3)
/* 801074DC 0010443C 83 63 00 20 */ lwz r27, 0x20(r3) /* 801074DC 0010443C 83 63 00 20 */ lwz r27, 0x20(r3)
/* 801074E0 00104440 4B F8 9F E5 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 801074E0 00104440 4B F8 9F E5 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 801074E4 00104444 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801074E4 00104444 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801074E8 00104448 41 82 00 38 */ beq lbl_80107520 /* 801074E8 00104448 41 82 00 38 */ beq lbl_80107520
/* 801074EC 0010444C 2C 1B 00 03 */ cmpwi r27, 3 /* 801074EC 0010444C 2C 1B 00 03 */ cmpwi r27, 3

2
asm/MetroidPrime/CInventoryScreen.s
View File

@ -1930,7 +1930,7 @@ __ct__16CInventoryScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTableRC16CDepen
/* 80207590 002044F0 4B E8 A5 31 */ bl HasPowerUp__12CPlayerStateCFQ212CPlayerState9EItemType /* 80207590 002044F0 4B E8 A5 31 */ bl HasPowerUp__12CPlayerStateCFQ212CPlayerState9EItemType
/* 80207594 002044F4 7C 7E 1B 78 */ mr r30, r3 /* 80207594 002044F4 7C 7E 1B 78 */ mr r30, r3
/* 80207598 002044F8 7F 23 CB 78 */ mr r3, r25 /* 80207598 002044F8 7F 23 CB 78 */ mr r3, r25
/* 8020759C 002044FC 4B E8 9F 29 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 8020759C 002044FC 4B E8 9F 29 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 802075A0 00204500 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 802075A0 00204500 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d
/* 802075A4 00204504 7F 83 E3 78 */ mr r3, r28 /* 802075A4 00204504 7F 83 E3 78 */ mr r3, r28
/* 802075A8 00204508 7E E4 BB 78 */ mr r4, r23 /* 802075A8 00204508 7E E4 BB 78 */ mr r4, r23

2
asm/MetroidPrime/CWorldTransManager.s
View File

@ -2724,7 +2724,7 @@ sub_8020b3e4:
/* 8020B410 00208370 4B DF DA FD */ bl sub_80008f0c /* 8020B410 00208370 4B DF DA FD */ bl sub_80008f0c
/* 8020B414 00208374 83 DF 00 20 */ lwz r30, 0x20(r31) /* 8020B414 00208374 83 DF 00 20 */ lwz r30, 0x20(r31)
/* 8020B418 00208378 7F E3 FB 78 */ mr r3, r31 /* 8020B418 00208378 7F E3 FB 78 */ mr r3, r31
/* 8020B41C 0020837C 4B E8 60 A9 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 8020B41C 0020837C 4B E8 60 A9 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 8020B420 00208380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020B420 00208380 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8020B424 00208384 41 82 00 48 */ beq lbl_8020B46C /* 8020B424 00208384 41 82 00 48 */ beq lbl_8020B46C
/* 8020B428 00208388 2C 1E 00 02 */ cmpwi r30, 2 /* 8020B428 00208388 2C 1E 00 02 */ cmpwi r30, 2

4
asm/MetroidPrime/Player/CMorphBall.s
View File

@ -3058,7 +3058,7 @@ LoadMorphBallModel__10CMorphBallFR13CStateManager:
/* 800EF75C 000EC6BC 83 BE 00 20 */ lwz r29, 0x20(r30) /* 800EF75C 000EC6BC 83 BE 00 20 */ lwz r29, 0x20(r30)
/* 800EF760 000EC6C0 7C 7B 1B 78 */ mr r27, r3 /* 800EF760 000EC6C0 7C 7B 1B 78 */ mr r27, r3
/* 800EF764 000EC6C4 7F C3 F3 78 */ mr r3, r30 /* 800EF764 000EC6C4 7F C3 F3 78 */ mr r3, r30
/* 800EF768 000EC6C8 4B FA 1D 5D */ bl GetIsFusionEnabled__12CPlayerStateFv /* 800EF768 000EC6C8 4B FA 1D 5D */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 800EF76C 000EC6CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EF76C 000EC6CC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800EF770 000EC6D0 41 82 00 08 */ beq lbl_800EF778 /* 800EF770 000EC6D0 41 82 00 08 */ beq lbl_800EF778
/* 800EF774 000EC6D4 3B BD 00 04 */ addi r29, r29, 4 /* 800EF774 000EC6D4 3B BD 00 04 */ addi r29, r29, 4
@ -3069,7 +3069,7 @@ lbl_800EF778:
/* 800EF784 000EC6E4 3B 5D 00 04 */ addi r26, r29, 4 /* 800EF784 000EC6E4 3B 5D 00 04 */ addi r26, r29, 4
lbl_800EF788: lbl_800EF788:
/* 800EF788 000EC6E8 7F C3 F3 78 */ mr r3, r30 /* 800EF788 000EC6E8 7F C3 F3 78 */ mr r3, r30
/* 800EF78C 000EC6EC 4B FA 1D 39 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 800EF78C 000EC6EC 4B FA 1D 39 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 800EF790 000EC6F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EF790 000EC6F0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800EF794 000EC6F4 41 82 00 08 */ beq lbl_800EF79C /* 800EF794 000EC6F4 41 82 00 08 */ beq lbl_800EF79C
/* 800EF798 000EC6F8 3B 5A 00 64 */ addi r26, r26, 0x64 /* 800EF798 000EC6F8 3B 5A 00 64 */ addi r26, r26, 0x64

2
asm/MetroidPrime/Player/CPlayerDynamics.s
View File

@ -149,7 +149,7 @@ UpdateMorphBallTransition__7CPlayerFfR13CStateManager:
/* 80281DB0 0027ED10 80 7D 08 B8 */ lwz r3, 0x8b8(r29) /* 80281DB0 0027ED10 80 7D 08 B8 */ lwz r3, 0x8b8(r29)
/* 80281DB4 0027ED14 80 63 00 00 */ lwz r3, 0(r3) /* 80281DB4 0027ED14 80 63 00 00 */ lwz r3, 0(r3)
/* 80281DB8 0027ED18 83 23 00 20 */ lwz r25, 0x20(r3) /* 80281DB8 0027ED18 83 23 00 20 */ lwz r25, 0x20(r3)
/* 80281DBC 0027ED1C 4B E0 F7 09 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 80281DBC 0027ED1C 4B E0 F7 09 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 80281DC0 0027ED20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80281DC0 0027ED20 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80281DC4 0027ED24 41 82 00 08 */ beq lbl_80281DCC /* 80281DC4 0027ED24 41 82 00 08 */ beq lbl_80281DCC
/* 80281DC8 0027ED28 3B 39 00 04 */ addi r25, r25, 4 /* 80281DC8 0027ED28 3B 39 00 04 */ addi r25, r25, 4

6
asm/MetroidPrime/Player/CPlayerState.s
View File

@ -311,8 +311,8 @@ SetIsFusionEnabled__12CPlayerStateFb:
/* 800914BC 0008E41C 98 03 00 00 */ stb r0, 0(r3) /* 800914BC 0008E41C 98 03 00 00 */ stb r0, 0(r3)
/* 800914C0 0008E420 4E 80 00 20 */ blr /* 800914C0 0008E420 4E 80 00 20 */ blr
.global GetIsFusionEnabled__12CPlayerStateFv .global GetIsFusionEnabled__12CPlayerStateCFv
GetIsFusionEnabled__12CPlayerStateFv: GetIsFusionEnabled__12CPlayerStateCFv:
/* 800914C4 0008E424 88 03 00 00 */ lbz r0, 0(r3) /* 800914C4 0008E424 88 03 00 00 */ lbz r0, 0(r3)
/* 800914C8 0008E428 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f /* 800914C8 0008E428 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f
/* 800914CC 0008E42C 7C 03 00 D0 */ neg r0, r3 /* 800914CC 0008E42C 7C 03 00 D0 */ neg r0, r3
@ -327,7 +327,7 @@ GetCurrentSuit__12CPlayerStateFv:
/* 800914E4 0008E444 90 01 00 14 */ stw r0, 0x14(r1) /* 800914E4 0008E444 90 01 00 14 */ stw r0, 0x14(r1)
/* 800914E8 0008E448 93 E1 00 0C */ stw r31, 0xc(r1) /* 800914E8 0008E448 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800914EC 0008E44C 7C 7F 1B 78 */ mr r31, r3 /* 800914EC 0008E44C 7C 7F 1B 78 */ mr r31, r3
/* 800914F0 0008E450 4B FF FF D5 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 800914F0 0008E450 4B FF FF D5 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 800914F4 0008E454 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800914F4 0008E454 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800914F8 0008E458 41 82 00 0C */ beq lbl_80091504 /* 800914F8 0008E458 41 82 00 0C */ beq lbl_80091504
/* 800914FC 0008E45C 38 60 00 04 */ li r3, 4 /* 800914FC 0008E45C 38 60 00 04 */ li r3, 4

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

@ -468,7 +468,7 @@ GetSuitCharIdx__18CScriptPlayerActorCFRC13CStateManager11EPlayerSuit:
/* 801AA788 001A76E8 7C BF 2B 78 */ mr r31, r5 /* 801AA788 001A76E8 7C BF 2B 78 */ mr r31, r5
/* 801AA78C 001A76EC 80 64 08 B8 */ lwz r3, 0x8b8(r4) /* 801AA78C 001A76EC 80 64 08 B8 */ lwz r3, 0x8b8(r4)
/* 801AA790 001A76F0 80 63 00 00 */ lwz r3, 0(r3) /* 801AA790 001A76F0 80 63 00 00 */ lwz r3, 0(r3)
/* 801AA794 001A76F4 4B EE 6D 31 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 801AA794 001A76F4 4B EE 6D 31 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 801AA798 001A76F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AA798 001A76F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801AA79C 001A76FC 41 82 00 48 */ beq lbl_801AA7E4 /* 801AA79C 001A76FC 41 82 00 48 */ beq lbl_801AA7E4
/* 801AA7A0 001A7700 2C 1F 00 02 */ cmpwi r31, 2 /* 801AA7A0 001A7700 2C 1F 00 02 */ cmpwi r31, 2

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

@ -3761,7 +3761,7 @@ lbl_8015246C:
/* 80152470 0014F3D0 40 82 04 30 */ bne lbl_801528A0 /* 80152470 0014F3D0 40 82 04 30 */ bne lbl_801528A0
/* 80152474 0014F3D4 80 7E 08 B8 */ lwz r3, 0x8b8(r30) /* 80152474 0014F3D4 80 7E 08 B8 */ lwz r3, 0x8b8(r30)
/* 80152478 0014F3D8 80 63 00 00 */ lwz r3, 0(r3) /* 80152478 0014F3D8 80 63 00 00 */ lwz r3, 0(r3)
/* 8015247C 0014F3DC 4B F3 F0 49 */ bl GetIsFusionEnabled__12CPlayerStateFv /* 8015247C 0014F3DC 4B F3 F0 49 */ bl GetIsFusionEnabled__12CPlayerStateCFv
/* 80152480 0014F3E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80152480 0014F3E0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80152484 0014F3E4 41 82 04 1C */ beq lbl_801528A0 /* 80152484 0014F3E4 41 82 04 1C */ beq lbl_801528A0
/* 80152488 0014F3E8 7F E3 FB 78 */ mr r3, r31 /* 80152488 0014F3E8 7F E3 FB 78 */ mr r3, r31