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

Match, but don't link CScriptBallTrigger

Browse Source 
Former-commit-id: 30c893ce35
This commit is contained in:
Henrique Gemignani Passos Lima
2022-11-05 01:46:13 +02:00
parent 88e3fedf85
commit b7783e9597
7 changed files with 163 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/MetroidPrime/Player/CPlayer.hpp
View File

@@ -198,6 +198,9 @@ public:
CPlayerGun* PlayerGun() { return x490_gun.get(); }
const CPlayerGun* GetPlayerGun() const { return x490_gun.get(); }
CMorphBall* MorphBall() { return x768_morphball.get(); }
const CMorphBall* GetMorphBall() const { return x768_morphball.get(); }
ESurfaceRestraints GetCurrentSurfaceRestraint() const { return x2ac_surfaceRestraint; }
ESurfaceRestraints GetSurfaceRestraint() const {
return x2b0_outOfWaterTicks == 2 ? GetCurrentSurfaceRestraint() : kSR_Water;