From ed1df7c7ab7267ce8b1fb1fb658d0172995c85b9 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Tue, 16 Sep 2025 21:23:41 -0400 Subject: [PATCH] address comments removed from earlier headers --- include/d/a/d_a_base.h | 136 ++++++++++++++++++++--------------------- include/f/f_base.h | 105 ++++++++++++++++--------------- 2 files changed, 120 insertions(+), 121 deletions(-) diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h index 6d97e217..df04f53c 100644 --- a/include/d/a/d_a_base.h +++ b/include/d/a/d_a_base.h @@ -181,101 +181,101 @@ public: } public: - // funcs found in TU - /* 8002c650 */ static void setTempCreateParams( + static void setTempCreateParams( mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, s32 roomId, u32 params2, dAcBase_c *parent, u8 subtype, u16 unkFlag, s8 viewClipIdx, const ActorInfo *actorInfo ); - /* 8002c690 */ dSoundSourceIf_c *createSoundSource(); - /* 8002c710 */ int initAllocatorWork1Heap(int size, char *name, int align); - /* 8002c720 */ int initAllocator(int size, char *name, EGG::Heap *heap, int align); - /* 8002c7b0 */ bool addActorToRoom(s32 roomId); - /* 8002c840 */ void setTgSndAreaFlag(s32); - /* 8002cf10 */ u32 itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype); - /* 8002cf90 */ void fillUpperParams2Byte(); - /* 8002cfa0 */ u32 getParams2_ignoreLower(); - /* 8002cfb0 */ void setParams2Upper_ignoreLower(u32 val); - /* 8002cfc0 */ int getParams2UpperByte(); - /* 8002cfd0 */ void setParams2UpperByte(u32 val); - /* 8002cff0 */ static u32 buildParams2(u32 lower, u32 upper); - /* 8002d010 */ u32 getParams2Lower() const; - /* 8002d020 */ static dAcBase_c *findActor(char *objName, dAcBase_c *parent); - /* 8002d0a0 */ static dAcBase_c *searchActor(dAcBase_c *parent); + dSoundSourceIf_c *createSoundSource(); + int initAllocatorWork1Heap(int size, char *name, int align); + int initAllocator(int size, char *name, EGG::Heap *heap, int align); + bool addActorToRoom(s32 roomId); + void setTgSndAreaFlag(s32); + u32 itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype); + void fillUpperParams2Byte(); + u32 getParams2_ignoreLower(); + void setParams2Upper_ignoreLower(u32 val); + int getParams2UpperByte(); + void setParams2UpperByte(u32 val); + static u32 buildParams2(u32 lower, u32 upper); + u32 getParams2Lower() const; + static dAcBase_c *findActor(char *objName, dAcBase_c *parent); + static dAcBase_c *searchActor(dAcBase_c *parent); // Kinda performs the code of the first param on every actor (second param is optional parent) - /* 8002d130 */ static void forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *parent); - /* 8002d190 */ mAng getXZAngleToPlayer(); + static void forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *parent); + mAng getXZAngleToPlayer(); // returns true if under the distThresh, False if not. the actual distance is returned in outDist - /* 8002d1d0 */ bool getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist); + bool getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist); // same concept as above - /* 8002d290 */ bool getDistanceAndAngleToActor( + bool getDistanceAndAngleToActor( dAcBase_c *actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX ); - /* 8002d3e0 */ bool isWithinPlayerRadius(f32 radius) const; - /* 8002d440 */ bool getDistanceAndAngleToPlayer( + bool isWithinPlayerRadius(f32 radius) const; + bool getDistanceAndAngleToPlayer( f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX ); - /* 8002d470 */ f32 getDistToPlayer(); - /* 8002d4a0 */ f32 getSquareDistToPlayer(); - /* 8002d4b0 */ void updateRoomId(f32 yOffs); - /* 8002d540 */ bool isRoomFlags_0x6_Set(); + f32 getDistToPlayer(); + f32 getSquareDistToPlayer(); + void updateRoomId(f32 yOffs); + bool isRoomFlags_0x6_Set(); // Start of SoundSource stuff - /* 8002d590 */ void setSoundSourceSubtype(u8 subType); - /* 8002d5b0 */ void FUN_8002d5b0(); - /* 8002d5d0 */ bool startSound(u32 soundId); - /* 8002d600 */ bool startSoundWithFloatParam(u32 soundId, f32 param); - /* 8002d630 */ bool startBgHitSound(u32 soundId, const cBgS_PolyInfo &info, const mVec3_c *position); - /* 8002d6d0 */ bool startSoundAtPosition(u32 soundId, const mVec3_c *position); - /* 8002d710 */ bool holdSound(u32 soundId); - /* 8002d740 */ bool holdSoundWithIntParam(u32 soundId, s32 param); - /* 8002d770 */ bool holdSoundWithFloatParam(u32 soundId, f32 param); - /* 8002d7a0 */ bool holdSoundWithParams(u32 soundId, f32 fValue, s32 value); - /* 8002d7d0 */ void holdSoundSourceFlag(u32 mask); - /* 8002d7f0 */ void onSoundSourceFlag(u32 mask); - /* 8002d810 */ void offSoundSourceFlag(u32 mask); - /* 8002d830 */ bool isPlayingSound(u32 soundId); - /* 8002d860 */ void setBattleBgmRelated(UNKWORD val); - /* 8002d880 */ dSoundSourceIf_c *getSoundSource(); + void setSoundSourceSubtype(u8 subType); + void FUN_8002d5b0(); + bool startSound(u32 soundId); + bool startSoundWithFloatParam(u32 soundId, f32 param); + bool startBgHitSound(u32 soundId, const cBgS_PolyInfo &info, const mVec3_c *position); + bool startSoundAtPosition(u32 soundId, const mVec3_c *position); + bool holdSound(u32 soundId); + bool holdSoundWithIntParam(u32 soundId, s32 param); + bool holdSoundWithFloatParam(u32 soundId, f32 param); + bool holdSoundWithParams(u32 soundId, f32 fValue, s32 value); + void holdSoundSourceFlag(u32 mask); + void onSoundSourceFlag(u32 mask); + void offSoundSourceFlag(u32 mask); + bool isPlayingSound(u32 soundId); + void setBattleBgmRelated(UNKWORD val); + dSoundSourceIf_c *getSoundSource(); // End of SoundSource stuff - /* 8002d890 */ void removeSoundInfo(SoundInfo *); - /* 8002d920 */ void setActorRef(dAcBase_c *); + void removeSoundInfo(SoundInfo *); + void setActorRef(dAcBase_c *); + // next three funcs are related - /* 8002d930 */ void setEnemyDefeatFlag(); - /* 8002d940 */ void changeLoadedEntitiesWithSet(); - /* 8002d960 */ void changeLoadedEntitiesNoSet(); + void setEnemyDefeatFlag(); + void changeLoadedEntitiesWithSet(); + void changeLoadedEntitiesNoSet(); - /* 8002d980 */ dAcBase_c *createActor( + dAcBase_c *createActor( ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId, dBase_c *ref ); - /* 8002da80 */ dAcBase_c *createActorStage( + dAcBase_c *createActorStage( ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId, dBase_c *ref ); - /* 8002dc20 */ static void roundAngleToNearest90(s16 *, s16 *); - /* 8002dc50 */ void incrementKillCounter(); - /* 8002dcd0 */ void killNoItemDrop(); - /* 8002dd10 */ void killWithFlag(); - /* 8002dd50 */ void killWithFlagNoItemDrop(); - /* 8002dd90 */ void deleteWithFlagNoItemDrop(); - /* 8002ddd0 */ void setPolyAttrs(cBgS_PolyInfo &p); - /* 8002de30 */ void setPolyAttrsDupe(cBgS_PolyInfo &p); + static void roundAngleToNearest90(s16 *, s16 *); + void incrementKillCounter(); + void killNoItemDrop(); + void killWithFlag(); + void killWithFlagNoItemDrop(); + void deleteWithFlagNoItemDrop(); + void setPolyAttrs(cBgS_PolyInfo &p); + void setPolyAttrsDupe(cBgS_PolyInfo &p); public: - /* 80571920 */ static u32 s_Create_RoomId; - /* 80571924 */ static u32 s_Create_Params2; - /* 80571928 */ static u16 s_Create_UnkFlags; - /* 8057192A */ static u8 s_Create_ViewClipIdx; - /* 80575080 */ static mVec3_c *s_Create_Position; - /* 80575084 */ static mAng3_c *s_Create_Rotation; - /* 80575088 */ static mVec3_c *s_Create_Scale; - /* 8057508C */ static dAcBase_c *s_Create_Parent; - /* 80575090 */ static const ActorInfo *s_Create_ActorInfo; - /* 80575094 */ static u8 s_Create_Subtype; + static u32 s_Create_RoomId; + static u32 s_Create_Params2; + static u16 s_Create_UnkFlags; + static u8 s_Create_ViewClipIdx; + static mVec3_c *s_Create_Position; + static mAng3_c *s_Create_Rotation; + static mVec3_c *s_Create_Scale; + static dAcBase_c *s_Create_Parent; + static const ActorInfo *s_Create_ActorInfo; + static u8 s_Create_Subtype; }; #endif diff --git a/include/f/f_base.h b/include/f/f_base.h index 0bb218b9..9d5811ac 100644 --- a/include/f/f_base.h +++ b/include/f/f_base.h @@ -94,69 +94,68 @@ public: } public: - /* 802e12f0 */ fBase_c(); - /* 802e23b0 */ static void *operator new(size_t); - /* 802e2410 */ static void operator delete(void *); - -public: // vtable 0x60 - /* 0x08 | 802E15C0 */ virtual int create(); - /* 0x0C | 802E15D0 */ virtual int preCreate(); - /* 0x10 | 802E15E0 */ virtual void postCreate(MAIN_STATE_e state); - /* 0x14 | 802E1670 */ virtual int doDelete(); - /* 0x18 | 802E1730 */ virtual int preDelete(); - /* 0x1C | 802E17A0 */ virtual void postDelete(MAIN_STATE_e state); - /* 0x20 | 802E1910 */ virtual int execute(); - /* 0x24 | 802E1920 */ virtual int preExecute(); - /* 0x28 | 802E1950 */ virtual void postExecute(MAIN_STATE_e state); - /* 0x2C | 802E1A90 */ virtual int draw(); - /* 0x30 | 802E1AA0 */ virtual int preDraw(); - /* 0x34 | 802E1AD0 */ virtual void postDraw(MAIN_STATE_e state); - /* 0x38 | 802E1B90 */ virtual void deleteReady(); - /* 0x3C | 802E20E0 */ virtual bool entryFrmHeap(size_t size, EGG::Heap *parentHeap); - /* 0x40 | 802E22E0 */ virtual bool entryFrmHeapNonAdjust(size_t size, EGG::Heap *parentHeap); - /* 0x44 | 802E23A0 */ virtual bool createHeap(); - /* 0x48 | 802E1480 */ virtual ~fBase_c(); + fBase_c(); + static void *operator new(size_t); + static void operator delete(void *); public: - /* 802e1500 */ int - commonPack(int (fBase_c::*doFunc)(), int (fBase_c::*preFunc)(), void (fBase_c::*postFunc)(MAIN_STATE_e)); - /* 802e1680 */ int createPack(); - /* 802e1860 */ int deletePack(); - /* 802e1960 */ int executePack(); - /* 802e1ae0 */ int drawPack(); - /* 802e1ba0 */ int connectProc(); - /* 802e1e00 */ void deleteRequest(); - /* 802e1e80 */ void forceUpdate(); - /* 802e1f90 */ static fBase_c *getConnectRoot(); - /* 802e1f90 */ static fBase_c *getConnectTreeNext(fBase_c *); - /* 802e1f90 */ fBase_c *getConnectParent() const; - /* 802e1fb0 */ fBase_c *getConnectChild() const; - /* 802e1fd0 */ fBase_c *getConnectBrNext() const; - /* 802e1ff0 */ void updateExecutePriority(u16 priority); - /* 802e2090 */ bool setConnectChild(fBase_c *child); - /* 802e2420 */ void runCreate(); - /* 802e24a0 */ fBase_c *getChildProcessCreateState() const; - /* 802e2510 */ bool checkChildProcessCreateState() const; + /* vt 0x08 */ virtual int create(); + /* vt 0x0C */ virtual int preCreate(); + /* vt 0x10 */ virtual void postCreate(MAIN_STATE_e state); + /* vt 0x14 */ virtual int doDelete(); + /* vt 0x18 */ virtual int preDelete(); + /* vt 0x1C */ virtual void postDelete(MAIN_STATE_e state); + /* vt 0x20 */ virtual int execute(); + /* vt 0x24 */ virtual int preExecute(); + /* vt 0x28 */ virtual void postExecute(MAIN_STATE_e state); + /* vt 0x2C */ virtual int draw(); + /* vt 0x30 */ virtual int preDraw(); + /* vt 0x34 */ virtual void postDraw(MAIN_STATE_e state); + /* vt 0x38 */ virtual void deleteReady(); + /* vt 0x3C */ virtual bool entryFrmHeap(size_t size, EGG::Heap *parentHeap); + /* vt 0x40 */ virtual bool entryFrmHeapNonAdjust(size_t size, EGG::Heap *parentHeap); + /* vt 0x44 */ virtual bool createHeap(); + /* vt 0x48 */ virtual ~fBase_c(); public: - /* 802e2540 */ static void setTmpCtData(ProfileName profName, fTrNdBa_c *connectParent, u32 param, u8 groupType); - /* 802e2560 */ static fBase_c *fBase_make(ProfileName profName, fTrNdBa_c *connectParent, u32 param, u8 groupType); - /* 802e2640 */ static fBase_c *createRoot(ProfileName profName, u32 param, u8 groupType); - /* 802e2600 */ static fBase_c *createChild(ProfileName profName, fBase_c *parent, u32 param, u8 groupType); + int commonPack(int (fBase_c::*doFunc)(), int (fBase_c::*preFunc)(), void (fBase_c::*postFunc)(MAIN_STATE_e)); + int createPack(); + int deletePack(); + int executePack(); + int drawPack(); + int connectProc(); + void deleteRequest(); + void forceUpdate(); + static fBase_c *getConnectRoot(); + static fBase_c *getConnectTreeNext(fBase_c *); + fBase_c *getConnectParent() const; + fBase_c *getConnectChild() const; + fBase_c *getConnectBrNext() const; + void updateExecutePriority(u16 priority); + bool setConnectChild(fBase_c *child); + void runCreate(); + fBase_c *getChildProcessCreateState() const; + bool checkChildProcessCreateState() const; public: - /* 80575ba8 */ static fLiMgBa_c m_forceExecuteList; - /* 80575bb0 */ static int (*sLoadAsyncCallback)(); - /* 80575bb4 */ static void (*sUnloadCallback)(); + static void setTmpCtData(ProfileName profName, fTrNdBa_c *connectParent, u32 param, u8 groupType); + static fBase_c *fBase_make(ProfileName profName, fTrNdBa_c *connectParent, u32 param, u8 groupType); + static fBase_c *createRoot(ProfileName profName, u32 param, u8 groupType); + static fBase_c *createChild(ProfileName profName, fBase_c *parent, u32 param, u8 groupType); + +public: + static fLiMgBa_c m_forceExecuteList; + static int (*sLoadAsyncCallback)(); + static void (*sUnloadCallback)(); private: - /* 80573fb8 */ static fBaseID_e m_rootUniqueID; + static fBaseID_e m_rootUniqueID; struct ConstructData { - /* 805b84c8 */ ProfileName prof_name; - /* 805b84cc */ fTrNdBa_c *connect_parent; - /* 805b84d0 */ u32 params; - /* 805b84d4 */ u8 group_type; + ProfileName prof_name; + fTrNdBa_c *connect_parent; + u32 params; + u8 group_type; }; static ConstructData m_tmpCtData;