Skip to content

Commit ba4ea76

Browse files
authored
d_a_obj_gra2 work (#2482)
* Tiny start on d_a_obj_gra2 * Initial work * Solid work done * More work * work on some rolling functions and deme camera * Almost all functions worked on * All functions worked on * Fixed some BaseNpc functions I broke * PR Cleanup * PR cleanup part 2
1 parent bb008ca commit ba4ea76

File tree

9 files changed

+4870
-3688
lines changed

9 files changed

+4870
-3688
lines changed

include/JSystem/JParticle/JPAEmitter.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ class JPABaseEmitter {
210210
JPAEmitterCallBack* getEmitterCallBackPtr() const { return mpEmtrCallBack; }
211211
u32 getAge() const { return mTick; }
212212

213+
void setVolumeMiniRadius(f32 param_1) {
214+
mVolumeMinRad = param_1;
215+
}
216+
213217
public:
214218
/* 0x00 */ JGeometry::TVec3<f32> mLocalScl;
215219
/* 0x0C */ JGeometry::TVec3<f32> mLocalTrs;

include/d/actor/d_a_npc.h

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -790,23 +790,27 @@ class daBaseNpc_path_c {
790790
/* 8014D9BC */ int setPathInfo(u8, s8, s8);
791791
/* 8014DA48 */ void reverseDir();
792792
/* 8014DA64 */ s32 chkPnt(cXyz);
793-
/* 8014DAC4 */ void setNextPnt();
793+
/* 8014DAC4 */ BOOL setNextPnt();
794794
/* 8014DB04 */ u16 getIdx();
795795
/* 8014DB0C */ void setIdx(u16);
796796
/* 8014DB14 */ Vec getPntPos(u16);
797797
/* 801503FC */ virtual ~daBaseNpc_path_c() {}
798798

799799
static const int MAXNUMCONTROLPNT_e = 64;
800800

801-
private:
801+
public:
802802
/* 0x004 */ dPath* mPathInfo;
803803
/* 0x008 */ f32 field_0x8;
804804
/* 0x00C */ dPnt mCurvePnts[160];
805805
/* 0xA0C */ u8 field_0xa0c[0xA0E - 0xA0C];
806806
/* 0xA0E */ u16 mCurvePntNum;
807807
/* 0xA10 */ u16 mIdx;
808808
/* 0xA12 */ s8 mDirection;
809-
/* 0xA13 */ u8 field_0xa13[17];
809+
/* 0xA13 */ u8 field_0xa13;
810+
/* 0xA14 */ s16 field_0xa14;
811+
/* 0xA16 */ u8 field_0xa16[2];
812+
/* 0xA18 */ int field_0xa18;
813+
/* 0xA1C */ u8 field_0xa1c[8];
810814
};
811815

812816
class daBaseNpc_lookat_c {
@@ -834,9 +838,9 @@ class daBaseNpc_c : public fopAc_ac_c {
834838
/* 8014E6C8 */ daBaseNpc_c();
835839
/* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
836840
/* 8014EE80 */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
837-
/* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
841+
/* 8014EEE4 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
838842
/* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
839-
/* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
843+
/* 8014EF64 */ int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
840844
/* 8014EFF4 */ void orderEvent(int, char*);
841845
/* 8014F0A0 */ void setEnvTevColor();
842846
/* 8014F0FC */ void setRoomNo();
@@ -863,9 +867,11 @@ class daBaseNpc_c : public fopAc_ac_c {
863867
static dCcD_SrcCyl mCcDCyl;
864868
static dCcD_SrcSph mCcDSph;
865869

866-
private:
870+
public:
867871
/* 0x56C */ dBgS_ObjAcch mAcch;
868-
/* 0x744 */ u8 field_0x744[0x754 - 0x744];
872+
/* 0x744 */ char field_0x744;
873+
/* 0x745 */ u8 field_0x745[0x74c - 0x745];
874+
/* 0x74C */ request_of_phase_process_class mPhase;
869875
/* 0x754 */ mDoExt_McaMorfSO* mpModelMorf;
870876
/* 0x758 */ Z2Creature mSound;
871877
/* 0x7E8 */ u32 mShadowId;
@@ -876,7 +882,8 @@ class daBaseNpc_c : public fopAc_ac_c {
876882
/* 0x83C */ u16* field_0x83c;
877883
/* 0x840 */ u16 field_0x840;
878884
/* 0x842 */ u16 field_0x842;
879-
/* 0x844 */ u8 field_0x844[0x848 - 0x844];
885+
/* 0x844 */ bool field_0x844;
886+
/* 0x845 */ u8 field_0x845[0x848 - 0x845];
880887
/* 0x848 */ s32 field_0x848;
881888
/* 0x84C */ dMsgFlow_c mMsgFlow;
882889
/* 0x898 */ u8 field_0x898[0x89A - 0x898];
@@ -918,7 +925,7 @@ class daBaseNpc_moveBgActor_c : public daBaseNpc_c {
918925
static int m_dzb_id;
919926
static MoveBGActor_SetFunc m_set_func;
920927

921-
private:
928+
public:
922929
/* 0xA14 */ dBgW* mpBgw;
923930
/* 0xA18 */ Mtx mBgMtx;
924931
};

0 commit comments

Comments
 (0)