mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-19 22:02:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_b_ob matched (#2155)

Browse Source 
* all b_ob functions matching, not linked

* oops forgot a couple funcs

* fix some small errors

* some morpheel doc

* remove asm
This commit is contained in:
TakaRikka
2024-05-18 18:13:21 -07:00
committed by GitHub
parent 35484fb2c7
commit fa325034fd
27 changed files with 8107 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAEmitter.h
+2
View File
@@ -83,6 +83,7 @@ enum {
JPAEmtrStts_FirstEmit = 0x10,
JPAEmtrStts_RateStepEmit = 0x20,
JPAEmtrStts_Immortal = 0x40,
JPAEmtrStts_Delete = 0x100,
};
/**
@@ -169,6 +170,7 @@ public:
void playCreateParticle() { clearStatus(JPAEmtrStts_StopEmit); }
void becomeImmortalEmitter() { setStatus(JPAEmtrStts_Immortal); }
void becomeContinuousParticle() { mMaxFrame = 0; }
void becomeDeleteEmitter() { setStatus(JPAEmtrStts_Delete); }
void becomeInvalidEmitter() {
stopCreateParticle();
mMaxFrame = 1;
include/f_op/f_op_actor_mng.h
+4
View File
@@ -656,6 +656,10 @@ inline s16 fopAcM_searchPlayerAngleY(const fopAc_ac_c* actor) {
return fopAcM_searchActorAngleY(actor, dComIfGp_getPlayer(0));
}
inline s16 fopAcM_searchPlayerAngleX(const fopAc_ac_c* actor) {
return fopAcM_searchActorAngleX(actor, dComIfGp_getPlayer(0));
}
inline f32 fopAcM_searchPlayerDistanceY(const fopAc_ac_c* actor) {
return fopAcM_searchActorDistanceY(actor, dComIfGp_getPlayer(0));
}
include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
+94 -79
View File
@@ -8,29 +8,56 @@
#include "d/cc/d_cc_d.h"
#include "d/cc/d_cc_uty.h"
struct ob_part_s {
/* 8061A658 */ ~ob_part_s();
/* 8061A72C */ ob_part_s();
enum b_ob_action {
// Phase 1
OB_ACTION_CORE_START,
OB_ACTION_CORE_HAND_MOVE,
OB_ACTION_BOMBFISH_SET,
OB_ACTION_CORE_HOOK,
OB_ACTION_CORE_CHANCE,
OB_ACTION_CORE_END,
/* 0x00 */ mDoExt_McaMorf* field_0x0;
/* 0x04 */ mDoExt_McaMorf* field_0x4;
/* 0x08 */ mDoExt_McaMorf* field_0x8;
/* 0x0C */ mDoExt_McaMorf* field_0xc;
/* 0x10 */ mDoExt_McaMorf* field_0x10;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ csXyz field_0x20;
// Phase 2
OB_ACTION_FISH_NORMAL = 100,
OB_ACTION_FISH_VACUME,
OB_ACTION_FISH_END,
};
enum b_oh_anm {
OB_ANM_APPEAR = 0x12,
OB_ANM_APPEAR_2,
OB_ANM_DEAD,
OB_ANM_EAT,
OB_ANM_EAT_2,
OB_ANM_LAST_DAMAGE,
OB_ANM_OPEN_MOUTH,
OB_ANM_OPEN_MOUTH_WAIT,
OB_ANM_SWALLOW,
OB_ANM_SWIM_WAIT,
OB_ANM_TENTACLE_END,
OB_ANM_THROWUP,
OB_ANM_WAIT,
};
struct ob_part_s {
/* 0x00 */ mDoExt_McaMorf* mpMorf;
/* 0x04 */ mDoExt_McaMorf* mpFinMorf;
/* 0x08 */ mDoExt_McaMorf* mpFinUnkMorf;
/* 0x0C */ mDoExt_McaMorf* mpFinBMorf;
/* 0x10 */ mDoExt_McaMorf* mpFinCMorf;
/* 0x14 */ cXyz mPos;
/* 0x20 */ csXyz mAngle;
/* 0x26 */ s16 field_0x26;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ csXyz field_0x2c;
/* 0x32 */ csXyz field_0x32;
/* 0x38 */ csXyz field_0x38;
/* 0x28 */ f32 mSize;
/* 0x2C */ csXyz mFinARot;
/* 0x32 */ csXyz mFinBRot;
/* 0x38 */ csXyz mFinCRot;
/* 0x3E */ s8 field_0x3e;
/* 0x3F */ s8 mHide;
/* 0x40 */ dCcD_Sph mSph;
}; // Size: 0x178
struct ob_ke_s {
/* 8061A3A0 */ ~ob_ke_s();
/* 8061A41C */ ob_ke_s();
/* 0x000 */ cXyz field_0x0[20];
/* 0x0F0 */ cXyz field_0xf0[20];
/* 0x1E0 */ cXyz field_0x1e0;
@@ -40,102 +67,95 @@ struct ob_ke_s {
* @ingroup actors-enemies
* @brief Morpheel (body)
*
* Lakebed Temple dungeon boss. This is the body part of the boss.
* Lakebed Temple dungeon boss. This is the core/body part of the boss.
*
*/
class b_ob_class : public fopEn_enemy_c {
public:
/* 8061A0C0 */ b_ob_class();
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* field_0x5b4;
/* 0x05B8 */ u8 field_0x5b8[0x5BC - 0x5B8];
/* 0x05BC */ f32 field_0x5bc;
/* 0x05C0 */ ob_part_s mParts[20];
/* 0x05B4 */ mDoExt_McaMorfSO* mpCoreMorf;
/* 0x05B8 */ s8 mHideCore;
/* 0x05BC */ f32 mBossLightScale;
/* 0x05C0 */ ob_part_s mBodyParts[20];
/* 0x2320 */ int field_0x2320;
/* 0x2324 */ cXyz field_0x2324[512];
/* 0x3B24 */ csXyz field_0x3b24[512];
/* 0x4724 */ J3DModel* field_0x4724;
/* 0x4728 */ mDoExt_btkAnm* field_0x4728;
/* 0x472C */ mDoExt_brkAnm* field_0x472c;
/* 0x4730 */ f32 field_0x4730;
/* 0x4734 */ int mAnmResID;
/* 0x4738 */ int field_0x4738;
/* 0x4738 */ u8 field_0x473c;
/* 0x4724 */ J3DModel* mpSuiModel;
/* 0x4728 */ mDoExt_btkAnm* mpSuiBtk;
/* 0x472C */ mDoExt_brkAnm* mpSuiBrk;
/* 0x4730 */ f32 mSuiBrkFrame;
/* 0x4734 */ int mAnmID;
/* 0x4738 */ int mCoreAnm;
/* 0x4738 */ u8 mCoreAnmMode;
/* 0x4740 */ f32 field_0x4740;
/* 0x4744 */ s8 field_0x4744;
/* 0x4745 */ u8 field_0x4745;
/* 0x4748 */ u32 field_0x4748;
/* 0x474C */ u8 field_0x474c;
/* 0x474D */ u8 field_0x474d;
/* 0x474E */ u8 field_0x474e[0x4750 - 0x474e];
/* 0x4745 */ s8 mDrawShadow;
/* 0x4748 */ u32 mShadowKey;
/* 0x474C */ s8 mCoreBattleMode;
/* 0x474D */ s8 mFishBattleMode;
/* 0x474E */ u8 mAttnOffTimer;
/* 0x4750 */ s16 field_0x4750;
/* 0x4752 */ s16 field_0x4752;
/* 0x4754 */ s16 field_0x4754;
/* 0x4752 */ s16 mAction;
/* 0x4754 */ s16 mMode;
/* 0x4756 */ s16 field_0x4756;
/* 0x4758 */ cXyz field_0x4758;
/* 0x4764 */ csXyz field_0x4764;
/* 0x4758 */ cXyz mTargetMovePos;
/* 0x4764 */ csXyz mMoveAngle;
/* 0x476A */ s16 field_0x476a;
/* 0x476C */ s16 mYAngleToPlayer;
/* 0x476E */ s16 mXAngleToPlayer;
/* 0x4770 */ f32 mDistToPlayer;
/* 0x4774 */ u8 field_0x4774[0x4778 - 0x4774];
/* 0x4778 */ s16 field_0x4778;
/* 0x477A */ s16 field_0x477a;
/* 0x477C */ s16 field_0x477c;
/* 0x477E */ s16 field_0x477e;
/* 0x4780 */ s16 field_0x4780;
/* 0x4782 */ u8 field_0x4782[0x4784 - 0x4782];
/* 0x05AC */ s16 field_0x4784;
/* 0x4778 */ s16 mTimers[6];
/* 0x05AC */ s16 mHitIFrameTimer;
/* 0x4786 */ u8 field_0x4786[0x4788 - 0x4786];
/* 0x4788 */ int field_0x4788;
/* 0x4788 */ int mCoreHandNo;
/* 0x478C */ int field_0x478c;
/* 0x4790 */ int field_0x4790;
/* 0x4794 */ s16 field_0x4794;
/* 0x4798 */ f32 field_0x4798;
/* 0x479C */ f32 field_0x479c;
/* 0x47A0 */ f32 field_0x47a0;
/* 0x47A4 */ u8 field_0x47a4[0x47aa - 0x47a4];
/* 0x47A4 */ s16 field_0x47a4[3];
/* 0x47AA */ s16 field_0x47aa;
/* 0x47AC */ s16 field_0x47ac;
/* 0x47AE */ s16 field_0x47ae;
/* 0x47B0 */ s16 field_0x47b0;
/* 0x47B4 */ int field_0x47b4;
/* 0x47B8 */ s16 field_0x47b8;
/* 0x47B8 */ s16 mHangTimer;
/* 0x47BA */ s16 field_0x47ba;
/* 0x47BC */ s16 field_0x47bc;
/* 0x47C0 */ f32 field_0x47c0;
/* 0x47C4 */ s16 field_0x47c4;
/* 0x47C8 */ int field_0x47c8;
/* 0x47CC */ dCcD_Stts field_0x47cc;
/* 0x47C8 */ int mDemoMovePosIdx;
/* 0x47CC */ dCcD_Stts mCoreCcStts;
/* 0x4808 */ dCcD_Sph mCcSph;
/* 0x4940 */ dCcD_Sph mCoreSph;
/* 0x4A78 */ dCcU_AtInfo mAtInfo;
/* 0x4A9C */ u8 field_0x4a9c[0x4aa0 - 0x4a9c];
/* 0x4AA0 */ dCcD_Stts field_0x4aa0;
/* 0x4AA0 */ dCcD_Stts mBodyCcStts;
/* 0x4ADC */ dCcD_Sph mBodySph;
/* 0x4C14 */ dCcD_Sph field_0x4c14;
/* 0x4D4C */ dBgS_AcchCir field_0x4d4c;
/* 0x4D8C */ dBgS_ObjAcch field_0x4d8c;
/* 0x4C14 */ dCcD_Sph mFishHeadSph;
/* 0x4D4C */ dBgS_AcchCir mAcchCir;
/* 0x4D8C */ dBgS_ObjAcch mAcch;
/* 0x4F64 */ u32 mTentacleActorIDs[8];
/* 0x4F84 */ ob_ke_s field_0x4f84[5];
/* 0x5920 */ mDoExt_3DlineMat0_c field_0x5920;
/* 0x593C */ Z2CreatureEnemy field_0x593c;
/* 0x59E0 */ Z2CreatureOI field_0x59e0;
/* 0x593C */ Z2CreatureEnemy mSound;
/* 0x59E0 */ Z2CreatureOI mOISound;
/* 0x5BE4 */ cXyz field_0x5be4[13];
/* 0x5C80 */ s16 mDemoAction;
/* 0x5C82 */ s16 field_0x5c82;
/* 0x5C84 */ cXyz field_0x5c84;
/* 0x5C90 */ cXyz field_0x5c90;
/* 0x5C9C */ cXyz field_0x5c9c;
/* 0x5CA8 */ cXyz field_0x5ca8;
/* 0x5C82 */ s16 mDemoActionTimer;
/* 0x5C84 */ cXyz mDemoCamEye;
/* 0x5C90 */ cXyz mDemoCamCenter;
/* 0x5C9C */ cXyz mDemoCamEyeTarget;
/* 0x5CA8 */ cXyz mDemoCamCenterTarget;
/* 0x5CB4 */ f32 field_0x5cb4;
/* 0x5CB8 */ f32 field_0x5cb8;
/* 0x5CBC */ f32 field_0x5cbc;
/* 0x5CC0 */ f32 field_0x5cc0;
/* 0x5CC4 */ f32 field_0x5cc4;
/* 0x5CC8 */ f32 field_0x5cc8;
/* 0x5CCC */ f32 field_0x5ccc;
/* 0x5CCC */ f32 mDemoCamFovy;
/* 0x5CD0 */ f32 field_0x5cd0;
/* 0x5CD4 */ f32 field_0x5cd4;
/* 0x5CD8 */ f32 field_0x5cd8;
@@ -149,28 +169,23 @@ public:
/* 0x5D00 */ f32 field_0x5d00;
/* 0x5D04 */ f32 field_0x5d04;
/* 0x5D08 */ s16 field_0x5d08;
/* 0x5D0A */ s16 field_0x5d0a;
/* 0x5D0C */ s16 field_0x5d0c;
/* 0x5D0A */ s16 mBlureRate;
/* 0x5D0C */ s16 mBlureRateTarget;
/* 0x5D0E */ u8 field_0x5d0e[0x5d10 - 0x5d0e];
/* 0x5D10 */ u8 field_0x5d10;
/* 0x5D11 */ s8 field_0x5d11;
/* 0x5D12 */ s8 field_0x5d12;
/* 0x5D11 */ s8 mHangHitCount;
/* 0x5D12 */ s8 mHangFinishCount;
/* 0x5D12 */ s8 field_0x5d13;
/* 0x5D14 */ f32 field_0x5d14;
/* 0x5D18 */ u8 field_0x5d18;
/* 0x5D19 */ u8 field_0x5d19[0x5d24 - 0x5d19];
/* 0x5D24 */ u32 field_0x5d24[3];
/* 0x5D30 */ u8 field_0x5d30[0x5d38 - 0x5D30];
/* 0x5D24 */ u32 field_0x5d24[5];
/* 0x5D38 */ u32 field_0x5d38;
/* 0x5D3C */ s16 field_0x5d3c;
/* 0x5D40 */ u32 field_0x5d40;
/* 0x5D44 */ u8 field_0x5d44[0x5d88 - 0x5d44];
/* 0x5D88 */ u32 field_0x5d88;
/* 0x5D8C */ u32 field_0x5d8c;
/* 0x5D90 */ u8 field_0x5d90[0x5dd4 - 0x5d90];
/* 0x5DD4 */ u32 field_0x5dd4;
/* 0x5D3C */ s16 mZoneSwTimer;
/* 0x5D40 */ JPABaseEmitter* field_0x5d40[2][19];
/* 0x5DD8 */ int field_0x5dd8;
/* 0x5DDC */ f32 field_0x5ddc;
/* 0x5DE0 */ u8 field_0x5de0;
/* 0x5DDC */ f32 mColsetBlend;
/* 0x5DE0 */ u8 mHIOInit;
};
#endif /* D_A_B_OB_H */
include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
+13 -1
View File
@@ -16,6 +16,15 @@ public:
/* 0xC */ f32 mLength;
};
enum b_oh_action {
OH_ACTION_START,
OH_ACTION_WAIT,
OH_ACTION_ATTACK,
OH_ACTION_CAUGHT,
OH_ACTION_END = 10,
OH_ACTION_NON = 11,
};
/**
* @ingroup actors-enemies
* @brief Morpheel (head)
@@ -79,7 +88,10 @@ public:
/* 0x0CB0 */ dCcD_Stts mCcStts;
/* 0x0CEC */ dCcD_Sph mColliders[15];
/* 0x1F34 */ dCcU_AtInfo mAtInfo;
/* 0x1F58 */ u8 field_0x1F58[0x1F80 - 0x1F58];
/* 0x1F58 */ u8 field_0x1F58[0x1F68 - 0x1F58];
/* 0x1F68 */ cXyz field_0x1f68;
/* 0x1F74 */ csXyz field_0x1f74;
/* 0x1F7C */ f32 field_0x1f7c;
/* 0x1F80 */ u32 field_0x1f80;
/* 0x1F84 */ u8 field_0x1F84[0x1F86 - 0x1F84];
/* 0x1F86 */ u8 field_0x1f86;
include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef D_A_B_OH2_H
#define D_A_B_OH2_H
#include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h"
#include "f_op/f_op_actor_mng.h"
#include "Z2AudioLib/Z2Creature.h"
/**
* @ingroup actors-enemies
include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h
+6
View File
@@ -3,6 +3,12 @@
#include "f_op/f_op_actor_mng.h"
enum obj_lv3waterB_action {
LV3WATERB_ACT_WAIT,
LV3WATERB_ACT_REMOVE,
LV3WATERB_ACT_END,
};
class obj_lv3WaterB_class : public fopAc_ac_c {
public:
/* 0x568 */ request_of_phase_process_class mBWaterPhase;