Skip to content

Commit c80992c

Browse files
committed
A bit of cleanup
1 parent 9c0b832 commit c80992c

7 files changed

Lines changed: 150 additions & 170 deletions

File tree

config/GM8E01_00/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13611,7 +13611,7 @@ __apl__13CNUQuaternionFRC13CNUQuaternion = .text:0x80310E90; // type:function si
1361113611
__ml__13CNUQuaternionCFRC13CNUQuaternion = .text:0x80310ED4; // type:function size:0x118 scope:global
1361213612
__ct__13CNUQuaternionFffff = .text:0x80310FEC; // type:function size:0x14 scope:global
1361313613
__ct__13CNUQuaternionFfRC9CVector3f = .text:0x80311000; // type:function size:0x20 scope:global
13614-
ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle = .text:0x80311020; // type:function size:0xD8 scope:global
13614+
ClampedRotateTo__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle = .text:0x80311020; // type:function size:0xD8 scope:global
1361513615
ZRotation__11CQuaternionFRC9CRelAngle = .text:0x803110F8; // type:function size:0x38 scope:global
1361613616
YRotation__11CQuaternionFRC9CRelAngle = .text:0x80311130; // type:function size:0x38 scope:global
1361713617
XRotation__11CQuaternionFRC9CRelAngle = .text:0x80311168; // type:function size:0x38 scope:global

config/GM8E01_01/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13611,7 +13611,7 @@ __apl__13CNUQuaternionFRC13CNUQuaternion = .text:0x80310F70; // type:function si
1361113611
__ml__13CNUQuaternionCFRC13CNUQuaternion = .text:0x80310FB4; // type:function size:0x118 scope:global
1361213612
__ct__13CNUQuaternionFffff = .text:0x803110CC; // type:function size:0x14 scope:global
1361313613
__ct__13CNUQuaternionFfRC9CVector3f = .text:0x803110E0; // type:function size:0x20 scope:global
13614-
ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle = .text:0x80311100; // type:function size:0xD8 scope:global
13614+
ClampedRotateTo__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle = .text:0x80311100; // type:function size:0xD8 scope:global
1361513615
ZRotation__11CQuaternionFRC9CRelAngle = .text:0x803111D8; // type:function size:0x38 scope:global
1361613616
YRotation__11CQuaternionFRC9CRelAngle = .text:0x80311210; // type:function size:0x38 scope:global
1361713617
XRotation__11CQuaternionFRC9CRelAngle = .text:0x80311248; // type:function size:0x38 scope:global

config/GM8E01_48/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13611,7 +13611,7 @@ __apl__13CNUQuaternionFRC13CNUQuaternion = .text:0x80311000; // type:function si
1361113611
__ml__13CNUQuaternionCFRC13CNUQuaternion = .text:0x80311044; // type:function size:0x118
1361213612
__ct__13CNUQuaternionFffff = .text:0x8031115C; // type:function size:0x14
1361313613
__ct__13CNUQuaternionFfRC9CVector3f = .text:0x80311170; // type:function size:0x20
13614-
ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle = .text:0x80311190; // type:function size:0xD8
13614+
ClampedRotateTo__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle = .text:0x80311190; // type:function size:0xD8
1361513615
ZRotation__11CQuaternionFRC9CRelAngle = .text:0x80311268; // type:function size:0x38
1361613616
YRotation__11CQuaternionFRC9CRelAngle = .text:0x803112A0; // type:function size:0x38
1361713617
XRotation__11CQuaternionFRC9CRelAngle = .text:0x803112D8; // type:function size:0x38

include/MetroidPrime/CActor.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ class CActor : public CEntity {
207207

208208
const CAABox& GetRenderBoundsCached() const { return x9c_renderBounds; }
209209
void SetRenderBounds(const CAABox& bounds) { x9c_renderBounds = bounds; }
210-
void SetAddedToken(unsigned int token) const { const_cast< CActor* >(this)->xcc_addedToken = token; }
210+
void SetAddedToken(unsigned int token) const {
211+
const_cast< CActor* >(this)->xcc_addedToken = token;
212+
}
211213

212214
bool GetUseInSortedLists() const;
213215
void SetUseInSortedLists(bool use);

include/MetroidPrime/Cameras/CCameraOverrideInfo.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ class CCameraOverrideInfo {
99
friend class CScriptCameraHint;
1010

1111
public:
12-
CCameraOverrideInfo(uint overrideFlags, CBallCamera::EBallCameraBehaviour behaviour, float minDist,
13-
float maxDist, float backwardsDist, const CVector3f& lookAtOffset,
14-
const CVector3f& chaseLookAtOffset, const CVector3f& ballToCam, float fov,
15-
float attitudeRange, float azimuthRange, float anglePerSecond, float clampVelRange,
16-
float clampRotRange, float elevation, float interpolateTime, float clampVelTime,
17-
float controlInterpDur);
12+
CCameraOverrideInfo(uint overrideFlags, CBallCamera::EBallCameraBehaviour behaviour,
13+
float minDist, float maxDist, float backwardsDist,
14+
const CVector3f& lookAtOffset, const CVector3f& chaseLookAtOffset,
15+
const CVector3f& ballToCam, float fov, float attitudeRange,
16+
float azimuthRange, float anglePerSecond, float clampVelRange,
17+
float clampRotRange, float elevation, float interpolateTime,
18+
float clampVelTime, float controlInterpDur);
1819
virtual ~CCameraOverrideInfo() {}
1920

2021
uint GetOverrideFlags() const { return mOverrideFlags; }

0 commit comments

Comments
 (0)