Skip to content

Small improvements to several actor classes #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luminyx1 merged 4 commits into from
Oct 24, 2026
Merged

Small improvements to several actor classes #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84471c8
Small improvements to several actor classes
Ryguy0777 Oct 23, 2026
6951789
enemy/BrosBase.h: rename vf58C to getCreateWeaponPos
Ryguy0777 Oct 23, 2026
35e54d6
actor/Actor.h: const getter for mPosDelta
Ryguy0777 Oct 24, 2026
835755c
enemy/BrosBase.h: use better name for vf58C
Ryguy0777 Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions actor/Actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,11 @@ class Actor : public ActorBase
return mAngle;
}

const sead::Vector2f& getPosDelta() const
{
return mPosDelta;
}

ActorKind getKind() const
{
return ActorKind(mActorKind);
Expand Down
3 changes: 3 additions & 0 deletions collision/ActorBgCollisionCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,9 @@ class ActorBgCollisionCheck
// Address: 0x0218E2B8
Angle getWallAngle(DirType dir);

// Address: 0x0218E48C
bool checkBombBreak(const sead::Vector2f& top_left, const sead::Vector2f& bottom_right);
Comment thread
Luminyx1 marked this conversation as resolved.
Resolved

BasicBgCollisionCheck& getBgCheck()
{
return mBgCheck;
Expand Down
5 changes: 4 additions & 1 deletion enemy/BrosBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class BrosBase : public Enemy

public:
// Address: Deleted
virtual void vf58C();
virtual sead::Vector3f getWristPos();

virtual f32 getCreateWeaponFrm() const
{
Expand Down Expand Up @@ -248,6 +248,9 @@ class BrosBase : public Enemy
// Address: 0x022DBEEC
bool calcTurnAngle();

// Address: 0x022DA2EC
void initModel();

protected:
JointBlendModel* mBlendModel;
sead::Matrixf mBone6Transform;
Expand Down
11 changes: 9 additions & 2 deletions map_obj/ChibiYoshiBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ class ChibiYoshiBase : public ActorCollision
// Address: 0x027317BC
void setCannonJump(const sead::Vector3f& pos, const sead::Vector2f& speed, s32 jump_time);

public:
u32 _17a0[(0x1A78 - 0x17A0) / sizeof(u32)];
s8 getCarryPlayerNo() const
{
return mCarryPlayerNo;
}

private:
u32 _17a0[(0x18B0 - 0x17A0) / sizeof(u32)];
s8 mCarryPlayerNo;
u32 _18b4[(0x1A78 - 0x18B4) / sizeof(u32)];
u32 _1a78;
u32 _1a7c[(0x1F48 - 0x1A7C) / sizeof(u32)];
};
Expand Down
Loading