encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #358 from TakaRikka/mist

Browse Source 
d_a_tag_mist, d_a_obj_lv3waterEff, d_a_kytag16, d_a_disappear OK
This commit is contained in:
hatal175
2023-07-01 13:10:18 +03:00
committed by GitHub
parent 2c06d515d2 8fdc70b602
commit d5e0822313
76 changed files with 942 additions and 3511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/d_a_disappear/d_a_disappear.h
+8 -1
View File
@@ -1,6 +1,13 @@
#ifndef D_A_DISAPPEAR_H
#define D_A_DISAPPEAR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class disappear_class : public fopAc_ac_c {
public:
/* 0x568 */ u8 field_0x568[0x574 - 0x568];
/* 0x574 */ s16 mDeleteTimer;
/* 0x576 */ u8 field_0x576[0x578 - 0x576];
};
#endif /* D_A_DISAPPEAR_H */
include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h
+20 -1
View File
@@ -1,6 +1,25 @@
#ifndef D_A_KYTAG16_H
#define D_A_KYTAG16_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class kytag16_class : public fopAc_ac_c {
public:
/* 0x568 */ f32 field_0x568;
/* 0x56C */ u8 field_0x56c;
/* 0x56D */ GXColor field_0x56d;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573;
/* 0x574 */ f32 field_0x574;
/* 0x578 */ f32 field_0x578;
/* 0x57C */ f32 field_0x57c;
/* 0x580 */ f32 field_0x580;
/* 0x584 */ f32 field_0x584;
/* 0x588 */ s16 field_0x588;
/* 0x58A */ s16 field_0x58a;
/* 0x58C */ u8 field_0x58c;
/* 0x58D */ u8 field_0x58d;
};
#endif /* D_A_KYTAG16_H */
include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h
+18 -1
View File
@@ -1,6 +1,23 @@
#ifndef D_A_OBJ_CRYSTAL_H
#define D_A_OBJ_CRYSTAL_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daObjCrystal_c : public fopAc_ac_c {
public:
/* 80BD63B8 */ void initBaseMtx();
/* 80BD6410 */ void setBaseMtx();
/* 80BD6470 */ int Create();
/* 80BD65B0 */ int CreateHeap();
/* 80BD6664 */ int create();
/* 80BD6718 */ int execute();
/* 80BD673C */ int draw();
/* 80BD67C8 */ int _delete();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel[2];
/* 0x578 */ JPABaseEmitter* mpEmitter;
/* 0x57C */ u16 mJointID;
};
#endif /* D_A_OBJ_CRYSTAL_H */
include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h
+13 -1
View File
@@ -1,6 +1,18 @@
#ifndef D_A_OBJ_LV3WATEREFF_H
#define D_A_OBJ_LV3WATEREFF_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daObjWaterEff_c : public fopAc_ac_c {
public:
/* 80C5C4F8 */ int Create();
/* 80C5C5DC */ int create();
/* 80C5C6B0 */ int execute();
/* 80C5C7B8 */ int _delete();
/* 0x568 */ cXyz mSePositions[2];
/* 0x580 */ JPABaseEmitter* mParticles[4];
/* 0x590 */ u8 unused_0x590[0x594 - 0x590];
};
#endif /* D_A_OBJ_LV3WATEREFF_H */
include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h
+23 -1
View File
@@ -1,6 +1,28 @@
#ifndef D_A_OBJ_LV4HSTARGET_H
#define D_A_OBJ_LV4HSTARGET_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4HsTarget_c : public dBgS_MoveBgActor {
public:
/* 80C5F690 */ void setBaseMtx();
/* 80C5F784 */ int create();
/* 80C5F718 */ virtual int CreateHeap();
/* 80C5F85C */ virtual int Execute(Mtx**);
/* 80C5F870 */ virtual int Draw();
/* 80C5F8D4 */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
};
class daLv4HsTarget_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5F62C */ daLv4HsTarget_HIO_c();
/* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {}
};
#endif /* D_A_OBJ_LV4HSTARGET_H */
include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h
+2
View File
@@ -27,6 +27,8 @@ class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
public:
/* 805A202C */ daTagCstaSw_HIO_c();
/* 805A2480 */ virtual ~daTagCstaSw_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_CSTASW_H */
include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h
+4 -4
View File
@@ -13,13 +13,13 @@ public:
/* 8048EF6C */ int Draw();
/* 8048EF74 */ void initialize();
/* 0x568 */ dMsgFlow_c field_0x568;
/* 0x5B4 */ cBgS_GndChk field_0x5b4;
/* 0x568 */ dMsgFlow_c mMsgFlow;
/* 0x5B4 */ cBgS_GndChk mGndChk;
/* 0x5F0 */ u32 field_0x5f0;
/* 0x5F4 */ f32 field_0x5f4;
/* 0x5F4 */ f32 mGroundCross;
/* 0x5F8 */ s32 field_0x5f8;
/* 0x5FC */ u32 field_0x5fc;
/* 0x600 */ s32 field_0x600;
/* 0x600 */ int mFlowIndex;
/* 0x604 */ u8 field_0x604;
/* 8048ECAC */ virtual ~daTag_Lantern_c();
include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
+1
View File
@@ -27,6 +27,7 @@ public:
/* 80D5B2EC */ daLv6CstaSw_HIO_c();
/* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_LV6CSTASW_H */
include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h
+42 -1
View File
@@ -1,6 +1,47 @@
#ifndef D_A_TAG_MIST_H
#define D_A_TAG_MIST_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTagMist_c : public fopAc_ac_c {
public:
/* 8048F258 */ void offSw();
/* 8048F2C4 */ void onMySw();
/* 8048F310 */ BOOL isMySw();
/* 8048F370 */ int Create();
/* 8048F444 */ int create();
/* 8048F558 */ int execute();
/* 8048F690 */ int _delete();
/* 80031CF0 */ static u8 getPlayerNo();
static void setPlayerNo(u8 i_playerNo) { mPlayerNo = i_playerNo; }
static u8 mPlayerNo;
/* 0x568 */ u8 unused_0x568[0x570 - 0x568];
/* 0x570 */ cXyz mVertices[4];
/* 0x5A0 */ u8 mPlayerTouched;
/* 0x5A1 */ u8 mInitParams;
/* 0x5A2 */ u16 field_0x5a2;
/* 0x5A4 */ u16 field_0x5a4;
}; // Size: 0x5A8
namespace daTagMist_prm {
inline u8 getSwNoNum(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x10;
}
inline u8 getMySwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x8;
}
inline u8 getTopSwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this);
}
inline u8 getExitNo(daTagMist_c* i_this) {
return (fopAcM_GetParam(i_this) >> 0x18) & 0x3F;
}
inline int getSwNo2(daTagMist_c* i_this) {
return i_this->field_0x5a2 & 0xFF;
}
} // namespace daTagMist_prm
#endif /* D_A_TAG_MIST_H */
include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h
+2
View File
@@ -22,6 +22,8 @@ class daTagPoFire_HIO_c : public mDoHIO_entry_c {
public:
/* 80D5DACC */ daTagPoFire_HIO_c();
/* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_POFIRE_H */