d_a_tag_ss_drink OK (#1964)

* Use fopAcM_GetParamBit inline function in d_a_tag_myna_light

* d_a_tag_ss_drink OK
This commit is contained in:
Jacob Patzer
2023-10-20 02:46:03 +03:00
committed by GitHub
parent af2d5f8285
commit c5a25e295c
27 changed files with 305 additions and 1088 deletions
+16
View File
@@ -11,6 +11,22 @@ public:
/* 8015E4C8 */ virtual void setSoldOut();
/* 8015E4B0 */ virtual u32 getProcessID();
void* getParentPtr() {
return mpParentPtr;
}
void setFlowNodeNumber(u16 flowNodeNum) {
mFlowNodeNum = flowNodeNum;
}
u16 getValueNumber() {
return mValueNum;
}
void setValueNumber(u16 valueNum) {
mValueNum = valueNum;
}
private:
/* 0x56C */ void* mpParentPtr;
/* 0x570 */ u16 field_0x570;
+1
View File
@@ -275,6 +275,7 @@ void dMsgObject_setFundRaising(u16 param_0);
u16 dMsgObject_getFundRaising();
void dMsgObject_addOffering(s16 param_0);
u16 dMsgObject_getOffering();
void dMsgObject_addTotalPrice(s16 param_0);
inline dMsgObject_c* dMsgObject_getMsgObjectClass() {
return dComIfGp_getMsgObjectClass();
+4
View File
@@ -114,6 +114,10 @@ public:
daMyna_c(){};
void onEventFlag(u8 flag) {
field_0x92F |= (1 << flag);
}
typedef void (daMyna_c::*ProcFunc)();
typedef int (daMyna_c::*BaseMotionFunc)(int);
@@ -1,6 +1,46 @@
#ifndef D_A_TAG_SS_DRINK_H
#define D_A_TAG_SS_DRINK_H
#include "d/a/d_a_obj_ss_base.h"
#include "d/com/d_com_inf_game.h"
#include "d/msg/d_msg_flow.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTag_SSDrink_c;
typedef int (daTag_SSDrink_c::*ProcessFunc)(void*);
class daTag_SSDrink_c : public daObj_SSBase_c {
public:
/* 80D62DB8 */ int create();
/* 80D62E5C */ int Delete();
/* 80D62E64 */ int Execute();
/* 80D62ED0 */ int Draw();
/* 80D62ED8 */ int getTypeFromParam();
/* 80D62F80 */ u8 getSwitchFromParam();
/* 80D62F8C */ u16 getFlowNodeNum();
/* 80D62FC8 */ u16 getValue();
/* 80D62FD4 */ void restart();
/* 80D63044 */ void initialize();
/* 80D630BC */ int checkProcess(ProcessFunc);
/* 80D630E8 */ int setProcess(ProcessFunc);
/* 80D631D4 */ void setAttnPos();
/* 80D63208 */ int chkEvent();
/* 80D63384 */ int orderEvent();
/* 80D63490 */ int wait(void*);
/* 80D635C8 */ int talk(void*);
/* 80D63724 */ ~daTag_SSDrink_c();
s32 fopAcM_seenPlayerAngleY() { return fopAcM_seenActorAngleY(this, dComIfGp_getPlayer(0)); }
/* 0x578 */ dMsgFlow_c field_0x578;
/* 0x5C4 */ ProcessFunc mProcessFunc;
/* 0x5D0 */ u16 mEventType;
/* 0x5D2 */ u8 field_0x5D2;
/* 0x5D3 */ u8 field_0x5D3;
/* 0x5D4 */ u8 field_0x5D4;
/* 0x5D5 */ u8 field_0x5D5;
}; // Size: 0x5D8
STATIC_ASSERT(sizeof(daTag_SSDrink_c) == 0x5D8);
#endif /* D_A_TAG_SS_DRINK_H */