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

Almost match CTweakPlayer 

Former-commit-id: 4999dff1f2
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-14 13:41:25 +03:00
parent 4a5fe82469
commit 33bf3ac9af
3 changed files with 216 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/MetroidPrime/Tweaks/CTweakPlayer.s
View File

@ -3,8 +3,8 @@
.section .data .section .data
.balign 8 .balign 8
.global lbl_803D9CB8 .global __vt__12CTweakPlayer
lbl_803D9CB8: __vt__12CTweakPlayer:
# ROM: 0x3D6CB8 # ROM: 0x3D6CB8
.4byte 0 .4byte 0
.4byte 0 .4byte 0
@ -49,9 +49,9 @@ __ct__12CTweakPlayerFR12CInputStream:
/* 80034E04 00031D64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80034E04 00031D64 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80034E08 00031D68 7C 08 02 A6 */ mflr r0 /* 80034E08 00031D68 7C 08 02 A6 */ mflr r0
/* 80034E0C 00031D6C 3C C0 80 3E */ lis r6, __vt__12ITweakObject@ha /* 80034E0C 00031D6C 3C C0 80 3E */ lis r6, __vt__12ITweakObject@ha
/* 80034E10 00031D70 3C A0 80 3E */ lis r5, lbl_803D9CB8@ha /* 80034E10 00031D70 3C A0 80 3E */ lis r5, __vt__12CTweakPlayer@ha
/* 80034E14 00031D74 90 01 00 24 */ stw r0, 0x24(r1) /* 80034E14 00031D74 90 01 00 24 */ stw r0, 0x24(r1)
/* 80034E18 00031D78 38 05 9C B8 */ addi r0, r5, lbl_803D9CB8@l /* 80034E18 00031D78 38 05 9C B8 */ addi r0, r5, __vt__12CTweakPlayer@l
/* 80034E1C 00031D7C C0 02 83 F8 */ lfs f0, lbl_805AA118@sda21(r2) /* 80034E1C 00031D7C C0 02 83 F8 */ lfs f0, lbl_805AA118@sda21(r2)
/* 80034E20 00031D80 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80034E20 00031D80 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80034E24 00031D84 7C 9F 23 78 */ mr r31, r4 /* 80034E24 00031D84 7C 9F 23 78 */ mr r31, r4
@ -757,8 +757,8 @@ __dt__12CTweakPlayerFv:
/* 800358E8 00032848 93 E1 00 0C */ stw r31, 0xc(r1) /* 800358E8 00032848 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800358EC 0003284C 7C 7F 1B 79 */ or. r31, r3, r3 /* 800358EC 0003284C 7C 7F 1B 79 */ or. r31, r3, r3
/* 800358F0 00032850 41 82 00 30 */ beq lbl_80035920 /* 800358F0 00032850 41 82 00 30 */ beq lbl_80035920
/* 800358F4 00032854 3C 60 80 3E */ lis r3, lbl_803D9CB8@ha /* 800358F4 00032854 3C 60 80 3E */ lis r3, __vt__12CTweakPlayer@ha
/* 800358F8 00032858 38 03 9C B8 */ addi r0, r3, lbl_803D9CB8@l /* 800358F8 00032858 38 03 9C B8 */ addi r0, r3, __vt__12CTweakPlayer@l
/* 800358FC 0003285C 90 1F 00 00 */ stw r0, 0(r31) /* 800358FC 0003285C 90 1F 00 00 */ stw r0, 0(r31)
/* 80035900 00032860 41 82 00 10 */ beq lbl_80035910 /* 80035900 00032860 41 82 00 10 */ beq lbl_80035910
/* 80035904 00032864 3C 60 80 3E */ lis r3, __vt__12ITweakObject@ha /* 80035904 00032864 3C 60 80 3E */ lis r3, __vt__12ITweakObject@ha

8
include/MetroidPrime/Tweaks/CTweakPlayer.hpp
View File

