tag_evtmsg and d_bg_w_sv OK (#1902)

* tag_evtmsg and d_bg_w_sv OK

* remove asm
This commit is contained in:
TakaRikka
2023-08-31 04:34:59 -07:00
committed by GitHub
parent dd4b291daf
commit 8f45369601
75 changed files with 379 additions and 3903 deletions
+1
View File
@@ -433,6 +433,7 @@ STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40);
BOOL daNpcT_chkEvtBit(u32 i_idx);
BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4);
BOOL daNpcF_chkPointInArea(cXyz, cXyz, cXyz, s16);
class daNpcF_ActorMngr_c {
private:
+3 -3
View File
@@ -7,10 +7,10 @@ class dBgWSv : public dBgW {
public:
/* 80082F98 */ u8 Set(cBgD_t*, u32);
/* 80083020 */ void CopyBackVtx();
/* 8008308C */ void CrrPosWork(cXyz*, int, int, int);
/* 80083300 */ void TransPosWork(cXyz*, int, int, int);
/* 8008308C */ bool CrrPosWork(cXyz*, int, int, int);
/* 80083300 */ bool TransPosWork(cXyz*, int, int, int);
/* 800835DC */ virtual ~dBgWSv();
/* 800835DC */ virtual ~dBgWSv() {}
/* 80083244 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
/* 8008351C */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
/* 800835D8 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
@@ -1,6 +1,39 @@
#ifndef D_A_TAG_EVTMSG_H
#define D_A_TAG_EVTMSG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/msg/d_msg_flow.h"
class daTag_EvtMsg_c;
typedef BOOL (daTag_EvtMsg_c::*EvtCutFunc)(int);
class daTag_EvtMsg_c : public fopAc_ac_c {
public:
/* 0x568 */ int mTimer;
/* 0x56C */ int mFlowID;
/* 0x570 */ s16 mEventID;
/* 0x572 */ u8 field_0x572;
/* 0x574 */ dMsgFlow_c mMsgFlow;
public:
/* 8048CF38 */ int create();
/* 8048D014 */ int Delete();
/* 8048D01C */ int Execute();
/* 8048D31C */ int Draw();
/* 8048D324 */ u32 getOnEvtBit();
/* 8048D340 */ u32 getOffEvtBit();
/* 8048D35C */ u8 getOnSwBit();
/* 8048D368 */ u8 getOffSwBit();
/* 8048D374 */ u8 getProcType();
/* 8048D384 */ BOOL isDelete();
/* 8048D428 */ BOOL chkPointInArea(cXyz);
/* 8048D54C */ BOOL ECut_talk(int);
/* 8048D5CC */ BOOL ECut_wait(int);
/* 8048D6F0 */ virtual ~daTag_EvtMsg_c();
static char* mEvtCutNameList[];
static EvtCutFunc mEvtCutList[];
};
#endif /* D_A_TAG_EVTMSG_H */