mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-01 09:32:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307 from elijah-thomas774/remly

Browse Source 
dAcEremly_c equivalent. Future Cleanup needed
This commit is contained in:
Elijah Thomas
2026-04-18 14:52:30 -04:00
committed by GitHub
parent 17176e3c83 9f4cf0c308
commit d3ce7281c6
14 changed files with 2988 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/e/d_a_e_remly.h
+192 -1
View File
@@ -1,14 +1,80 @@
#ifndef D_A_E_REMLY_H
#define D_A_E_REMLY_H
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/e/d_a_en_base.h"
#include "d/col/bg/d_bg_s_acch.h"
#include "d/col/cc/d_cc_d.h"
#include "d/d_shadow.h"
#include "m/m3d/m_anmtexpat.h"
#include "m/m3d/m_mdl.h"
#include "m/m_angle.h"
#include "m/m_vec.h"
#include "s/s_State.hpp"
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/d_emitter.h"
class dAcBomb_c;
class dAcNpcSkn2_c;
class dAcEremly_c : public dAcEnBase_c {
public:
class callback_c : public m3d::callback_c {
public:
virtual ~callback_c() {}
virtual void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override;
/* 0x04 */ mAng3_c mHeadRotation;
/* 0x0C */ UNKWORD field_0x0C; // Guess
};
enum State_e {
STATE_0 = 0,
STATE_1 = 1,
STATE_2 = 2,
STATE_3 = 3,
STATE_4 = 4,
STATE_5 = 5,
STATE_6 = 6,
STATE_7 = 7,
STATE_8 = 8,
STATE_9 = 9,
STATE_10 = 10,
STATE_11 = 11,
STATE_12 = 12,
STATE_13 = 13,
STATE_14 = 14,
STATE_15 = 15,
STATE_16 = 16,
STATE_17 = 17,
STATE_18 = 18,
STATE_19 = 19,
STATE_20 = 20,
STATE_21 = 21,
STATE_22 = 22,
STATE_23 = 23,
STATE_24 = 24,
STATE_25 = 25,
STATE_26 = 26,
STATE_27 = 27,
STATE_28 = 28,
STATE_29 = 29,
STATE_30 = 30,
STATE_31 = 31,
STATE_32 = 32,
};
public:
dAcEremly_c() : mStateMgr(*this) {}
virtual ~dAcEremly_c() {}
virtual int doDelete() override;
virtual int draw() override;
virtual bool createHeap() override;
virtual int actorCreate() override;
virtual int actorPostCreate() override;
virtual int actorExecute() override;
STATE_FUNC_DECLARE(dAcEremly_c, Wait);
STATE_FUNC_DECLARE(dAcEremly_c, Walk);
STATE_FUNC_DECLARE(dAcEremly_c, Run);
@@ -34,8 +100,133 @@ public:
STATE_FUNC_DECLARE(dAcEremly_c, NightJumpAttack);
STATE_FUNC_DECLARE(dAcEremly_c, BirthWait);
bool isState(State_e state) {
return field_0xB60 == (u32)state;
}
STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcEremly_c);
STATE_MGR_DEFINE_UTIL_ISSTATE(dAcEremly_c);
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dAcEremly_c);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcEremly_c);
void playWink();
bool fn_177_6B10(bool lookAtTarget, const mAng &);
void fn_177_6EA0(bool);
void adjustHeadRotation(bool);
bool fn_177_7040(u32, f32);
bool isScary();
bool shouldBeScared();
bool fn_177_7510(f32);
bool fn_177_75E0();
/** false -> comapres to camera
* true -> compares to player */
bool fn_177_7650(bool comparePlayer) const;
void fn_177_77C0();
// Set Scary Face
void fn_177_78D0();
void fn_177_79D0(bool);
bool fn_177_7B10();
void nightSleepDemoImpl();
void fn_177_8520(bool);
void fn_177_8600();
bool fn_177_86C0();
bool fn_177_8980(f32);
bool fn_177_8AC0();
bool fn_177_8C20(mAng);
bool fn_177_8F90();
bool fn_177_9370(f32);
private:
/* 0x378 */ STATE_MGR_DECLARE(dAcEremly_c);
/* 0x3B4 */ dShadowCircle_c mShadow;
/* 0x3BC */ d3d::AnmMdlWrapper mMdl;
/* 0x438 */ m3d::anmTexPat_c mTexPat;
/* 0x458 */ dBgS_AcchCir mAcchCir;
/* 0x3B4 */ dBgS_ObjAcch mAcch;
/* 0x864 */ dCcD_Sph mSph;
/* 0x9B4 */ callback_c mMdlCallback;
/* 0x9C4 */ dEmitter_c mEmitters[2];
/* 0xA2C */ dAcRef_c<dAcNpcSkn2_c> mRef1; // Temporary until type known
/* 0xA38 */ dAcRef_c<dAcBomb_c> mNearbyBombRef;
/* 0xA44 */ mVec3_c mTargetPosition;
/* 0xA50 */ mVec3_c field_0xA50;
/* 0xA5C */ dWaterEffect_c mWaterEffect;
/* 0xAA4 */ mVec3_c field_0xAA4;
/* 0xAB0 */ mVec3_c field_0xAB0;
/* 0xABC */ mVec3_c field_0xABC;
/* 0xAC8 */ mVec3_c field_0xAC8;
/* 0xAD4 */ mVec3_c field_0xAD4;
/* 0xAE0 */ mVec3_c field_0xAE0;
/* 0xAEC */ mVec3_c field_0xAEC;
/* 0xAF8 */ mVec3_c field_0xAF8;
/* 0xB04 */ f32 field_0xB04;
/* 0xB08 */ f32 field_0xB08;
/* 0xB0C */ f32 field_0xB0C;
/* 0xB10 */ f32 field_0xB10;
/* 0xB14 */ s32 field_0xB14;
/* 0xB18 */ u32 field_0xB18;
/* 0xB1C */ u8 _B1C[0xB1E - 0xB1C];
/* 0xB1E */ mAng3_c field_0xB1E;
/* 0xB24 */ s16 field_0xB24;
/* 0xB26 */ s16 field_0xB26;
/* 0xB26 */ u32 field_0xB28;
/* 0xB2C */ s32 field_0xB2C;
/* 0xB30 */ mAng field_0xB30;
/* 0xB32 */ mAng field_0xB32;
/* 0xB34 */ mAng field_0xB34;
/* 0xB38 */ f32 field_0xB38;
/* 0xB3C */ f32 field_0xB3C;
/* 0xB40 */ f32 field_0xB40;
/* 0xB44 */ u16 field_0xB44;
/* 0xB46 */ u16 field_0xB46;
/* 0xB48 */ u16 field_0xB48;
/* 0xB4A */ u16 mWinkTimer;
/* 0xB4C */ u16 field_0xB4C;
/* 0xB4E */ u16 field_0xB4E;
/* 0xB50 */ u16 field_0xB50;
/* 0xB52 */ u16 field_0xB52;
/* 0xB54 */ u16 field_0xB54;
/* 0xB56 */ u16 field_0xB56;
/* 0xB58 */ u16 field_0xB58;
/* 0xB5A */ u16 field_0xB5A;
/* 0xB5C */ u16 field_0xB5C;
/* 0xB5E */ u16 field_0xB5E;
/* 0xB60 */ u8 field_0xB60; // Some State representation
/* 0xB61 */ u8 field_0xB61;
/* 0xB62 */ u8 mSleepDemoPlayedSceneflag;
/* 0xB63 */ u8 field_0xB63;
/* 0xB64 */ u8 field_0xB64;
/* 0xB65 */ u8 field_0xB65;
/* 0xB66 */ u8 field_0xB66;
/* 0xB67 */ u8 field_0xB67;
/* 0xB68 */ u8 field_0xB68;
/* 0xB69 */ u8 field_0xB69;
/* 0xB6A */ u8 field_0xB6A;
/* 0xB6B */ u8 field_0xB6B;
/* 0xB6C */ u8 field_0xB6C;
/* 0xB6D */ u8 field_0xB6D;
/* 0xB6E */ u8 field_0xB6E;
/* 0xB6F */ u8 field_0xB6F;
};
#endif
include/d/a/e/d_a_en_base.h
+8 -3
View File
@@ -5,6 +5,7 @@
#include "d/a/obj/d_a_obj_base.h"
#include "d/a/obj/d_a_obj_bomb.h"
#include "d/d_cc.h"
#include "m/m3d/m_mdl.h"
#include "m/m_angle.h"
#include "m/m_vec.h"
@@ -22,6 +23,7 @@ public:
INTERACT_0x4 = (1 << 2),
INTERACT_0x40 = (1 << 6),
INTERACT_0x1000 = (1 << 12),
INTERACT_0x2000 = (1 << 13),
};
public:
@@ -68,13 +70,16 @@ public:
// Deals with dealing damage to Enemy
// Returns a value 0-13 (similar to mStts rank?)
int fn_8002fde0(cCcD_Obj &mCc, u16 *pTgOut);
int fn_8002FDE0(cCcD_Obj &mCc, u16 *pTgOut);
void fn_80030030(const mVec3_c &pos, s16 &, s16 &, f32);
// Returns 0-3 based on collision
// 2
int fn_800301b0(const mVec3_c &pos, mAng ang, bool, f32);
void fn_80030400(m3d::mdl_c &, u8, bool, u8);
void fn_800306d0();
void fn_80030700();
static void fn_80030980(m3d::mdl_c &, s32, bool markDirty);
void fn_80030c20(u32 flags, f32, f32, f32, f32);
s32 someEnemyDamageCollisionStuffMaybe(dColliderLinkedList &list, u16 *pOutFlags);
include/d/a/obj/d_a_obj_base.h
+13
View File
@@ -95,6 +95,15 @@ public:
mVec3_c &getOldPosition() {
return mOldPosition;
}
void setOldPosition(const mVec3_c &v) {
mOldPosition = v;
}
mVec3_c &getStartingPosition() {
return mStartingPos;
}
void setStartingPosition(const mVec3_c &v) {
mStartingPos = v;
}
mVec3_c &getVelocity() {
return mVelocity;
}
@@ -102,6 +111,10 @@ public:
return mAngle;
}
void setStartingRotation(const mAng3_c &v) {
mStartingRot = v;
}
f32 getVelocityMag() const {
return fabsf(nw4r::math::VEC3LenSq(mVelocity));
}
include/d/d_player_act.h
+7 -2
View File
@@ -1,6 +1,8 @@
#ifndef D_A_PLAYER_ACT_H
#define D_A_PLAYER_ACT_H
#include "d/a/d_a_base.h"
#include "d/a/obj/d_a_obj_bomb.h"
#include "d/d_player_base.h"
#include "m/m_vec.h"
@@ -93,7 +95,7 @@ public:
// unused; overridden by daPlayerModelBase_c
return mVec3_c::Zero;
}
/* vt 0x0EC */ virtual const mVec3_c &vt_0x0EC() const {
/* vt 0x0EC */ virtual const mVec3_c &getHeadTranslation() const {
// unused; overridden by daPlayerModelBase_c
return mVec3_c::Zero;
}
@@ -413,7 +415,7 @@ public:
/* vt 0x2A8 */ virtual void lookTowardItem() {}
/* vt 0x2AC */ virtual void vt_0x2AC() {}
/* vt 0x2B0 */ virtual void vt_0x2B0() {}
/* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, const mVec3_c *, const mAng&, u32, u32) {}
/* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, const mVec3_c *, const mAng &, u32, u32) {}
/* vt 0x2B8 */ virtual void setActorRef9() {}
/* vt 0x2BC */ virtual void unlinkActorRef9() {}
/* vt 0x2C0 */ virtual bool vt_0x2C0() {
@@ -654,6 +656,9 @@ public:
return sCurrentSword;
}
// Checks through beetle actor references and
static dAcBomb_c *getBombWithinRadius(dAcBase_c *, const mVec3_c &, f32);
static bool isInEvent();
bool isAttackingLeft() const;
bool isAttackingRight() const;
include/d/d_player_mdl.h
+1 -1
View File
@@ -824,7 +824,7 @@ public:
/* vt 0x0E8 */ virtual const mVec3_c &vt_0x0E8() const override {
return field_0x12F4;
}
/* vt 0x0EC */ virtual const mVec3_c &vt_0x0EC() const override {
/* vt 0x0EC */ virtual const mVec3_c &getHeadTranslation() const override {
return mHeadTranslation;
}
/* vt 0x0F0 */ virtual const mVec3_c &vt_0x0F0() const override {
include/d/t/d_t_stream.h
+3
View File
@@ -5,6 +5,7 @@
#include "f/f_list_mg.h"
#include "f/f_list_nd.h"
#include "m/m_mtx.h"
#include "m/m_vec.h"
class dTgStream_c : public dTg_c {
public:
@@ -21,6 +22,8 @@ public:
void addToList(fLiMgBa_c &list);
static bool getForce(const mVec3_c &position, mVec3_c &force, const fLiMgBa_c &list = sStreamList);
private:
/* 0x0FC */ u8 mSceneflag; ///< Sceneflag to indicate when to flow
/* 0x0FD */ u8 mAreaIdx;
include/m/m3d/m_anmmdl.h
+7
View File
@@ -60,6 +60,13 @@ public:
void setAnmFile(void *data) {
mAnmFile = nw4r::g3d::ResFile(data);
}
nw4r::g3d::ResFile getAnmFile() {
return mAnmFile;
}
nw4r::g3d::ResFile getMdlFile() {
return mMdlFile;
}
protected:
nw4r::g3d::ResFile mMdlFile;
include/m/m_angle.h
+11
View File
@@ -53,6 +53,11 @@ public:
return *this;
}
template <typename T>
bool operator==(const T other) {
return mVal == other;
}
public:
static s32 abs(const mAng b) {
return labs(b);
@@ -63,6 +68,12 @@ public:
s32 absDiff(const mAng &other) const {
return sLib::absDiff(mVal, other.mVal);
}
// NOTE: Try not to use this one...
// May need a better home in future.
template <typename T>
static s32 absDiff2(T a, T b) {
return abs(a - b);
}
f32 sin() const {
return nw4r::math::SinIdx(*this);
}
include/toBeSorted/d_emitter.h
+1 -1
View File
@@ -207,7 +207,7 @@ private:
}
public:
dWaterEffect_c() : mIsInWater(1), mIsSmall(false) {}
dWaterEffect_c() : mIsInWater(true), mIsSmall(false) {}
virtual ~dWaterEffect_c() {}
void init(dAcObjBase_c *, f32 height, f32 scale, f32 depth);
include/toBeSorted/event_manager.h
+3
View File
@@ -20,6 +20,9 @@ public:
static bool canSkipCurrentEvent();
static dAcBase_c *getMainActorInEvent();
static Event *getSkipOnlyEvent();
static bool fn_800A0B80();
static void fn_8009FA10(dAcBase_c *actor, Event *event, void *unknown);
static void execute();
static EventManager *sInstance;