misc and d_event

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
+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; }
+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);
}
+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
+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