mirror of https://github.com/zeldaret/tp.git
cleanup d_msg_flow (#2447)
This commit is contained in:
TakaRikka
GitHub
parent
165095b3d9
commit
d1a5f8d71c
|
|
@ -279,8 +279,8 @@ public:
|
|||
void changeDemoMode(u32 mode) { mDemoMode = mode; }
|
||||
BOOL checkPortalObjCall() { return checkStateFlg0(FLG0_PORTAL_OBJ_CALL); }
|
||||
BOOL checkNoHairScale() const { return checkStateFlg0(FLG0_NO_HAIR_SCALE); }
|
||||
BOOL checkNpcNear() { return checkStateFlg0(FLG0_NPC_NEAR); }
|
||||
BOOL checkNpcFar() { return checkStateFlg0(FLG0_NPC_FAR); }
|
||||
BOOL checkNpcNear() const { return checkStateFlg0(FLG0_NPC_NEAR); }
|
||||
BOOL checkNpcFar() const { return checkStateFlg0(FLG0_NPC_FAR); }
|
||||
u32 checkNoDraw() const { return checkStateFlg0(FLG0_NO_DRAW); }
|
||||
BOOL checkNoInput() const { return checkStateFlg0(FLG0_NO_INPUT); }
|
||||
BOOL checkWolfNoPos() const { return checkStateFlg0(FLG0_WOLF_NO_POS); }
|
||||
|
|
|
|||
|
|
@ -119,12 +119,14 @@ public:
|
|||
/* 8094A608 */ void setDefaultWaitAnime(u8);
|
||||
/* 8094AA20 */ virtual ~daMyna_c() {}
|
||||
|
||||
daMyna_c(){};
|
||||
daMyna_c() {}
|
||||
|
||||
void onEventFlag(u8 flag) { field_0x92F |= (1 << flag); }
|
||||
void offEventFlag(u8 flag) { field_0x92F &= ~(1 << flag); }
|
||||
bool isEventFlag(u8 flag) { return field_0x92F & (1 << flag); }
|
||||
|
||||
fopAc_ac_c* getSpeakActorPtr() { return field_0x828; }
|
||||
|
||||
typedef void (daMyna_c::*ProcFunc)();
|
||||
typedef int (daMyna_c::*BaseMotionFunc)(int);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ u8 daNpcKakashi_getSwdTutorialStep();
|
|||
void daNpcKakashi_setSwdTutorialStep(u8 iEvtNum);
|
||||
bool daNpcKakashi_getSwdTutorialResult();
|
||||
BOOL daNpcKakashi_chkSwdTutorialStage();
|
||||
int daNpcKakashi_getSuccessCount();
|
||||
u8 daNpcKakashi_getSuccessCount();
|
||||
void daNpcKakashi_clrSuccessCount();
|
||||
int daNpcMsg_setEvtNum(u8 iEvtNum);
|
||||
|
||||
|
|
|
|||
|
|
@ -152,10 +152,10 @@ public:
|
|||
u8 getGameOverType() { return mGameOverType; }
|
||||
void setGameOverType(u8 i_gameoverType) { mGameOverType = i_gameoverType; }
|
||||
void setMsgKeyWaitTimer(s16 i_waitTimer) { mMsgKeyWaitTimer = i_waitTimer; }
|
||||
u32 getMsgTimeMs() { return mMsgTimeMs; }
|
||||
void setMsgTimeMs(u32 msgTime) { mMsgTimeMs = msgTime; }
|
||||
s32 getMsgTimeMs() { return mMsgTimeMs; }
|
||||
void setMsgTimeMs(s32 msgTime) { mMsgTimeMs = msgTime; }
|
||||
void setTimeMs(s32 i_time) { mTimeMs = i_time; }
|
||||
u32 getTimeMs() { return mTimeMs; }
|
||||
s32 getTimeMs() { return mTimeMs; }
|
||||
u8 getNowCount() { return mNowCount; }
|
||||
int getMaxCount() { return mMaxCount; }
|
||||
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
|
||||
|
|
@ -220,7 +220,7 @@ public:
|
|||
/* 0x7C */ f32 m2DPosV;
|
||||
/* 0x80 */ f32 unk128;
|
||||
/* 0x84 */ s32 mTimeMs;
|
||||
/* 0x88 */ u32 mMsgTimeMs;
|
||||
/* 0x88 */ s32 mMsgTimeMs;
|
||||
/* 0x8C */ s32 mMeterString;
|
||||
/* 0x90 */ u32 mTempBits;
|
||||
/* 0x94 */ s16 mMsgKeyWaitTimer;
|
||||
|
|
@ -619,15 +619,15 @@ inline void dMeter2Info_setMsgKeyWaitTimer(s16 i_waitTimer) {
|
|||
g_meter2_info.setMsgKeyWaitTimer(i_waitTimer);
|
||||
}
|
||||
|
||||
inline u32 dMeter2Info_getMsgTimeMs() {
|
||||
inline s32 dMeter2Info_getMsgTimeMs() {
|
||||
return g_meter2_info.getMsgTimeMs();
|
||||
}
|
||||
|
||||
inline u32 dMeter2Info_getTimeMs() {
|
||||
inline s32 dMeter2Info_getTimeMs() {
|
||||
return g_meter2_info.getTimeMs();
|
||||
}
|
||||
|
||||
inline void dMeter2Info_setMsgTimeMs(u32 msgTime) {
|
||||
inline void dMeter2Info_setMsgTimeMs(s32 msgTime) {
|
||||
g_meter2_info.setMsgTimeMs(msgTime);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@
|
|||
|
||||
#include "dolphin/types.h"
|
||||
|
||||
enum {
|
||||
NODETYPE_MESSAGE_e = 1,
|
||||
NODETYPE_BRANCH_e = 2,
|
||||
NODETYPE_EVENT_e = 3,
|
||||
};
|
||||
|
||||
enum {
|
||||
SELTYPE_NONE_e = 0,
|
||||
SELTYPE_VERTICAL_e = 1,
|
||||
SELTYPE_HORIZONTAL_e = 2,
|
||||
};
|
||||
|
||||
class fopAc_ac_c;
|
||||
class msg_class;
|
||||
|
||||
|
|
@ -11,25 +23,27 @@ struct mesg_flow_node {
|
|||
/* 0x00 */ u8 type;
|
||||
/* 0x01 */ u8 field_0x1;
|
||||
/* 0x02 */ u16 msg_index;
|
||||
/* 0x04 */ u8 params[4];
|
||||
/* 0x04 */ u16 next_node_idx;
|
||||
/* 0x06 */ u16 unk_0x6;
|
||||
}; // Size: 0x8
|
||||
|
||||
struct mesg_flow_node_branch {
|
||||
/* 0x00 */ u8 type;
|
||||
/* 0x01 */ u8 field_0x1;
|
||||
/* 0x02 */ u16 msg_index;
|
||||
/* 0x04 */ u16 params[2];
|
||||
/* 0x02 */ u16 query_idx;
|
||||
/* 0x04 */ u16 param;
|
||||
/* 0x06 */ u16 next_node_idx;
|
||||
};
|
||||
|
||||
struct mesg_flow_node_event {
|
||||
/* 0x00 */ u8 type;
|
||||
/* 0x01 */ u8 field_0x1;
|
||||
/* 0x02 */ u16 msg_index;
|
||||
/* 0x01 */ u8 event_idx;
|
||||
/* 0x02 */ u16 next_node_idx;
|
||||
/* 0x04 */ u8 params[4];
|
||||
}; // Size: 0x8
|
||||
|
||||
class dMsgFlow_c;
|
||||
typedef int (dMsgFlow_c::*queryFunc)(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
typedef u16 (dMsgFlow_c::*queryFunc)(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
typedef int (dMsgFlow_c::*eventFunc)(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
|
||||
class dMsgFlow_c {
|
||||
|
|
@ -60,59 +74,59 @@ public:
|
|||
/* 8024B0F0 */ int getParam(u16*, u16*, u8*);
|
||||
/* 8024B108 */ int getParam(u8*, u8*);
|
||||
/* 8024B130 */ int getParam(u8*);
|
||||
/* 8024B138 */ int query001(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B180 */ int query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B208 */ int query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B250 */ int query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B2C0 */ int query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B2F8 */ int query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B32C */ int query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B45C */ int query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B4A4 */ int query009(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B4D0 */ int query010(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B504 */ int query011(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B54C */ int query012(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B584 */ int query013(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B5BC */ int query014(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B5F4 */ int query015(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B62C */ int query016(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B664 */ int query017(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B6A8 */ int query018(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B6EC */ int query019(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B730 */ int query020(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B774 */ int query021(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B8E4 */ int query022(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B918 */ int query023(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B954 */ int query024(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B974 */ int query025(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B9BC */ int query026(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B9E8 */ int query027(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BA4C */ int query028(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BAA0 */ int query029(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BAE0 */ int query030(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB18 */ int query031(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB74 */ int query032(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB9C */ int query033(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BBE4 */ int query034(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC14 */ int query035(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC3C */ int query036(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC80 */ int query037(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BCC4 */ int query038(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BDB0 */ int query039(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BE4C */ int query040(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BF50 */ int query041(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BFEC */ int query042(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C0A8 */ int query043(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C144 */ int query044(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C18C */ int query045(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C218 */ int query046(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C248 */ int query047(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C250 */ int query048(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C2A0 */ int query049(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C2FC */ int query050(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C340 */ int query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C3A0 */ int query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C3D4 */ int query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B138 */ u16 query001(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B180 */ u16 query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B208 */ u16 query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B250 */ u16 query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B2C0 */ u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B2F8 */ u16 query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B32C */ u16 query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B45C */ u16 query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B4A4 */ u16 query009(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B4D0 */ u16 query010(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B504 */ u16 query011(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B54C */ u16 query012(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B584 */ u16 query013(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B5BC */ u16 query014(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B5F4 */ u16 query015(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B62C */ u16 query016(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B664 */ u16 query017(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B6A8 */ u16 query018(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B6EC */ u16 query019(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B730 */ u16 query020(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B774 */ u16 query021(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B8E4 */ u16 query022(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B918 */ u16 query023(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B954 */ u16 query024(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B974 */ u16 query025(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B9BC */ u16 query026(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024B9E8 */ u16 query027(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BA4C */ u16 query028(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BAA0 */ u16 query029(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BAE0 */ u16 query030(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB18 */ u16 query031(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB74 */ u16 query032(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BB9C */ u16 query033(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BBE4 */ u16 query034(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC14 */ u16 query035(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC3C */ u16 query036(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BC80 */ u16 query037(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BCC4 */ u16 query038(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BDB0 */ u16 query039(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BE4C */ u16 query040(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BF50 */ u16 query041(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024BFEC */ u16 query042(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C0A8 */ u16 query043(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C144 */ u16 query044(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C18C */ u16 query045(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C218 */ u16 query046(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C248 */ u16 query047(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C250 */ u16 query048(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C2A0 */ u16 query049(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C2FC */ u16 query050(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C340 */ u16 query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C3A0 */ u16 query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C3D4 */ u16 query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
|
||||
/* 8024C3FC */ int event000(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
/* 8024C488 */ int event001(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
/* 8024C514 */ int event002(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
|
|
@ -157,9 +171,15 @@ public:
|
|||
/* 8024DA78 */ int event041(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
/* 8024DAA8 */ int event042(mesg_flow_node_event*, fopAc_ac_c*);
|
||||
|
||||
void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**);
|
||||
|
||||
#ifdef DEBUG
|
||||
void dbgPrint();
|
||||
#endif
|
||||
|
||||
u8 isSelectMessage() { return mSelectMessage; }
|
||||
void onNonStopJunpFlowFlag() { mNonStopJunpFlowFlag = 1; }
|
||||
int getSelectNum() { return query005(NULL, NULL, 0); }
|
||||
u16 getSelectNum() { return query005(NULL, NULL, 0); }
|
||||
s16 getChoiceNo() { return mChoiceNo; }
|
||||
void setMsg(u32 msg) { mMsg = msg; }
|
||||
bool checkEndFlow() { return field_0x26 == 1; }
|
||||
|
|
@ -170,13 +190,16 @@ public:
|
|||
private:
|
||||
/* 0x04 */ u8* mFlow_p;
|
||||
/* 0x08 */ u8* mLabelInfo_p;
|
||||
/* 0x0C */ mesg_flow_node* mFlowNodeTBL;
|
||||
/* 0x10 */ u16 field_0x10;
|
||||
/* 0x0C */ union mesg_flow {
|
||||
mesg_flow_node message;
|
||||
mesg_flow_node_branch branch;
|
||||
mesg_flow_node_event event;
|
||||
}* mFlowNodeTBL;
|
||||
/* 0x10 */ u16 mNodeIdx;
|
||||
/* 0x12 */ u16 field_0x12;
|
||||
/* 0x14 */ u16* field_0x14;
|
||||
/* 0x14 */ u16* mFlowIdxTBL;
|
||||
/* 0x18 */ u16* field_0x18;
|
||||
/* 0x1C */ u16 mFlow;
|
||||
/* 0x1E */ u8 field_0x1e[2];
|
||||
/* 0x20 */ u32 mMsg;
|
||||
/* 0x24 */ u8 mSelectMessage;
|
||||
/* 0x25 */ u8 field_0x25;
|
||||
|
|
@ -189,14 +212,14 @@ private:
|
|||
/* 0x34 */ int field_0x34;
|
||||
/* 0x38 */ u16 field_0x38;
|
||||
/* 0x3A */ u16 mChoiceNo;
|
||||
/* 0x3C */ s32 field_0x3c;
|
||||
/* 0x3C */ s32 mTimer;
|
||||
/* 0x40 */ u8 field_0x40;
|
||||
/* 0x41 */ u8 field_0x41;
|
||||
/* 0x42 */ u8 field_0x42;
|
||||
/* 0x43 */ u8 field_0x43;
|
||||
/* 0x44 */ u8 field_0x44;
|
||||
/* 0x45 */ u8 field_0x45;
|
||||
/* 0x46 */ u8 field_0x46;
|
||||
/* 0x46 */ u8 mSelType;
|
||||
/* 0x47 */ u8 field_0x47;
|
||||
/* 0x48 */ u8 mNonStopJunpFlowFlag;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -239,6 +239,16 @@ public:
|
|||
u8 getArrowNumLocal() { return mArrowNum; }
|
||||
u8 isNoDemoFlag() { return mNoDemoFlag; }
|
||||
|
||||
static void setWord(const char* i_word);
|
||||
void setWordLocal(const char* i_word) {
|
||||
strcpy(mWord, i_word);
|
||||
}
|
||||
|
||||
static void setSelectWord(int i_no, const char* i_word);
|
||||
void setSelectWordLocal(int i_no, const char* i_word) {
|
||||
strcpy(mSelectWord[i_no], i_word);
|
||||
}
|
||||
|
||||
jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; }
|
||||
|
||||
/* 0x0FC */ int field_0xfc;
|
||||
|
|
@ -401,7 +411,7 @@ inline void dMsgObject_setShopWaitTimer(u8 timer) {
|
|||
}
|
||||
|
||||
inline void dMsgObject_changeFlowGroup(long flow) {
|
||||
dMsgObject_c::changeFlowGroup(flow);
|
||||
dMsgObject_getMsgObjectClass()->changeFlowGroup(flow);
|
||||
}
|
||||
|
||||
inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) {
|
||||
|
|
@ -505,6 +515,34 @@ inline void dMsgObject_setPortalMessageID(u16 id) {
|
|||
dMsgObject_getMsgObjectClass()->setPortalMessageID(id);
|
||||
}
|
||||
|
||||
inline void dMsgObject_setWord(const char* i_word) {
|
||||
dMsgObject_getMsgObjectClass()->setWord(i_word);
|
||||
}
|
||||
|
||||
inline void dMsgObject_setSelectWord(int i_no, const char* i_word) {
|
||||
dMsgObject_getMsgObjectClass()->setSelectWord(i_no, i_word);
|
||||
}
|
||||
|
||||
inline u8* dMsgObject_getMsgDtPtr() {
|
||||
return (u8*)dMsgObject_getMsgObjectClass()->getMsgDtPtr();
|
||||
}
|
||||
|
||||
inline void dMsgObject_setSelectCancelPos(u8 param_0) {
|
||||
dMsgObject_getMsgObjectClass()->setSelectCancelPos(param_0);
|
||||
}
|
||||
|
||||
inline void dMsgObject_setSelectCursorPos(u8 param_0) {
|
||||
dMsgObject_getMsgObjectClass()->setSelectCursorPos(param_0);
|
||||
}
|
||||
|
||||
inline u8 dMsgObject_getSelectBombBagID() {
|
||||
dMsgObject_getMsgObjectClass()->getSelectBombBagID();
|
||||
}
|
||||
|
||||
inline s16 dMsgObject_getSelectBombPrice() {
|
||||
dMsgObject_getMsgObjectClass()->getSelectBombPrice();
|
||||
}
|
||||
|
||||
class dMsgObject_HowlHIO_c {
|
||||
public:
|
||||
/* 80232AEC */ dMsgObject_HowlHIO_c();
|
||||
|
|
@ -681,7 +719,7 @@ public:
|
|||
/* 0x31A */ s16 mHaloDelayFrame;
|
||||
/* 0x31C */ s16 mHaloDelayFrameSpirit;
|
||||
/* 0x31E */ bool mSaveSeqMsgDebug;
|
||||
/* 0x31F */ bool mMsgDebug;
|
||||
/* 0x31F */ u8 mMsgDebug;
|
||||
/* 0x320 */ bool mTextColorDebug;
|
||||
/* 0x321 */ u8
|
||||
mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange,
|
||||
|
|
|
|||
|
|
@ -394,7 +394,7 @@ public:
|
|||
void offCollectMirror(u8 i_item);
|
||||
BOOL isCollectMirror(u8 i_item) const;
|
||||
|
||||
u8 getPohNum() { return mPohNum; }
|
||||
u8 getPohNum() const { return mPohNum; }
|
||||
|
||||
private:
|
||||
/* 0x0 */ u8 mItem[8];
|
||||
|
|
|
|||
|
|
@ -1416,6 +1416,10 @@ inline u8 dStage_FileList_dt_GRASSLIGHT(dStage_FileList_dt_c* p_fList) {
|
|||
return (p_fList->mParameters >> 7) & 0xFF;
|
||||
}
|
||||
|
||||
inline u16 dStage_FileList_dt_GetMsg(dStage_FileList_dt_c* p_fList) {
|
||||
return p_fList->mMsg;
|
||||
}
|
||||
|
||||
inline f32 dStage_FileList2_dt_GetLeftRmX(dStage_FileList2_dt_c* p_fList2) {
|
||||
return p_fList2->mLeftRmX;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -260,8 +260,8 @@ void daNpcKakashi_setSwdTutorialResult(bool param_0) {
|
|||
}
|
||||
|
||||
/* 800317A4-800317DC 02C0E4 0038+00 0/0 1/1 1/1 .text daNpcKakashi_getSuccessCount__Fv */
|
||||
int daNpcKakashi_getSuccessCount() {
|
||||
return dComIfGs_getTmpReg(0xFEFF);
|
||||
u8 daNpcKakashi_getSuccessCount() {
|
||||
return dComIfGs_getTmpReg(0xFEFF) & 0xFF;
|
||||
}
|
||||
|
||||
/* 800317DC-80031838 02C11C 005C+00 0/0 0/0 1/1 .text daNpcKakashi_incSuccessCount__Fv */
|
||||
|
|
|
|||
2324
src/d/d_msg_flow.cpp
2324
src/d/d_msg_flow.cpp
File diff suppressed because it is too large
Load Diff
|
|
@ -1219,11 +1219,11 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
|
|||
|
||||
i_flow->doFlow(actor, NULL, 0);
|
||||
|
||||
int select_num = i_flow->getSelectNum();
|
||||
u16 select_num = i_flow->getSelectNum();
|
||||
if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 &&
|
||||
dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20)
|
||||
{
|
||||
if ((u16)select_num == 0) {
|
||||
if (select_num == 0) {
|
||||
setSeq(SEQ_DECIDE_YES);
|
||||
} else {
|
||||
setSeq(SEQ_DECIDE_NO);
|
||||
|
|
|
|||
Loading…
Reference in New Issue