@ -5,10 +5,16 @@
#include "MetroidPrime/Tweaks/ITweakObject.hpp" #include "MetroidPrime/Tweaks/ITweakObject.hpp"
#include "Kyoto/TOneStatic.hpp"
#include "rstl/string.hpp" #include "rstl/string.hpp"
class CTweakPlayer : public ITweakObject { class CInputStream;
class CTweakPlayer;
class CTweakPlayer : public ITweakObject, public TOneStatic< CTweakPlayer > {
public: public:
CTweakPlayer(CInputStream&);
~CTweakPlayer() override; ~CTweakPlayer() override;
// TODO CPlayer::ESurfaceRestraints // TODO CPlayer::ESurfaceRestraints

203
src/MetroidPrime/Tweaks/CTweakPlayer.cpp Normal file
View File

@ -0,0 +1,203 @@
#include "MetroidPrime/Tweaks/CTweakPlayer.hpp"
#include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Streams/CInputStream.hpp"
CTweakPlayer::~CTweakPlayer() {}
CTweakPlayer::CTweakPlayer(CInputStream& in)
: x2d8_grappleBeamSpeed(0.0)
, x2dc_grappleBeamXWaveAmplitude(0.0)
, x2e0_grappleBeamZWaveAmplitude(0.0)
, x2e4_grappleBeamAnglePhaseDelta(0.0) {
for (int i = 0; i < 8; ++i) {
x4_maxTranslationalAcceleration[i] = in.ReadFloat();
}
for (int i = 0; i < 8; ++i) {
x24_maxRotationalAcceleration[i] = in.ReadFloat();
}
for (int i = 0; i < 8; ++i) {
x44_translationFriction[i] = in.ReadFloat();
}
for (int i = 0; i < 8; ++i) {
x64_rotationFriction[i] = in.ReadFloat();
}
for (int i = 0; i < 8; ++i) {
x84_rotationMaxSpeed[i] = in.ReadFloat();
}
for (int i = 0; i < 8; ++i) {
xa4_translationMaxSpeed[i] = in.ReadFloat();
}
xc4_normalGravAccel = in.ReadFloat();
xc8_fluidGravAccel = in.ReadFloat();
xcc_verticalJumpAccel = in.ReadFloat();
xd0_horizontalJumpAccel = in.ReadFloat();
xd4_verticalDoubleJumpAccel = in.ReadFloat();
xd8_horizontalDoubleJumpAccel = in.ReadFloat();
xdc_waterJumpFactor = in.ReadFloat();
xe0_waterBallJumpFactor = in.ReadFloat();
xe4_lavaJumpFactor = in.ReadFloat();
xe8_lavaBallJumpFactor = in.ReadFloat();
xec_phazonJumpFactor = in.ReadFloat();
xf0_phazonBallJumpFactor = in.ReadFloat();
xf4_allowedJumpTime = in.ReadFloat();
xf8_allowedDoubleJumpTime = in.ReadFloat();
xfc_minDoubleJumpWindow = in.ReadFloat();
x100_maxDoubleJumpWindow = in.ReadFloat();
x104_ = in.ReadFloat();
x108_minJumpTime = in.ReadFloat();
x10c_minDoubleJumpTime = in.ReadFloat();
x110_allowedLedgeTime = in.ReadFloat();
x114_doubleJumpImpulse = in.ReadFloat();
x118_backwardsForceMultiplier = in.ReadFloat();
x11c_bombJumpRadius = in.ReadFloat();
x120_bombJumpHeight = in.ReadFloat();
x124_eyeOffset = in.ReadFloat();
x128_turnSpeedMultiplier = in.ReadFloat();
x12c_freeLookTurnSpeedMultiplier = in.ReadFloat();
x130_horizontalFreeLookAngleVel = in.ReadFloat() * (M_PIF / 180.f);
x134_verticalFreeLookAngleVel = in.ReadFloat() * (M_PIF / 180.f);
x138_freeLookSpeed = in.ReadFloat() * (M_PIF / 180.f);
x13c_freeLookSnapSpeed = in.ReadFloat() * (M_PIF / 180.f);
x140_ = in.ReadFloat() * (M_PIF / 180.f);
x144_freeLookCenteredThresholdAngle = in.ReadFloat() * (M_PIF / 180.f);
x148_freeLookCenteredTime = in.ReadFloat();
x14c_freeLookDampenFactor = in.ReadFloat();
x150_leftDiv = in.ReadFloat();
x154_rightDiv = in.ReadFloat();
x228_24_freelookTurnsPlayer = in.ReadBool();
x228_25_ = in.ReadBool();
x228_26_ = in.ReadBool();
x228_27_moveDuringFreeLook = in.ReadBool();
x228_28_holdButtonsForFreeLook = in.ReadBool();
x228_29_twoButtonsForFreeLook = in.ReadBool();
x228_30_ = in.ReadBool();
x228_31_ = in.ReadBool();
x229_24_ = in.ReadBool();
x229_25_aimWhenOrbitingPoint = in.ReadBool();
x229_26_stayInFreeLookWhileFiring = in.ReadBool();
x229_27_ = in.ReadBool();
x229_28_ = in.ReadBool();
x229_29_orbitFixedOffset = in.ReadBool();
x229_30_gunButtonTogglesHolster = in.ReadBool();
x229_31_gunNotFiringHolstersGun = in.ReadBool();
x22a_24_fallingDoubleJump = in.ReadBool();
x22a_25_impulseDoubleJump = in.ReadBool();
x22a_26_firingCancelsCameraPitch = in.ReadBool();
x22a_27_assistedAimingIgnoreHorizontal = in.ReadBool();
x22a_28_assistedAimingIgnoreVertical = in.ReadBool();
x22c_ = in.ReadFloat();
x230_ = in.ReadFloat();
x234_aimMaxDistance = in.ReadFloat();
x238_ = in.ReadFloat() * (M_PIF / 180.f);
x23c_ = in.ReadFloat() * (M_PIF / 180.f);
x240_ = in.ReadFloat() * (M_PIF / 180.f);
x244_ = in.ReadFloat() * (M_PIF / 180.f);
x248_ = in.ReadFloat() * (M_PIF / 180.f);
x24c_aimThresholdDistance = in.ReadFloat();
x250_ = in.ReadFloat() * (M_PIF / 180.f);
x254_ = in.ReadFloat();
x258_aimBoxWidth = in.ReadFloat();
x25c_aimBoxHeight = in.ReadFloat();
x260_aimTargetTimer = in.ReadFloat();
x264_aimAssistHorizontalAngle = in.ReadFloat() * (M_PIF / 180.f);
x268_aimAssistVerticalAngle = in.ReadFloat() * (M_PIF / 180.f);
for (int i = 0; i < 3; ++i) {
x158_orbitMinDistance[i] = in.ReadFloat();
x164_orbitNormalDistance[i] = in.ReadFloat();
x170_orbitMaxDistance[i] = in.ReadFloat();
}
x17c_ = in.ReadFloat() * (M_PIF / 180.f);
x180_orbitModeTimer = in.ReadFloat();
x184_orbitCameraSpeed = in.ReadFloat() * (M_PIF / 180.f);
x188_orbitUpperAngle = in.ReadFloat() * (M_PIF / 180.f);
x18c_orbitLowerAngle = in.ReadFloat() * (M_PIF / 180.f);
x190_orbitHorizAngle = in.ReadFloat() * (M_PIF / 180.f);
x194_ = in.ReadFloat() * (M_PIF / 180.f);
x198_ = in.ReadFloat() * (M_PIF / 180.f);
x19c_orbitMaxTargetDistance = in.ReadFloat();
x1a0_orbitMaxLockDistance = in.ReadFloat();
x1a4_orbitDistanceThreshold = in.ReadFloat();
for (int i = 0; i < 2; ++i) {
x1a8_orbitScreenBoxHalfExtentX[i] = in.ReadLong();
x1b0_orbitScreenBoxHalfExtentY[i] = in.ReadLong();
x1b8_orbitScreenBoxCenterX[i] = in.ReadLong();
x1c0_orbitScreenBoxCenterY[i] = in.ReadLong();
x1c8_orbitZoneIdealX[i] = in.ReadLong();
x1d0_orbitZoneIdealY[i] = in.ReadLong();
}
x1d8_orbitNearX = in.ReadFloat();
x1dc_orbitNearZ = in.ReadFloat();
x1e0_ = in.ReadFloat();
x1e4_ = in.ReadFloat();
x1e8_orbitFixedOffsetZDiff = in.ReadFloat();
x1ec_orbitZRange = in.ReadFloat();
x1f0_ = in.ReadFloat() * (M_PIF / 180.f);
x1f4_ = in.ReadFloat() * (M_PIF / 180.f);
x1f8_ = in.ReadFloat();
x1fc_orbitPreventionTime = in.ReadFloat();
x200_24_dashEnabled = in.ReadBool();
x200_25_dashOnButtonRelease = in.ReadBool();
x204_dashButtonHoldCancelTime = in.ReadFloat();
x208_dashStrafeInputThreshold = in.ReadFloat();
x20c_sidewaysDoubleJumpImpulse = in.ReadFloat();
x210_sidewaysVerticalDoubleJumpAccel = in.ReadFloat();
x214_sidewaysHorizontalDoubleJumpAccel = in.ReadFloat();
x218_scanningRange = in.ReadFloat();
x21c_24_scanRetention = in.ReadBool();
x21c_25_scanFreezesGame = in.ReadBool();
x21c_26_orbitWhileScanning = in.ReadBool();
x220_scanMaxTargetDistance = in.ReadFloat();
x224_scanMaxLockDistance = in.ReadFloat();
x2a0_orbitDistanceMax = in.ReadFloat();
x2a4_grappleSwingLength = in.ReadFloat();
x2a8_grappleSwingPeriod = in.ReadFloat();
x2ac_grapplePullSpeedMin = in.ReadFloat();
x2b0_grappleCameraSpeed = in.ReadFloat() * (M_PIF / 180.f);
x2b4_maxGrappleLockedTurnAlignDistance = in.ReadFloat();
x2b8_grapplePullSpeedProportion = in.ReadFloat();
x2bc_grapplePullSpeedMax = in.ReadFloat();
x2c0_grappleLookCenterSpeed = in.ReadFloat() * (M_PIF / 180.f);
x2c4_maxGrappleTurnSpeed = in.ReadFloat();
x2c8_grappleJumpForce = in.ReadFloat();
x2cc_grappleReleaseTime = in.ReadFloat();
x2d0_grappleJumpMode = in.ReadLong();
x2d4_orbitReleaseBreaksGrapple = in.ReadBool();
x2d5_invertGrappleTurn = in.ReadBool();
x2d8_grappleBeamSpeed = in.ReadFloat();
x2dc_grappleBeamXWaveAmplitude = in.ReadFloat();
x2e0_grappleBeamZWaveAmplitude = in.ReadFloat();
x2e4_grappleBeamAnglePhaseDelta = in.ReadFloat();
x26c_playerHeight = in.ReadFloat();
x270_playerXYHalfExtent = in.ReadFloat();
x274_stepUpHeight = in.ReadFloat();
x278_stepDownHeight = in.ReadFloat();
x27c_playerBallHalfExtent = in.ReadFloat();
x280_firstPersonCameraSpeed = in.ReadFloat() * (M_PIF / 180.f);
x284_ = in.ReadFloat() * (M_PIF / 180.f);
x288_jumpCameraPitchDownStart = in.ReadFloat();
x28c_jumpCameraPitchDownFull = in.ReadFloat();
x290_jumpCameraPitchDownAngle = in.ReadFloat() * (M_PIF / 180.f);
x294_fallCameraPitchDownStart = in.ReadFloat();
x298_fallCameraPitchDownFull = in.ReadFloat();
x29c_fallCameraPitchDownAngle = in.ReadFloat() * (M_PIF / 180.f);
x2e8_ = in.ReadFloat();
x2ec_ = in.ReadFloat();
x2f0_ = in.ReadFloat();
x2f4_ = in.ReadBool();
x2f8_frozenTimeout = in.ReadFloat();
x2fc_iceBreakJumpCount = in.ReadLong();
x300_variaDamageReduction = in.ReadFloat();
x304_gravityDamageReduction = in.ReadFloat();
x308_phazonDamageReduction = in.ReadFloat();
}