mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-08 18:43:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup (#2134)

Browse Source 
* Merge remote-tracking branch 'upstream/main'

* rm search terms alias (ended up not using it)

* typo fix
This commit is contained in:
Pheenoh
2024-04-15 20:23:53 -06:00
committed by GitHub
parent a0a5d6b00a
commit ddb1f42c69
10 changed files with 1493 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h
+2 -1
View File
@@ -13,9 +13,10 @@ struct g_himo_s {
/**
* @ingroup actors-enemies
* @class b_gnd_class
* @brief Ganondorf
*
* Hyrule Castle dungeon boss.
* @details Hyrule Castle dungeon boss.
*
*/
class b_gnd_class : public fopEn_enemy_c {
include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h
+83
View File
@@ -2,5 +2,88 @@
#define D_A_B_YO_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daB_YO_c
* @brief Blizzeta
*
* @details Snowpeak Ruins dungeon boss.
*
*/
class daB_YO_c : public fopEn_enemy_c {
public:
/* 8062F51C */ void draw();
/* 8062FBEC */ void onIceBreak(u16);
/* 8062FC08 */ void setBck(int, u8, f32, f32);
/* 8062FE0C */ void setActionMode(int, int);
/* 8062FE18 */ void damage_check();
/* 806300F4 */ void setBreakFrizad();
/* 8063022C */ void setIcicleOperate(int);
/* 806302B4 */ void setIcicleSubNumber();
/* 80630330 */ void setWindowBreakEffect(int);
/* 8063040C */ void setHensinEffect();
/* 806305B8 */ void setLandingEffect(f32);
/* 806306F0 */ void setBreakIceEffect();
/* 8063089C */ void setWallHitEffect();
/* 80630A9C */ void setChillEffect();
/* 80630BF0 */ void setApperEffect();
/* 80630CA0 */ void setApperEffect2();
/* 80630DD8 */ void demo_skip(int);
/* 80630E3C */ void DemoSkipCallBack(void*, int);
/* 80630E70 */ void setYoMessage(int);
/* 80630EAC */ void doYoMessage();
/* 80630F28 */ void executeOpening();
/* 80632598 */ void reflectFreeMove();
/* 80632660 */ void calcFreeMove(f32);
/* 8063290C */ void setReflectAngle();
/* 806329CC */ void executeChase();
/* 806331CC */ void executeSeriousDemo();
/* 80633EDC */ void checkIcecleRevival();
/* 80633F50 */ void createIcecleRevival(u8);
/* 80634040 */ void executeJump();
/* 80634548 */ void executeAttackIce();
/* 8063476C */ void executeAttackYose();
/* 80634CEC */ void checkDamageWithIceBreak();
/* 80634E04 */ void executeAttackBody();
/* 806352C8 */ void executeDemoRevival();
/* 80635798 */ void executeDamage();
/* 80635ABC */ void executeDeath();
/* 80636E9C */ void reviseIceCenterPos(cXyz*);
/* 80637048 */ void calcPlayerBufPos();
/* 806374BC */ void action();
/* 80637990 */ void mtx_set();
/* 80637B30 */ void cc_set();
/* 80637E10 */ void execute();
/* 80637FC8 */ void _delete();
/* 806380F8 */ void CreateHeap();
/* 806388A0 */ void CreateHeap2();
/* 806389C0 */ void create();
u8 getModelNo() { return mModelNo;}
s16 getFrizadRollAngle() { return mRollAngle;}
f32 getModeRarius() { return mModeRarius;}
u8 getFrizadAttack() { return mFrizadAttack;}
private:
/* 0x5AC */ u8 field_0x5ac[0xF54 - 0x5AC];
/* 0xF54 */ f32 mModeRarius;
/* 0xF58 */ u8 field_0xf58[0xF5C - 0xF58];
/* 0xF5C */ s16 mRollAngle;
/* 0xF5E */ u8 field_0xf5e[0xFA8 - 0xF5E];
/* 0xFA8 */ u8 mModelNo;
/* 0xFA9 */ u8 field_0xfa9[0xFAD - 0xFA9];
/* 0xFAD */ u8 mFrizadAttack;
};
struct daB_YO_HIO_c {
/* 8062F46C */ daB_YO_HIO_c();
/* 806395E4 */ ~daB_YO_HIO_c();
};
struct daB_YOI_c {
/* 8063A480 */ void setOperate(int);
};
#endif /* D_A_B_YO_H */
include/rel/d/a/door/d_a_door_boss/d_a_door_boss.h
+3
View File
@@ -8,8 +8,11 @@
/**
* @ingroup actors-doors
* @class daBdoor_c
* @brief Boss Door
*
* @details The door that leads to the boss room.
*
*/
class daBdoor_c : public fopAc_ac_c {
public:
include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h
+66 -81
View File
@@ -1,6 +1,8 @@
/**
* @file d_a_e_fz.h
* This header contains information about the Mini Freezard actor.
* @brief Freezard header file.
*
* @details This header contains information about the Mini Freezard actor.
*
*/
@@ -10,10 +12,11 @@
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_uty.h"
#include "m_Do/m_Do_hostIO.h"
#include "rel/d/a/b/d_a_b_yo/d_a_b_yo.h"
/**
* \enum daE_FZ_Action
* \brief Mini Freezard current action.
* @enum daE_FZ_Action
* @brief Mini Freezard current action.
*
*/
enum daE_FZ_Action {
@@ -21,11 +24,13 @@ enum daE_FZ_Action {
ACT_MOVE, /**< Mini Freezard is moving to attack. */
ACT_ATTACK, /**< Mini Freezard is attacking. */
ACT_DAMAGE, /**< Mini Freezard is damaged. */
ACT_ROLLMOVE /**< Mini Freezard is spinning around Blizzeta. This action is only taken when actor is loaded in with parameter 3 (aka, during the Blizzeta fight).*/
ACT_ROLLMOVE /**< Mini Freezard is spinning around Blizzeta.
This action is only taken when actor is loaded in with parameter 3
(during the Blizzeta fight).*/
};
/**
* \brief Temporary HIO struct to get a match. Remove later.
* @brief Temporary HIO struct to get a match. Remove later.
*
*/
struct daE_FZ_HIO_c_tmp {
@@ -50,8 +55,11 @@ struct daE_FZ_HIO_c_tmp {
/**
* @ingroup actors-enemies
* @class daE_FZ_c
* @brief Mini Freezard
*
* @details Miniature Freezard enemy.
*
*/
class daE_FZ_c : public fopEn_enemy_c {
public:
@@ -77,65 +85,64 @@ public:
/* 806C0CD0 */ s32 create();
private:
/* 0x5AC */ request_of_phase_process_class mPhaseReq; /**< Phase request used when creating the actor. */
/* 0x5B4 */ J3DModel* mpModel; /**< Pointer to the Mini Freezard's model. */
/* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel;
/* 0x5C0 */ Z2CreatureEnemy mCreature; /**< Z2CreatureEnemy class used for playing sound effects. */
/* 0x664 */ cXyz field_0x664;
/* 0x670 */ cXyz field_0x670;
/* 0x67C */ cXyz field_0x67c[4];
/* 0x6AC */ cXyz field_0x6ac[4];
/* 0x6DC */ cXyz field_0x6dc;
/* 0x6E8 */ cXyz field_0x6e8;
/* 0x6F4 */ s32 mActionMode; /**< Mini Freezard current action mode. */
/* 0x6F8 */ s32 mActionPhase; /**< Mini Freezard phase of current action mode. */
/* 0x6FC */ f32 field_0x6fc;
/* 0x700 */ f32 mRadiusBase; /**< Base radius value used by mSph1 and mSph2. */
/* 0x704 */ s16 field_0x704;
/* 0x706 */ s16 mAngleFromPlayer; /**< Angle the mini freezard is from the player. */
/* 0x708 */ s16 mLastWallHitAngle; /**< Angle of the last wall the mini freezard hit. */
/* 0x70A */ u8 field_0x70A[0x70C - 0x70A];
/* 0x70C */ s32 field_0x70c;
/* 0x710 */ u8 field_0x710;
/* 0x711 */ u8 field_0x711;
/* 0x712 */ u8 field_0x712;
/* 0x713 */ u8 field_0x713;
/* 0x714 */ u8 field_0x714;
/* 0x715 */ u8 field_0x715;
/* 0x716 */ u8 field_0x716;
/* 0x717 */ u8 field_0x717;
/* 0x718 */ fopAc_ac_c* mpBlizzetaActor; /**< Pointer to Blizzeta's actor (if used). Used to figure out what the mini freezard's angle and positioning should be when Blizzeta is attacking with them.*/
/* 0x71C */ u32 field_0x71c[3];
/* 0x728 */ u8 field_0x728[4];
/* 0x72C */ dBgS_AcchCir mAcchCir;
/* 0x76C */ dBgS_ObjAcch mObjAcch;
/* 0x944 */ dCcD_Stts mStts;
/* 0x980 */ dCcD_Sph mSph1; /**< Mini Freezard's sphere collider used for ? */
/* 0xAB8 */ dCcD_Sph mSph2; /**< Mini Freezard's sphere collider used for attacking. */
/* 0xBF0 */ dCcU_AtInfo mAtInfo;
/* 0xC14 */ u8 field_0xc14;
/* 0xC15 */ u8 field_0xc15;
/* 0xC16 */ u8 field_0xc16;
/* 0xC17 */ u8 field_0xc17;
/* 0xC18 */ u8 field_0xc18;
/* 0xC19 */ u8 field_0xc19;
/* 0xC1A */ u8 field_0xc1a;
/* 0xC1B */ u8 field_0xc1b;
/* 0xC1C */ u8 field_0xc1c;
/* 0xC1D */ u8 field_0xc1d;
/* 0xC1E */ u8 field_0xc1e;
/* 0xC1F */ u8 field_0xc1f;
/* 0xC20 */ u8 field_0xc20;
/* 0xC21 */ u8 field_0xc21;
/* 0xC22 */ u8 field_0xc22;
/* 0xC23 */ u8 field_0xc23;
/* 0x5AC */ request_of_phase_process_class mPhaseReq; /**< Phase request used when creating the actor. */
/* 0x5B4 */ J3DModel* mpModel; /**< Pointer to the Mini Freezard's model. */
/* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel; /**< Invisible model used for the Mini Freezard. */
/* 0x5C0 */ Z2CreatureEnemy mCreature; /**< Z2CreatureEnemy class used for playing sound effects. */
/* 0x664 */ cXyz mUserWork; /**< ??? */
/* 0x670 */ cXyz field_0x670; /**< Appears unused. Set to current position on actor creation. */
/* 0x67C */ cXyz field_0x67c[4]; /**< ??? */
/* 0x6AC */ cXyz field_0x6ac[4]; /**< ??? */
/* 0x6DC */ cXyz field_0x6dc; /**< ??? */
/* 0x6E8 */ cXyz field_0x6e8; /**< ??? */
/* 0x6F4 */ s32 mActionMode; /**< Current action mode. */
/* 0x6F8 */ s32 mActionPhase; /**< Current phase of @ref mActionMode. */
/* 0x6FC */ f32 field_0x6fc; /**< ??? */
/* 0x700 */ f32 mRadiusBase; /**< Base radius value used by @ref mTgCoSph and @ref mAtSph. */
/* 0x704 */ s16 field_0x704; /**< ??? */
/* 0x706 */ s16 mAngleFromPlayer; /**< Angle the mini freezard is from the player. */
/* 0x708 */ s16 mLastWallHitAngle; /**< Angle of the last wall the mini freezard hit. */
/* 0x70C */ s32 field_0x70c; /**< ??? */
/* 0x710 */ u8 field_0x710; /**< ??? */
/* 0x711 */ u8 field_0x711; /**< ??? */
/* 0x712 */ u8 field_0x712; /**< ??? */
/* 0x713 */ u8 field_0x713; /**< ??? */
/* 0x714 */ u8 field_0x714; /**< ??? */
/* 0x715 */ u8 field_0x715; /**< ??? */
/* 0x716 */ u8 field_0x716; /**< ??? */
/* 0x717 */ u8 field_0x717; /**< ??? */
/* 0x718 */ fopAc_ac_c* mpBlizzetaActor; /**< Pointer to Blizzeta's actor (if used). Used to figure out what the mini freezard's angle and positioning should be when Blizzeta is attacking with them. */
/* 0x71C */ u32 mParticleSet[3]; /**< Particle set */
/* 0x728 */ u8 field_0x728[4]; /**< ??? */
/* 0x72C */ dBgS_AcchCir mAcchCir; /**< Checks for actor collision with background circles? */
/* 0x76C */ dBgS_ObjAcch mObjAcch; /**< Checks for actor collision with background objects. */
/* 0x944 */ dCcD_Stts mStts; /**< Track Mini Freezard collider status. */
/* 0x980 */ dCcD_Sph mTgCoSph; /**< Sphere collider used when Mini Freezard is attacked / pushed. */
/* 0xAB8 */ dCcD_Sph mAtSph; /**< Sphere collider used when Mini Freezard is attacking. */
/* 0xBF0 */ dCcU_AtInfo mAtInfo; /**< Tracks information when the Mini Freezard is attacked. */
/* 0xC14 */ u8 field_0xc14; /**< ??? */
/* 0xC15 */ u8 field_0xc15; /**< ??? */
/* 0xC16 */ u8 field_0xc16; /**< ??? */
/* 0xC17 */ u8 field_0xc17; /**< ??? */
/* 0xC18 */ u8 field_0xc18; /**< ??? */
/* 0xC19 */ u8 field_0xc19; /**< ??? */
/* 0xC1A */ u8 field_0xc1a; /**< ??? */
/* 0xC1B */ u8 field_0xc1b; /**< ??? */
/* 0xC1C */ u8 field_0xc1c; /**< ??? */
/* 0xC1D */ u8 field_0xc1d; /**< ??? */
/* 0xC1E */ u8 field_0xc1e; /**< ??? */
/* 0xC1F */ u8 field_0xc1f; /**< ??? */
/* 0xC20 */ u8 field_0xc20; /**< ??? */
/* 0xC21 */ u8 field_0xc21; /**< ??? */
/* 0xC22 */ u8 field_0xc22; /**< ??? */
/* 0xC23 */ u8 field_0xc23; /**< ??? */
};
STATIC_ASSERT(sizeof(daE_FZ_c) == 0xC24);
class daE_FZ_HIO_c : public mDoHIO_entry_c {
class daE_FZ_HIO_c {
public:
/* 806BE94C */ daE_FZ_HIO_c();
/* 806C1440 */ virtual ~daE_FZ_HIO_c();
/* 806C1440 */ virtual ~daE_FZ_HIO_c() {};
public:
/* 0x04 */ s8 field_0x04;
@@ -156,26 +163,4 @@ public:
/* 0x34 */ f32 field_0x34;
};
/**
* \brief Blizzeta's actor class. Reference in proper header later when it has been reversed.
*
*/
class daB_YO_c : public fopEn_enemy_c {
public:
u8 getModelNo() { return mModelNo;}
s16 getFrizadRollAngle() { return mRollAngle;}
f32 getModeRarius() { return mModeRarius;}
u8 getFrizadAttack() { return mFrizadAttack;}
private:
/* 0x5AC */ u8 field_0x5ac[0xF54 - 0x5AC];
/* 0xF54 */ f32 mModeRarius;
/* 0xF58 */ u8 field_0xf58[0xF5C - 0xF58];
/* 0xF5C */ s16 mRollAngle;
/* 0xF5E */ u8 field_0xf5e[0xFA8 - 0xF5E];
/* 0xFA8 */ u8 mModelNo;
/* 0xFA9 */ u8 field_0xfa9[0xFAD - 0xFA9];
/* 0xFAD */ u8 mFrizadAttack;
};
#endif /* D_A_E_FZ_H */