mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 05:28:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_bosswarp and d_a_obj_ystone mostly done (#2058)

Browse Source
This commit is contained in:
Caroline Madsen
2024-02-02 23:12:31 -05:00
committed by GitHub
parent e1f1b39880
commit 6134684bb5
44 changed files with 1172 additions and 2716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+4
View File
@@ -3214,6 +3214,10 @@ inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
}
inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
}
inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
u32 t = g_dComIfG_gameInfo.play.getEvent().mPtT;
return g_dComIfG_gameInfo.play.getEvent().convPId(t);
include/rel/d/a/d_a_midna/d_a_midna.h
+4
View File
@@ -137,6 +137,10 @@ public:
onStateFlg1(FLG1_UNK_100);
}
MtxP getMtxHairTop() {
return field_0x574->i_getAnmMtx(10);
}
bool checkReturnAnime() const {
return field_0x5e4[0].getIdx() == 0x1CA;
}
include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h
+81 -1
View File
@@ -1,6 +1,86 @@
#ifndef D_A_OBJ_BOSSWARP_H
#define D_A_OBJ_BOSSWARP_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor_mng.h"
#include "d/msg/d_msg_flow.h"
class daObjBossWarp_c : public fopAc_ac_c {
public:
enum Action {
/* 0x0 */ ACT_WAIT,
/* 0x1 */ ACT_ORDER_EVENT,
/* 0x2 */ ACT_EVENT,
/* 0x3 */ ACT_WAIT_WARP,
/* 0x4 */ ACT_ORDER_WARP_EVENT,
/* 0x5 */ ACT_WARP_EVENT,
/* 0x6 */ ACT_DEAD,
/* 0x7 */ ACT_ORDER_CHK_EVENT,
/* 0x8 */ ACT_CHK_EVENT,
/* 0x9 */ ACT_ORDER_CANCEL_EVENT,
/* 0xA */ ACT_CANCEL_EVENT,
};
/* 80579700 */ void initBaseMtx();
/* 80579748 */ void setBaseMtx();
/* 805797B8 */ int Create();
/* 80579934 */ int CreateHeap();
/* 80579B70 */ cPhs__Step create();
/* 80579C30 */ void appear(int);
/* 80579D98 */ void set_appear();
/* 80579E08 */ void disappear(int);
/* 80579E5C */ BOOL checkDistance();
/* 80579FF8 */ int execute();
/* 8057A390 */ void event_proc_call();
/* 8057A4F4 */ void actionWait();
/* 8057A54C */ void actionOrderEvent();
/* 8057A610 */ void actionEvent();
/* 8057A678 */ void actionWaitWarp();
/* 8057A6E0 */ void actionOrderWarpEvent();
/* 8057A778 */ void actionWarpEvent();
/* 8057A7C4 */ void actionDead();
/* 8057A7C8 */ void actionOrderChkEvent();
/* 8057A8B4 */ void actionChkEvent();
/* 8057A994 */ void actionOrderCancelEvent();
/* 8057AA2C */ void actionCancelEvent();
/* 8057AA94 */ int demoProc();
/* 8057B0D8 */ void setGoal();
/* 8057B190 */ int draw();
/* 8057B23C */ int _delete();
u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSceneListNo() { return fopAcM_GetParamBit(this, 8, 8); }
bool isFirst() { return fopAcM_GetParamBit(this, 0x1b, 1); }
void setAction(u8 action) { mAction = action; }
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ mDoExt_btkAnm* mpBtkAnm[2];
/* 0x57C */ mDoExt_brkAnm* mpBrkAnm;
/* 0x580 */ JPABaseEmitter* mpParticle[4];
/* 0x590 */ u8 mAction;
/* 0x591 */ bool field_0x591;
/* 0x592 */ s16 mBossClearEventId;
/* 0x594 */ u8 mBossClearMapToolId;
/* 0x595 */ bool field_0x595;
/* 0x596 */ s16 mBossWarpInEventId;
/* 0x598 */ u8 mBossWarpInMapToolId;
/* 0x599 */ u8 field_0x599;
/* 0x59C */ int mStaffId;
/* 0x5A0 */ int mTimer;
/* 0x5A4 */ cXyz mYstonePos;
/* 0x5B0 */ cXyz mYstoneTargetPos;
/* 0x5BC */ cXyz mParticlePos;
/* 0x5C8 */ s16 mWarpCheckEventId;
/* 0x5CA */ u16 mCounter;
/* 0x5CC */ f32 mScaleF;
/* 0x5D0 */ dMsgFlow_c mMsgFlow;
/* 0x61C */ u16 mWarpChoice;
/* 0x61E */ s16 mWarpCancelEventId;
/* 0x620 */ cXyz field_0x620;
/* 0x62C */ bool mScalingUp;
};
STATIC_ASSERT(sizeof(daObjBossWarp_c) == 0x630);
#endif /* D_A_OBJ_BOSSWARP_H */
include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h
+48 -1
View File
@@ -1,6 +1,53 @@
#ifndef D_A_OBJ_YSTONE_H
#define D_A_OBJ_YSTONE_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor.h"
class obj_ystone_class : public fopAc_ac_c {
public:
void setCurrentPos(cXyz i_pos) {
current.pos = i_pos;
}
void setBaseMtx(MtxP i_mtx) {
field_0x598 = 1;
if (mLevel < 3) {
if (mpModel != NULL) {
mpModel->i_setBaseTRMtx(i_mtx);
}
} else {
if (mpMorf != NULL) {
mpMorf->getModel()->i_setBaseTRMtx(i_mtx);
}
}
}
int getMirrorMode() {
return mMirrorMode;
}
void setMirrorMode(int i_mode) {
mMirrorMode = i_mode;
}
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x578 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x57C */ mDoExt_McaMorfSO* mpMorf;
/* 0x580 */ f32 mScaleF;
/* 0x584 */ u8 field_0x584[2];
/* 0x586 */ s16 mShadowMode;
/* 0x588 */ u8 field_0x588[4];
/* 0x58C */ int mMirrorMode;
/* 0x590 */ int mTimer;
/* 0x594 */ u32 mParticleKey;
/* 0x598 */ s8 field_0x598;
/* 0x599 */ u8 mLevel;
/* 0x59A */ bool field_0x59a;
/* 0x59B */ bool field_0x59b;
/* 0x59C */ u8 field_0x59c[4];
};
#endif /* D_A_OBJ_YSTONE_H */