mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 06:53:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc and d_event

Browse Source
This commit is contained in:
lepelog
2022-07-02 01:29:13 +02:00
parent b973f1c798
commit b649193f04
36 changed files with 357 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+4 -2
View File
@@ -2572,11 +2572,12 @@ public:
BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
bool checkFishingCastMode() const {
bool var_r5;
bool var_r4 = 1;
bool var_r3 = 0;
if (mProcID == PROC_FISHING_CAST) {
bool var_r5 = 0;
var_r5 = 0;
if (mItemActor.getActor() != NULL && mItemActor.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
@@ -4633,7 +4634,7 @@ public:
FORCE_PANIC = 8,
};
enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000 };
enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000, NO_DRAW = 0x2000 };
enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 };
@@ -4699,6 +4700,7 @@ public:
void changeDemoMode(u32 mode) { mDemoMode = mode; }
BOOL checkNpcNear() { return checkStateFlg0(NPC_NEAR); }
BOOL checkNpcFar() { return checkStateFlg0(NPC_FAR); }
BOOL checkNoDraw() const { return checkStateFlg0(NO_DRAW); }
inline bool checkMidnaRealBody();
include/d/a/d_a_player.h
+6 -1
View File
@@ -157,6 +157,8 @@ private:
}; // Size: 0x24
class daMidna_c;
class daPy_py_c;
inline daPy_py_c* dComIfGp_getLinkPlayer();
class daPy_py_c : public fopAc_ac_c {
public:
@@ -351,7 +353,7 @@ public:
/* 80182A10 */ void checkGoronSideMove() const;
/* 80182AAC */ void getRightFootPosP();
/* 80182AB4 */ void getLeftFootPosP();
/* 80182ABC */ u32 getMidnaActor();
/* 80182ABC */ //u32 getMidnaActor();
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
@@ -589,6 +591,9 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static BOOL i_checkNowWolf() {
return dComIfGp_getLinkPlayer()->i_checkWolf();
}
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
include/d/com/d_com_inf_game.h
+4
View File
@@ -1514,6 +1514,10 @@ inline dAttention_c& dComIfGp_getAttention() {
return g_dComIfG_gameInfo.play.getAttention();
}
inline u8 dComIfGp_att_getCatchChgItem() {
return dComIfGp_getAttention().getCatchChgItem();
}
inline J2DGrafContext* dComIfGp_getCurrentGrafPort() {
return g_dComIfG_gameInfo.play.getCurrentGrafPort();
}
include/d/d_attention.h
+2
View File
@@ -31,6 +31,7 @@ public:
void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
s32 getCatghTarget() { return convPId(field_0x10); }
u8 getChangeItem() { return mChangeItem; }
private:
void* field_0x0;
@@ -203,6 +204,7 @@ public:
/* 8014B010 */ void getDistTable(int);
dAttCatch_c& getCatghTarget() { return mCatghTarget; }
u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }
BOOL chkFlag(u32 flag) { return mFlags & flag; }
s8 Lockon() {
/* s32 chk = true;
include/d/event/d_event.h
+4 -4
View File
@@ -32,8 +32,8 @@ class dEvt_control_c {
public:
dEvt_control_c();
s32 orderOld(u16, u16, u16, u16, void*, void*, void const*);
s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4,
void* param_5, s16 eventID, u8 infoIdx);
s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5,
s16 eventID, u8 infoIdx);
void setParam(dEvt_order_c*);
s32 beforeFlagProc(dEvt_order_c*);
void afterFlagProc(dEvt_order_c*);
@@ -41,9 +41,9 @@ public:
int talkCheck(dEvt_order_c*);
int talkXyCheck(dEvt_order_c*);
int catchCheck(dEvt_order_c*);
void talkEnd();
int talkEnd();
int demoCheck(dEvt_order_c*);
void demoEnd();
int demoEnd();
int potentialCheck(dEvt_order_c*);
int doorCheck(dEvt_order_c*);
int itemCheck(dEvt_order_c*);
include/f_op/f_op_actor.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
s16 getEventId() { return mEventId; }
s16 getIdx() { return mIndex; }
char* getArchiveName() { return mArchiveName; }
BOOL chkCondition(u16 condition) { return mCondition & condition; }
BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; }
void i_onCondition(u16 cond) { mCondition |= cond; }
void i_offCondition(u16 cond) { mCondition &= ~cond; }
include/f_op/f_op_actor_mng.h
+1 -1
View File
@@ -112,7 +112,7 @@ inline u32 fopAcM_GetID(const void* pActor) {
return fpcM_GetID(pActor);
}
inline s16 fopAcM_GetName(fopAc_ac_c* pActor) {
inline s16 fopAcM_GetName(void* pActor) {
return fpcM_GetName(pActor);
}
include/f_op/f_op_scene.h
+2 -3
View File
@@ -18,9 +18,8 @@ public:
/* 0x0C8 */ u32 field_0xc8;
/* 0x0CC */ u8 field_0xcc[0xE0];
/* 0x1AC */ process_method_class* mpProcessMtd;
/* 0x1B0 */ scene_tag_class* field_0x1b0;
/* 0x1B4 */ u8 field_0x1b4[0x10];
/* 0x1B0 */ scene_tag_class field_0x1b0;
/* 0x1C4 */ request_of_phase_process_class field_0x1c4;
};
#endif
#endif
include/f_op/f_op_scene_tag.h
+4 -2
View File
@@ -4,7 +4,9 @@
#include "dolphin/types.h"
#include "f_pc/f_pc_node.h"
class scene_tag_class;
class scene_tag_class {
u8 _0[0x14];
};
void fopScnTg_QueueTo(scene_tag_class* pSceneTag);
void fopScnTg_ToQueue(scene_tag_class* pSceneTag);
@@ -12,4 +14,4 @@ void fopScnTg_Init(scene_tag_class* pSceneTag, void* pData);
extern node_list_class g_fopScnTg_SceneList;
#endif
#endif
include/m_Do/m_Do_mtx.h
+2 -2
View File
@@ -26,8 +26,8 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
class mDoMtx_stack_c {
public:
/* 8000CCC8 */ bool push();
/* 8000CD14 */ bool pop();
/* 8000CCC8 */ static bool push();
/* 8000CD14 */ static bool pop();
/* 8000CD64 */ static void transS(cXyz const&);
/* 8000CDD4 */ static void transM(cXyz const&);
/* 8000CD9C */ static void transM(f32, f32, f32);
include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h
+11
View File
@@ -3,4 +3,15 @@
#include "dolphin/types.h"
struct daTagMhint_c {
/* 805A56B8 */ void create();
/* 805A58E8 */ ~daTagMhint_c();
/* 805A5974 */ void eventOrder();
/* 805A5AE4 */ void execute();
bool checkNoAttention() const { return _0x56d == 0xFF; }
u8 _0[0x56d];
u8 _0x56d;
};
#endif /* D_A_TAG_MHINT_H */
include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h
+11
View File
@@ -3,4 +3,15 @@
#include "dolphin/types.h"
struct daTagMstop_c {
/* 805A6138 */ void create();
/* 805A6338 */ ~daTagMstop_c();
/* 805A63C4 */ void eventOrder();
/* 805A63F8 */ void execute();
bool checkNoAttention() const { return _0x56b == 0xFF; }
u8 _0[0x56b];
u8 _0x56b;
};
#endif /* D_A_TAG_MSTOP_H */