Skip to content

Commit fbc1df5

Browse files
aboood40091Luminyx1
authored andcommitted
player/PlayerObject: Add PlayerObjectByYoshi functions
1 parent bbb9bd2 commit fbc1df5

1 file changed

Lines changed: 79 additions & 8 deletions

File tree

player/PlayerObject.h

Lines changed: 79 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
273273
// Address: 0x02925C70
274274
bool bouncePlayerSpin(f32 speed_y, f32 speed_F);
275275

276+
// Address: 0x02925EFC
277+
bool isEnableZoom();
278+
276279
// ------------------------------------ PlayerObjectBalloon.cpp ------------------------------------ //
277280

278281
// StateID_Balloon Address: 0x1022B18C
@@ -395,22 +398,61 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
395398
// Address: 0x02929B4C
396399
f32 getTarzanRopeBcOffsetY();
397400

398-
// ------------------------------------ PlayerObjectCYoshi.cpp ------------------------------------ //
401+
// ------------------------------------ PlayerObjectByYoshi.cpp ------------------------------------ //
399402

403+
// StateID_Cloud2 Address: 0x1022B5D8
404+
// initializeState_Cloud2 Address: 0x02929D24
405+
// executeState_Cloud2 Address: 0x02929E8C
406+
// finalizeState_Cloud2 Address: 0x0292A154
407+
DECLARE_STATE_VIRTUAL_ID_OVERRIDE(PlayerObject, Cloud2) // Unused, but functions almost exactly the same as Cloud
400408
// StateID_BalloonChibiYoshiFly Address: 0x1022B24C
401409
// initializeState_BalloonChibiYoshiFly Address: 0x0292A2E4
402410
// executeState_BalloonChibiYoshiFly Address: 0x0292A474
403411
// finalizeState_BalloonChibiYoshiFly Address: 0x0292A8F8
404412
DECLARE_STATE_ID(PlayerObject, BalloonChibiYoshiFly)
405413

414+
// Address: 0x02929D28
415+
void setCloud2StateMove();
416+
// Address: 0x02929D6C
417+
void setCloud2StateFireCreate();
418+
// Address: 0x02929DF4
419+
bool checkCloud2StateCrouch();
420+
421+
// Address: 0x0292A95C
422+
bool setBalloonChibiYoshiFly();
406423
// Address: 0x0292AB0C
407424
bool setBalloonChibiYoshiFlySmall(f32 speed_y, f32 speed_F);
408425

426+
// Address: 0x0292A1BC
427+
void setBalloonChibiYoshiFlyAnm(s32 anm_id, f32 blend_duration);
428+
429+
// Address: 0x0292A468
430+
bool isEnableBalloonChibiYoshiFlySpin();
431+
432+
// Address: 0x0292AC44
433+
void updateBalloonChibiYoshiFly();
434+
435+
// Address: 0x0292AD84
436+
void setPlayerHangChild(PlayerObject* player);
437+
// Address: 0x0292AE70
438+
void releasePlayerHangChild();
439+
// Address: 0x0292AE7C
440+
bool isPlayerHangChild();
441+
409442
// Address: 0x0292AEE4
410-
bool setChibiYoshiBubbleSpin();
443+
bool setBubbleChibiYoshiShake();
411444

412-
// Address: 0x02925EFC
413-
bool isEnableZoom();
445+
// Address: 0x0292AE8C
446+
void setBubbleChibiYoshiShakeAnm(f32 blend_duration);
447+
448+
// Address: 0x0292AF2C
449+
void updateBubbleChibiYoshiShake();
450+
451+
// Address: 0x0292B1AC
452+
bool setLightChibiYoshiShake();
453+
454+
// Address: 0x0292B294
455+
void setChibiYoshiSpeed(f32 speed_y, f32 speed_F);
414456

415457
// ------------------------------------ PlayerObjectCc.cpp ------------------------------------ //
416458

@@ -461,6 +503,12 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
461503

462504
// ------------------------------------ PlayerObjectFire.cpp ------------------------------------ //
463505

506+
// Address: 0x0293AD58
507+
void createFireBall(bool spin = false);
508+
509+
// Address: 0x0293B018
510+
bool checkSetFireBall();
511+
464512
// Address: 0x0293B3E4
465513
bool setFireBallAction();
466514

@@ -528,6 +576,18 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
528576

529577
// ------------------------------------ PlayerObjectThrow.cpp ------------------------------------ //
530578

579+
// Address: 0x02953314
580+
bool checkEnableThrow();
581+
// Address: 0x029533D4
582+
bool checkCarryThrow(bool throw_hard = false);
583+
// Address: 0x02952F20
584+
void setThrowActor(bool throw_hard = false);
585+
586+
// Address: 0x02952C2C
587+
void initializeThrowCommonBase();
588+
// Address: 0x02953218
589+
void finalizeThrowCommonBase();
590+
531591
// Address: 0x02953494
532592
bool setThrowPlayer();
533593

@@ -587,6 +647,11 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
587647
// executeState_Fall Address: 0x0293FE7C
588648
// finalizeState_Fall Address: 0x0293FF8C
589649
DECLARE_STATE_VIRTUAL_ID_OVERRIDE(PlayerObject, Fall)
650+
// StateID_Land Address: 0x1022B4B8
651+
// initializeState_Land Address: 0x0293FFE8
652+
// executeState_Land Address: 0x02940068
653+
// finalizeState_Land Address: 0x029401C0
654+
DECLARE_STATE_VIRTUAL_ID_OVERRIDE(PlayerObject, Land)
590655
// StateID_SitJump Address: 0x1022B500
591656
// initializeState_SitJump Address: 0x029401E8
592657
// executeState_SitJump Address: 0x02940310
@@ -604,6 +669,9 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
604669
// finalizeState_SpinJump Address: 0x0294AB78
605670
DECLARE_STATE_ID(PlayerObject, SpinJump)
606671

672+
// Address: 0x0294AC64
673+
bool isEnableSpinAction();
674+
607675
// Address: 0x0294AD14
608676
u16 makeSpinJumpParam(s32 type, JumpSe jump_se_type);
609677

@@ -762,11 +830,14 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
762830
// Address: 0x0293D5DC
763831
void updateMusaEffect();
764832

765-
// ------------------------------------ PlayerObjectHang.cpp ------------------------------------ //
833+
// ------------------------------------ PlayerObjectHangPlayer.cpp ------------------------------------ //
766834

767835
// Address: 0x0293DF70
768836
virtual bool isPlayerHang(PlayerObject* player_obj_parent);
769837

838+
// Address: 0x0293E1A4
839+
void setPlayerHangChildAnm(s32 anm_id, f32 blend_duration);
840+
770841
// ------------------------------------ PlayerObjectFukidashi.cpp ------------------------------------ //
771842

772843
// Address: 0x0293D6AC
@@ -1030,12 +1101,12 @@ class PlayerObject : public PlayerBase // vtbl Address: 0x1016C150
10301101
u32 _2a5c;
10311102
s32 mLiftUpCounter;
10321103
f32 mLiftUpOffsetScale;
1033-
u8 _2a68;
1104+
bool mThrowHard;
10341105
s32 _2a6c;
1035-
s32 _2a70;
1106+
s32 mBalloonChibiYoshiFlyAscendGravityTimer;
10361107
u32 _2a74;
10371108
s32 _2a78;
1038-
u8 _2a7c;
1109+
bool mIsBubbleChibiYoshiShake;
10391110
u32 _2a80;
10401111
u32 _2a84;
10411112
s32 mBalloonHelpVoiceTimer;

0 commit comments

Comments
 (0)