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

Add CPlayerState (#5)

Browse Source 
* Start CPlayerState

* CPlayerState::CalculateHealth symbol rename

* Add inline constructor for CHealthInfo

* Add skeleton for the rest of CPlayerState

* Match CPlayerState::DecrPickUp

* Match more methods in CPlayerState

* Run formatting

* Fix function order

* Improving the constants

Former-commit-id: 1e30daa096
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-01 17:08:15 +03:00
committed by GitHub
parent ba75752e14
commit bb86f3dc01
7 changed files with 603 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,7 +569,7 @@ lbl_8015E630:
/* 8015E634 0015B594 41 82 00 20 */ beq lbl_8015E654
/* 8015E638 0015B598 C3 C3 00 00 */ lfs f30, 0(r3)
/* 8015E63C 0015B59C 7F E3 FB 78 */ mr r3, r31
/* 8015E640 0015B5A0 4B F3 36 F1 */ bl CalculateHealth__12CPlayerStateFUi
/* 8015E640 0015B5A0 4B F3 36 F1 */ bl CalculateHealth__12CPlayerStateFv
/* 8015E644 0015B5A4 FC 1E 08 40 */ fcmpo cr0, f30, f1
/* 8015E648 0015B5A8 40 80 00 0C */ bge lbl_8015E654
/* 8015E64C 0015B5AC 3B 20 00 01 */ li r25, 1