mirror of
https://github.com/zeldaret/tww.git
synced 2026-05-23 06:54:16 -04:00
d_a_npc_people Almost OK (#658)
* daNpcPeople Work * Oops Somehow I break this file every time I touch it
This commit is contained in:
SuperDude88
@@ -30,8 +30,8 @@ public:
|
||||
mNowDaizaNum = 0;
|
||||
mNowItemNum = 0;
|
||||
}
|
||||
static s8 getMaxDaiza();
|
||||
static s8 getDaizaSetItemNum();
|
||||
static int getMaxDaiza();
|
||||
static int getDaizaSetItemNum();
|
||||
|
||||
static s8 mNowDaizaNum;
|
||||
static s8 mNowItemNum;
|
||||
|
||||
@@ -13,7 +13,10 @@ class J3DMaterialTable;
|
||||
|
||||
class kb_class : public fopAc_ac_c {
|
||||
public:
|
||||
void taura_pos_set(cXyz) {}
|
||||
void taura_pos_set(cXyz pos) {
|
||||
m450 = pos;
|
||||
m408 = 1;
|
||||
}
|
||||
|
||||
public:
|
||||
/* 0x290 */ dKy_tevstr_c mTevStr;
|
||||
@@ -38,7 +41,8 @@ public:
|
||||
/* 0x42A */ s16 m42A;
|
||||
/* 0x42C */ u8 m42C[0x446 - 0x42C];
|
||||
/* 0x446 */ s16 m446;
|
||||
/* 0x448 */ u8 m448[0x45C - 0x448];
|
||||
/* 0x448 */ u8 m448[0x450 - 0x448];
|
||||
/* 0x450 */ cXyz m450;
|
||||
/* 0x45C */ f32 m45C;
|
||||
/* 0x460 */ u8 m460[0x464 - 0x460];
|
||||
/* 0x464 */ f32 m464;
|
||||
|
||||
+175
-111
@@ -8,66 +8,118 @@
|
||||
#include "d/d_npc.h"
|
||||
|
||||
struct sUbMsgDat {
|
||||
|
||||
};
|
||||
/* 0x00 */ u32 field_0x00;
|
||||
/* 0x04 */ u8 field_0x04;
|
||||
/* 0x05 */ u8 field_0x05;
|
||||
/* 0x06 */ u8 field_0x06;
|
||||
/* 0x06 */ u8 field_0x07;
|
||||
}; // Size: 0x07
|
||||
|
||||
struct sPeopleAnmDat {
|
||||
|
||||
};
|
||||
/* 0x00 */ u8 field_0x00;
|
||||
/* 0x01 */ u8 field_0x01;
|
||||
/* 0x02 */ u8 field_0x02;
|
||||
}; // Size: 0x03
|
||||
|
||||
struct daNpcPeople_c__l_npc_dat {
|
||||
|
||||
};
|
||||
/* 0x00 */ s16 field_0x00;
|
||||
/* 0x02 */ s16 field_0x02;
|
||||
/* 0x04 */ s16 field_0x04;
|
||||
/* 0x06 */ s16 field_0x06;
|
||||
/* 0x08 */ s16 field_0x08;
|
||||
/* 0x0A */ s16 field_0x0A;
|
||||
/* 0x0C */ s16 field_0x0C;
|
||||
/* 0x0E */ s16 field_0x0E;
|
||||
/* 0x10 */ s16 field_0x10;
|
||||
/* 0x12 */ s16 field_0x12;
|
||||
/* 0x14 */ f32 field_0x14;
|
||||
/* 0x18 */ f32 field_0x18;
|
||||
/* 0x1C */ f32 field_0x1C;
|
||||
/* 0x20 */ f32 field_0x20;
|
||||
/* 0x24 */ f32 field_0x24;
|
||||
/* 0x28 */ f32 field_0x28;
|
||||
/* 0x2C */ f32 field_0x2C;
|
||||
/* 0x30 */ f32 field_0x30;
|
||||
/* 0x34 */ s16 field_0x34;
|
||||
/* 0x36 */ s16 field_0x36;
|
||||
/* 0x38 */ s16 field_0x38;
|
||||
/* 0x3A */ s16 field_0x3A;
|
||||
/* 0x3C */ f32 field_0x3C;
|
||||
/* 0x40 */ f32 field_0x40;
|
||||
/* 0x44 */ f32 field_0x44;
|
||||
/* 0x48 */ f32 field_0x48;
|
||||
/* 0x4C */ s16 field_0x4C;
|
||||
/* 0x4E */ s16 field_0x4E;
|
||||
/* 0x50 */ s16 field_0x50;
|
||||
/* 0x52 */ s16 field_0x52;
|
||||
/* 0x54 */ s16 field_0x54;
|
||||
/* 0x56 */ s16 field_0x56;
|
||||
/* 0x58 */ s16 field_0x58;
|
||||
/* 0x5A */ u8 field_0x5A;
|
||||
/* 0x5B */ u8 field_0x5B;
|
||||
/* 0x5C */ u8 field_0x5C;
|
||||
/* 0x5D */ u8 field_0x5D;
|
||||
/* 0x5E */ u8 field_0x5E;
|
||||
/* 0x5F */ u8 field_0x5F;
|
||||
}; // Size: 0x60
|
||||
|
||||
class daNpcPeople_c : public fopAc_ac_c {
|
||||
class daNpcPeople_c : public fopNpc_npc_c {
|
||||
public:
|
||||
void getNpcNo() {}
|
||||
void getPhaseP() {}
|
||||
void setAnmFlag(unsigned char) {}
|
||||
void setEtcFlag(unsigned long) {}
|
||||
void setNoTalk(unsigned char) {}
|
||||
void setOrderEventNum(unsigned char) {}
|
||||
void setResFlag(unsigned char) {}
|
||||
void setTalk(unsigned char) {}
|
||||
enum Prm_e {
|
||||
PRM_RAIL_ID_W = 0x8,
|
||||
PRM_RAIL_ID_S = 0x10,
|
||||
|
||||
PRM_ARG0_W = 0x8,
|
||||
PRM_ARG0_S = 0x0,
|
||||
};
|
||||
|
||||
u8 getNpcNo() { return mNpcType; }
|
||||
request_of_phase_process_class* getPhaseP() { return &mPhs; }
|
||||
void setAnmFlag(u8) {}
|
||||
void setEtcFlag(u32 flags) { m758 |= flags; }
|
||||
void setNoTalk(u8) {}
|
||||
void setOrderEventNum(u8) {}
|
||||
void setResFlag(u8 flag) { m790 = flag; }
|
||||
void setTalk(u8) {}
|
||||
|
||||
daNpcPeople_c();
|
||||
s32 _create();
|
||||
void createHeap();
|
||||
void createInit();
|
||||
BOOL _delete();
|
||||
BOOL _draw();
|
||||
BOOL _execute();
|
||||
void executeCommon();
|
||||
void executeSetMode(unsigned char);
|
||||
void executeWaitInit();
|
||||
BOOL createHeap();
|
||||
s32 createInit();
|
||||
bool _delete();
|
||||
bool _draw();
|
||||
bool _execute();
|
||||
bool executeCommon();
|
||||
void executeSetMode(u8);
|
||||
s32 executeWaitInit();
|
||||
void executeWait();
|
||||
void executeTalkInit();
|
||||
s32 executeTalkInit();
|
||||
void executeTalk();
|
||||
void executeWalkInit();
|
||||
s32 executeWalkInit();
|
||||
void executeWalk();
|
||||
void executeTurnInit();
|
||||
s32 executeTurnInit();
|
||||
void executeTurn();
|
||||
void executeBikkuriInit();
|
||||
s32 executeBikkuriInit();
|
||||
void executeBikkuri();
|
||||
void executeFurueInit();
|
||||
s32 executeFurueInit();
|
||||
void executeFurue();
|
||||
void executeKyoroInit();
|
||||
s32 executeKyoroInit();
|
||||
void executeKyoro();
|
||||
void executeLetterInit();
|
||||
s32 executeLetterInit();
|
||||
void executeLetter();
|
||||
void executeLookInit();
|
||||
s32 executeLookInit();
|
||||
void executeLook();
|
||||
void executeLook2Init();
|
||||
s32 executeLook2Init();
|
||||
void executeLook2();
|
||||
void executeUgWalkInit();
|
||||
s32 executeUgWalkInit();
|
||||
void executeUgWalk();
|
||||
void executeUgTurnInit();
|
||||
s32 executeUgTurnInit();
|
||||
void executeUgTurn();
|
||||
void executeUgLookInit();
|
||||
s32 executeUgLookInit();
|
||||
void executeUgLook();
|
||||
void executeUgLook2Init();
|
||||
s32 executeUgLook2Init();
|
||||
void executeUgLook2();
|
||||
void executeUgSitInit();
|
||||
s32 executeUgSitInit();
|
||||
void executeUgSit();
|
||||
void checkOrder();
|
||||
void eventOrder();
|
||||
@@ -75,34 +127,34 @@ public:
|
||||
void privateCut();
|
||||
void eventMesSetTpInit(int);
|
||||
void eventMesSetInit(int);
|
||||
void eventMesSet();
|
||||
void eventMesSet2();
|
||||
bool eventMesSet();
|
||||
bool eventMesSet2();
|
||||
void eventFlagSetInit(int);
|
||||
void eventGetItemInit(int);
|
||||
void eventGetItem();
|
||||
bool eventGetItem();
|
||||
void eventTurnToPlayerInit();
|
||||
void eventTurnToPlayer();
|
||||
bool eventTurnToPlayer();
|
||||
void eventUb1TalkInit(int);
|
||||
void eventUb1Talk();
|
||||
bool eventUb1Talk();
|
||||
void eventUb1TalkXyInit(int);
|
||||
void eventUb1TalkXy();
|
||||
void eventUb2Talk();
|
||||
void eventUbSetAnm();
|
||||
bool eventUb1TalkXy();
|
||||
bool eventUb2Talk();
|
||||
bool eventUbSetAnm();
|
||||
void eventAreaMaxInit();
|
||||
void eventCameraStopInit();
|
||||
void eventCameraStop();
|
||||
bool eventCameraStop();
|
||||
void eventCameraStartInit();
|
||||
void eventCoCylRInit(int);
|
||||
void eventLookPo();
|
||||
bool eventLookPo();
|
||||
void eventMesSetPoInit(int);
|
||||
void eventMesSetPo();
|
||||
void talk2(int, fopAc_ac_c*);
|
||||
void talk3(int);
|
||||
void next_msgStatus(unsigned long*);
|
||||
void getMsg();
|
||||
void getMsg3();
|
||||
bool eventMesSetPo();
|
||||
u16 talk2(int, fopAc_ac_c*);
|
||||
u16 talk3(int);
|
||||
u16 next_msgStatus(u32*);
|
||||
u32 getMsg();
|
||||
u32 getMsg3();
|
||||
void chkMsg();
|
||||
void setMessage(unsigned long);
|
||||
void setMessage(u32);
|
||||
void setMessageUb(sUbMsgDat*);
|
||||
void setAnmFromMsgTag();
|
||||
void setAnmFromMsgTagUo(int);
|
||||
@@ -111,81 +163,84 @@ public:
|
||||
void setAnmFromMsgTagUm(int);
|
||||
void setAnmFromMsgTagSa(int);
|
||||
void setAnmFromMsgTagUg(int);
|
||||
void getPrmNpcNo();
|
||||
void getPrmRailID();
|
||||
void getPrmArg0();
|
||||
u8 getPrmNpcNo();
|
||||
u8 getPrmRailID();
|
||||
u8 getPrmArg0();
|
||||
void setMtx();
|
||||
void chkAttention();
|
||||
void lookBack();
|
||||
void initTexPatternAnm(bool);
|
||||
BOOL initTexPatternAnm(bool);
|
||||
void playTexPatternAnm();
|
||||
void playAnm();
|
||||
void getBck(unsigned char);
|
||||
void getHeadBck(unsigned char);
|
||||
void setAnm(unsigned char, int, float, float);
|
||||
void setAnmTbl(sPeopleAnmDat*, int);
|
||||
int getBck(u8);
|
||||
int getHeadBck(u8);
|
||||
void setAnm(u8, int, f32, f32);
|
||||
bool setAnmTbl(sPeopleAnmDat*, int);
|
||||
void setWaitAnm();
|
||||
void XyCheckCB(int);
|
||||
void XyEventCB(int);
|
||||
void photoCB(int);
|
||||
void getRand(int);
|
||||
void isPhoto(unsigned char);
|
||||
void isColor();
|
||||
void setCollision(dCcD_Cyl*, cXyz, float, float);
|
||||
void chkSurprise();
|
||||
void chkEndEvent();
|
||||
void is1GetMap20();
|
||||
void is1DayGetMap20();
|
||||
void getWindDir();
|
||||
void isUo1FdaiAll();
|
||||
void isUo1FdaiOne();
|
||||
void chkDaiza();
|
||||
void checkPig();
|
||||
void isPigOk();
|
||||
void getPigTimer();
|
||||
s16 XyCheckCB(int);
|
||||
s16 XyEventCB(int);
|
||||
s16 photoCB(int);
|
||||
int getRand(int max);
|
||||
BOOL isPhoto(u8);
|
||||
BOOL isColor();
|
||||
void setCollision(dCcD_Cyl*, cXyz, f32, f32);
|
||||
BOOL chkSurprise();
|
||||
BOOL chkEndEvent();
|
||||
BOOL is1GetMap20();
|
||||
BOOL is1DayGetMap20();
|
||||
int getWindDir();
|
||||
BOOL isUo1FdaiAll();
|
||||
BOOL isUo1FdaiOne();
|
||||
s32 chkDaiza();
|
||||
BOOL checkPig();
|
||||
BOOL isPigOk();
|
||||
s16 getPigTimer();
|
||||
void resetPig();
|
||||
void initUgSearchArea();
|
||||
void getDirDistToPos(short, float);
|
||||
cXyz getDirDistToPos(s16, f32);
|
||||
void warp();
|
||||
|
||||
public:
|
||||
/* 0x6C4 */ u8 m6C4[0x6CC - 0x6C4];
|
||||
/* 0x6CC */ request_of_phase_process_class mPhs;
|
||||
/* 0x6D4 */ u8 m6D4[0x6E4 - 0x6D4];
|
||||
/* 0x6C4 */ request_of_phase_process_class mPhs;
|
||||
/* 0x6CC */ request_of_phase_process_class mPhs2;
|
||||
/* 0x6D4 */ J3DModel* m6D4;
|
||||
/* 0x6D8 */ J3DModel* m6D8;
|
||||
/* 0x6DC */ mDoExt_McaMorf* m6DC;
|
||||
/* 0x6E0 */ J3DAnmTexPattern* m_head_tex_pattern;
|
||||
/* 0x6E4 */ mDoExt_btpAnm mBtpAnm;
|
||||
/* 0x6F8 */ u8 m6F8[0x6FC - 0x6F8];
|
||||
/* 0x6F8 */ u32 mShadowId;
|
||||
/* 0x6FC */ dNpc_PathRun_c mPathRun;
|
||||
/* 0x704 */ u8 m704[0x710 - 0x704];
|
||||
/* 0x710 */ cXyz mLookAtPos;
|
||||
/* 0x71C */ cXyz m71C;
|
||||
/* 0x728 */ u8 m728[0x72C - 0x728];
|
||||
/* 0x728 */ sPeopleAnmDat* m728;
|
||||
/* 0x72C */ daNpcPeople_c__l_npc_dat* mpNpcDat;
|
||||
/* 0x730 */ int m730;
|
||||
/* 0x734 */ u8 m734[0x738 - 0x734];
|
||||
/* 0x738 */ int m738;
|
||||
/* 0x73C */ u8 m73C[0x740 - 0x73C];
|
||||
/* 0x730 */ daNpcPeople_c* m730;
|
||||
/* 0x734 */ u32* m734;
|
||||
/* 0x738 */ sUbMsgDat* m738;
|
||||
/* 0x73C */ sUbMsgDat** m73C;
|
||||
/* 0x740 */ f32 m740;
|
||||
/* 0x744 */ f32 m744;
|
||||
/* 0x748 */ f32 m748;
|
||||
/* 0x74C */ f32 m74C;
|
||||
/* 0x750 */ u8 m750[0x758 - 0x750];
|
||||
/* 0x750 */ f32 m750;
|
||||
/* 0x754 */ u8 m754[0x758 - 0x754];
|
||||
/* 0x758 */ u32 m758;
|
||||
/* 0x75C */ u8 m75C[0x760 - 0x75C];
|
||||
/* 0x75C */ int m75C;
|
||||
/* 0x760 */ int m760;
|
||||
/* 0x764 */ u8 m764;
|
||||
/* 0x765 */ u8 m765[0x766 - 0x765];
|
||||
/* 0x766 */ s16 m766;
|
||||
/* 0x768 */ s16 m768;
|
||||
/* 0x76A */ u8 m76A[0x76C - 0x76A];
|
||||
/* 0x76C */ s16 m76C;
|
||||
/* 0x764 */ bool m764;
|
||||
/* 0x765 */ u8 m765;
|
||||
/* 0x766 */ s16 m766[4];
|
||||
/* 0x76E */ s16 m76E;
|
||||
/* 0x770 */ u8 m770[0x776 - 0x770];
|
||||
/* 0x770 */ s16 m770;
|
||||
/* 0x772 */ s16 m772;
|
||||
/* 0x774 */ s16 m774;
|
||||
/* 0x776 */ s16 m776;
|
||||
/* 0x778 */ s16 m778;
|
||||
/* 0x77A */ s16 m77A;
|
||||
/* 0x77C */ u8 m77C[0x77E - 0x77C];
|
||||
/* 0x77C */ u16 m77C;
|
||||
/* 0x77E */ u16 m77E;
|
||||
/* 0x780 */ u8 m780[0x782 - 0x780];
|
||||
/* 0x780 */ s16 m780;
|
||||
/* 0x782 */ s16 m782;
|
||||
/* 0x784 */ s16 m784;
|
||||
/* 0x786 */ s16 m786;
|
||||
@@ -195,26 +250,35 @@ public:
|
||||
/* 0x78B */ u8 m78B;
|
||||
/* 0x78C */ u8 m78C;
|
||||
/* 0x78D */ u8 m78D;
|
||||
/* 0x78E */ u8 m78E[0x78F - 0x78E];
|
||||
/* 0x78E */ u8 m78E;
|
||||
/* 0x78F */ u8 m78F;
|
||||
/* 0x790 */ u8 m790;
|
||||
/* 0x791 */ u8 mNpcType;
|
||||
/* 0x792 */ u8 m792[0x793 - 0x792];
|
||||
/* 0x792 */ u8 m792;
|
||||
/* 0x793 */ u8 m793;
|
||||
/* 0x794 */ u8 m794;
|
||||
/* 0x795 */ u8 m795[0x799 - 0x795];
|
||||
/* 0x799 */ u8 m799;
|
||||
/* 0x79A */ u8 m79A[0x79B - 0x79A];
|
||||
/* 0x79B */ bool mbIsNight;
|
||||
/* 0x795 */ u8 m795;
|
||||
/* 0x796 */ s8 m796;
|
||||
/* 0x797 */ s8 m797;
|
||||
/* 0x798 */ u8 m798;
|
||||
/* 0x799 */ s8 m799;
|
||||
/* 0x79A */ u8 m79A;
|
||||
/* 0x79B */ u8 mbIsNight;
|
||||
/* 0x79C */ u8 m79C;
|
||||
/* 0x79D */ u8 m79D;
|
||||
/* 0x79E */ u8 m79E;
|
||||
/* 0x79F */ u8 m79F;
|
||||
/* 0x7A0 */ u8 m7A0[0x7A1 - 0x7A0];
|
||||
/* 0x7A0 */ u8 m7A0;
|
||||
/* 0x7A1 */ u8 m7A1;
|
||||
/* 0x7A2 */ u8 m7A2[0x7A6 - 0x7A2];
|
||||
/* 0x7A2 */ u8 m7A2;
|
||||
/* 0x7A3 */ s8 m7A3;
|
||||
/* 0x7A4 */ u8 m7A4;
|
||||
/* 0x7A5 */ u8 m7A5;
|
||||
/* 0x7A6 */ u8 m7A6;
|
||||
/* 0x7A7 */ u8 m7A7[0x7AC - 0x7A7];
|
||||
};
|
||||
/* 0x7A7 */ u8 m7A7;
|
||||
/* 0x7A8 */ u8 m7A8;
|
||||
|
||||
static const char m_arcname[];
|
||||
}; // Size: 0x7A9
|
||||
|
||||
#endif /* D_A_NPC_PEOPLE_H */
|
||||
|
||||
@@ -356,8 +356,6 @@ public:
|
||||
void SetExtendedPosition(cXyz*);
|
||||
void ScopeViewMsgModeOff();
|
||||
|
||||
void setFlag(u32);
|
||||
void chkFlag(u32);
|
||||
void Bank();
|
||||
void Up();
|
||||
void Center();
|
||||
@@ -402,12 +400,14 @@ public:
|
||||
void bSplineEvCamera();
|
||||
void twoActor0EvCamera();
|
||||
|
||||
void CStickUse() {}
|
||||
void CStickUseless() {}
|
||||
void CStickUse() { clrFlag(0x800000); }
|
||||
void CStickUseless() { setFlag(0x800000); }
|
||||
cXyz Eye() { return mEye + mEyeShake; }
|
||||
void StickUse() {}
|
||||
void StickUseless() {}
|
||||
void clrFlag(u32) {}
|
||||
void StickUse() { clrFlag(0x1000000); }
|
||||
void StickUseless() { setFlag(0x1000000); }
|
||||
void setFlag(u32 flag) { mEventFlags |= flag; }
|
||||
bool chkFlag(u32 flag) { return mEventFlags & flag; }
|
||||
void clrFlag(u32 flag) { mEventFlags &= ~flag; }
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(dCamera_c) == 0x800);
|
||||
|
||||
+79
-10
@@ -279,6 +279,12 @@ public:
|
||||
mpPlayer[idx] = (daPy_py_c*)player;
|
||||
mCurCamera[idx] = cam;
|
||||
}
|
||||
|
||||
int getItemTimer() { return mItemTimer; }
|
||||
void resetItemTimer(s16 timer) {
|
||||
mItemTimer = timer;
|
||||
mStartItemTimer = false;
|
||||
}
|
||||
|
||||
int getMessageRupee() { return mMessageRupee; }
|
||||
|
||||
@@ -368,6 +374,9 @@ public:
|
||||
void setItemTimeCount(s32 time) { mAirMeter = time; }
|
||||
void setItemTimeMax(s32 time) { field_0x4928 = time; }
|
||||
|
||||
u8 getScopeType() { return mScopeType; }
|
||||
void setScopeType(u8 type) { mScopeType = type; }
|
||||
|
||||
u8 checkMesgSendButton() { return mMesgSendButton; }
|
||||
u8 checkMesgCancelButton() { return mMesgCancelButton; }
|
||||
|
||||
@@ -397,9 +406,10 @@ public:
|
||||
void setDoStatusForce(u8 value) { field_0x4932 = value; }
|
||||
u8 getPictureStatus() { return mPictureStatus; }
|
||||
void setPictureStatusOn() { mPictureStatus = 2; }
|
||||
|
||||
u8 getScopeMesgStatus() { return mbCamOverrideFarPlane; }
|
||||
void setScopeMesgStatus(u8 status) { mbCamOverrideFarPlane = status; }
|
||||
|
||||
u8 getScopeType() { return mbCamOverrideFarPlane; }
|
||||
void setScopeType(u8 v) { mbCamOverrideFarPlane = v; }
|
||||
void setCameraInfo(int idx, camera_class* camera_p, int dlst_window_idx, int cam_idx, int p5) {
|
||||
mCameraInfo[idx].mpCamera = camera_p;
|
||||
mCameraInfo[idx].mDlstWindowIdx = dlst_window_idx;
|
||||
@@ -480,8 +490,13 @@ public:
|
||||
u8 mask = (1 << i);
|
||||
mPictureFlag &= ~mask;
|
||||
}
|
||||
u8 getPictureFormat() { return mPictureFormat; }
|
||||
u8 getPictureResult() { return mPictureResult; }
|
||||
u8 getPictureResultDetail() { return mPictureResultDetail; }
|
||||
void setBossBattleData(JKRAramBlock* aramHeap, int i) { mBossBattleDataHeap[i] = aramHeap; }
|
||||
|
||||
void startItemTimer() { mStartItemTimer = true; }
|
||||
|
||||
void stopFwaterTimer() { mFwaterTimer = 0; }
|
||||
u8 checkFwaterTimer() { return mFwaterTimer; }
|
||||
|
||||
@@ -504,6 +519,7 @@ public:
|
||||
void setMelodyNum(u8 melody) { mMelodyNum = melody; }
|
||||
|
||||
u8 getBaseAnimeID() { return mMesgAnime; }
|
||||
void setBaseAnimeID(u8 id) { mMesgAnime = id; }
|
||||
void clearBaseAnimeID() { mMesgAnime = 0xFF; }
|
||||
u8 getNowAnimeID() { return mMesgAnimeTagInfo; }
|
||||
void clearNowAnimeID() { mMesgAnimeTagInfo = 0xFF; }
|
||||
@@ -605,7 +621,7 @@ public:
|
||||
/* 0x491C */ s16 mMessageRupee;
|
||||
/* 0x491E */ s16 mAuctionRupee;
|
||||
/* 0x4920 */ s16 mAuctionGauge;
|
||||
/* 0x4922 */ s16 field_0x4922;
|
||||
/* 0x4922 */ s16 mItemTimer;
|
||||
/* 0x4924 */ s16 mCurrHP;
|
||||
/* 0x4926 */ s16 mRupyCountDisplay;
|
||||
/* 0x4928 */ u8 field_0x4928;
|
||||
@@ -631,7 +647,7 @@ public:
|
||||
/* 0x4942 */ u8 mButtonMode;
|
||||
/* 0x4943 */ u8 field_0x4943;
|
||||
/* 0x4944 */ u8 field_0x4944;
|
||||
/* 0x4945 */ u8 field_0x4945;
|
||||
/* 0x4945 */ u8 mScopeType;
|
||||
/* 0x4946 */ u8 field_0x4946;
|
||||
/* 0x4947 */ u8 field_0x4947;
|
||||
/* 0x4948 */ u8 mMesgSendButton;
|
||||
@@ -642,18 +658,18 @@ public:
|
||||
/* 0x4952 */ u8 field_0x4952;
|
||||
/* 0x4953 */ u8 field_0x4953;
|
||||
/* 0x4954 */ u8 field_0x4954;
|
||||
/* 0x4955 */ u8 field_0x4955;
|
||||
/* 0x4955 */ bool mStartItemTimer;
|
||||
/* 0x4956 */ u8 mFwaterTimer;
|
||||
/* 0x4957 */ u8 mPlacenameIndex;
|
||||
/* 0x4958 */ u8 mPlacenameState;
|
||||
/* 0x4959 */ u8 mGameoverStatus;
|
||||
/* 0x495A */ u8 field_0x495a;
|
||||
/* 0x495B */ u8 mPictureFlag;
|
||||
/* 0x495C */ u8 field_0x495c;
|
||||
/* 0x495D */ u8 field_0x495d;
|
||||
/* 0x495C */ u8 mPictureResult;
|
||||
/* 0x495D */ u8 mPictureResultDetail;
|
||||
/* 0x495E */ u8 mPictureStatus;
|
||||
/* 0x495F */ u8 field_0x495f;
|
||||
/* 0x4960 */ u8 field_0x4960;
|
||||
/* 0x4960 */ u8 mPictureFormat;
|
||||
/* 0x4961 */ u8 field_0x4961;
|
||||
/* 0x4962 */ u8 mHeapLockFlag;
|
||||
/* 0x4963 */ u8 field_0x4963;
|
||||
@@ -765,6 +781,14 @@ inline int dComIfGs_getRupee() {
|
||||
return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusA().getRupee();
|
||||
}
|
||||
|
||||
inline int dComIfGp_getItemTimer() {
|
||||
return g_dComIfG_gameInfo.play.getItemTimer();
|
||||
}
|
||||
|
||||
inline void dComIfGp_resetItemTimer(s16 timer) {
|
||||
g_dComIfG_gameInfo.play.resetItemTimer(timer);
|
||||
}
|
||||
|
||||
inline int dComIfGp_getMessageRupee() {
|
||||
return g_dComIfG_gameInfo.play.getMessageRupee();
|
||||
}
|
||||
@@ -1027,6 +1051,10 @@ inline void dComIfGs_offEventBit(u16 id) {
|
||||
g_dComIfG_gameInfo.save.getEvent().offEventBit(id);
|
||||
}
|
||||
|
||||
inline BOOL dComIfGs_isTmpBit(u16 id) {
|
||||
return g_dComIfG_gameInfo.save.getTmp().isEventBit(id);
|
||||
}
|
||||
|
||||
inline void dComIfGs_onTmpBit(u16 id) {
|
||||
g_dComIfG_gameInfo.save.getTmp().onEventBit(id);
|
||||
}
|
||||
@@ -1035,6 +1063,14 @@ inline void dComIfGs_offTmpBit(u16 id) {
|
||||
g_dComIfG_gameInfo.save.getTmp().offEventBit(id);
|
||||
}
|
||||
|
||||
inline void dComIfGs_setTmpReg(u16 id, u8 no) {
|
||||
g_dComIfG_gameInfo.save.getTmp().setEventReg(id, no);
|
||||
}
|
||||
|
||||
inline u8 dComIfGs_getTmpReg(u16 id) {
|
||||
return g_dComIfG_gameInfo.save.getTmp().getEventReg(id);
|
||||
}
|
||||
|
||||
inline s16 dComIfGs_getStartPoint() {
|
||||
return g_dComIfG_gameInfo.save.getRestart().getStartPoint();
|
||||
}
|
||||
@@ -1689,6 +1725,10 @@ stage_scls_info_class* dComIfGd_getMeshSceneList(Vec& vec);
|
||||
|
||||
BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo);
|
||||
|
||||
inline void dComIfGp_startItemTimer() {
|
||||
g_dComIfG_gameInfo.play.startItemTimer();
|
||||
}
|
||||
|
||||
inline void dComIfGs_stopFwaterTimer() {
|
||||
g_dComIfG_gameInfo.play.stopFwaterTimer();
|
||||
}
|
||||
@@ -2265,6 +2305,14 @@ inline s16 dComIfGp_getItemBeastNumCount(int i_idx) {
|
||||
return g_dComIfG_gameInfo.play.getItemBeastNumCount(i_idx);
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getScopeType() {
|
||||
return g_dComIfG_gameInfo.play.getScopeType();
|
||||
}
|
||||
|
||||
inline void dComIfGp_setScopeType(u8 type) {
|
||||
g_dComIfG_gameInfo.play.setScopeType(type);
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_checkMesgSendButton() {
|
||||
return g_dComIfG_gameInfo.play.checkMesgSendButton();
|
||||
}
|
||||
@@ -2341,8 +2389,13 @@ inline void dComIfGp_setItem(u8 slot, u8 i_itemNo) {
|
||||
g_dComIfG_gameInfo.play.setItem(slot, i_itemNo);
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getScopeType() { return g_dComIfG_gameInfo.play.getScopeType(); }
|
||||
inline void dComIfGp_setScopeType(u8 v) { g_dComIfG_gameInfo.play.setScopeType(v); }
|
||||
inline u8 dComIfGp_getScopeMesgStatus() {
|
||||
return g_dComIfG_gameInfo.play.getScopeMesgStatus();
|
||||
}
|
||||
|
||||
inline void dComIfGp_setScopeMesgStatus(u8 status) {
|
||||
g_dComIfG_gameInfo.play.setScopeMesgStatus(status);
|
||||
}
|
||||
|
||||
inline void dComIfGp_setCurrentGrafPort(J2DOrthoGraph* i_graf) {
|
||||
g_dComIfG_gameInfo.play.setCurrentGrafPort(i_graf);
|
||||
@@ -2468,6 +2521,10 @@ inline u8 dComIfGp_getMesgAnimeAttrInfo() {
|
||||
return g_dComIfG_gameInfo.play.getBaseAnimeID();
|
||||
}
|
||||
|
||||
inline void dComIfGp_setMesgAnimeAttrInfo(u8 id) {
|
||||
g_dComIfG_gameInfo.play.setBaseAnimeID(id);
|
||||
}
|
||||
|
||||
inline void dComIfGp_clearMesgAnimeAttrInfo() {
|
||||
g_dComIfG_gameInfo.play.clearBaseAnimeID();
|
||||
}
|
||||
@@ -2492,6 +2549,18 @@ inline void dComIfGp_offPictureFlag(u8 i) {
|
||||
g_dComIfG_gameInfo.play.offPictureFlag(i);
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getPictureFormat() {
|
||||
return g_dComIfG_gameInfo.play.getPictureFormat();
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getPictureResult() {
|
||||
return g_dComIfG_gameInfo.play.getPictureResult();
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getPictureResultDetail() {
|
||||
return g_dComIfG_gameInfo.play.getPictureResultDetail();
|
||||
}
|
||||
|
||||
inline void dComIfGp_setBossBattleData(JKRAramBlock* aramHeap, int i) {
|
||||
g_dComIfG_gameInfo.play.setBossBattleData(aramHeap, i);
|
||||
}
|
||||
|
||||
+1
-1
@@ -123,7 +123,7 @@ public:
|
||||
u32 getMode() { return mMode & 0xFF; } // &0xFF added to fix dEvt_control_c::moveApproval, probably fakematch
|
||||
|
||||
void checkHind(u16) {}
|
||||
void chkPhoto() {}
|
||||
BOOL chkPhoto() { return mbInPhoto; }
|
||||
void getMode() const {}
|
||||
void offHindFlag(u16) {}
|
||||
void onHindFlag(u16) {}
|
||||
|
||||
@@ -443,6 +443,10 @@ void dKy_set_vrboxsoracol_ratio(f32 ratio);
|
||||
void dKy_set_vrboxkumocol_ratio(f32 ratio);
|
||||
void dKy_set_allcol_ratio(f32 ratio);
|
||||
void dKy_get_seacolor(GXColor* amb, GXColor* dif);
|
||||
BOOL dKy_moon_look_chk();
|
||||
BOOL dKy_orion_look_chk();
|
||||
BOOL dKy_hokuto_look_chk();
|
||||
cXyz dKy_get_moon_pos();
|
||||
cXyz dKy_get_orion_pos();
|
||||
cXyz dKy_get_hokuto_pos();
|
||||
void dKy_DayProc();
|
||||
|
||||
@@ -71,6 +71,7 @@ s32 fopMsgM_setStageLayer(void*);
|
||||
uint fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP);
|
||||
uint fopMsgM_messageSet(u32 param_0, cXyz*);
|
||||
uint fopMsgM_messageSet(u32 param_0);
|
||||
uint fopMsgM_scopeMessageSet(u32 param_0);
|
||||
int fopMsgM_messageSetDemo(u32 param_0);
|
||||
msg_class* fopMsgM_SearchByID(uint param_0);
|
||||
char* fopMsgM_messageGet(char* msg, u32 string_id);
|
||||
|
||||
+7804
-220
File diff suppressed because it is too large
Load Diff
@@ -95,7 +95,7 @@ void dComIfG_play_c::itemInit() {
|
||||
mMessageRupee = 0;
|
||||
mAuctionRupee = 0;
|
||||
mAuctionGauge = 0;
|
||||
field_0x4922 = 0;
|
||||
mItemTimer = 0;
|
||||
mCurrHP = 0;
|
||||
mRupyCountDisplay = 0;
|
||||
field_0x4928 = 0;
|
||||
@@ -131,7 +131,7 @@ void dComIfG_play_c::itemInit() {
|
||||
}
|
||||
|
||||
field_0x4944 = 7;
|
||||
field_0x4945 = 0;
|
||||
mScopeType = 0;
|
||||
field_0x4946 = 0;
|
||||
field_0x4947 = 0;
|
||||
mMesgSendButton = 0;
|
||||
@@ -146,18 +146,18 @@ void dComIfG_play_c::itemInit() {
|
||||
field_0x4952 = 0;
|
||||
field_0x4953 = 0;
|
||||
field_0x4954 = 0;
|
||||
field_0x4955 = 0;
|
||||
mStartItemTimer = false;
|
||||
mFwaterTimer = 0;
|
||||
mPlacenameIndex = 0;
|
||||
mPlacenameState = 0;
|
||||
mGameoverStatus = 0;
|
||||
field_0x495a = 0;
|
||||
mPictureFlag = 0;
|
||||
field_0x495c = 0;
|
||||
field_0x495d = 0;
|
||||
mPictureResult = 0;
|
||||
mPictureResultDetail = 0;
|
||||
mPictureStatus = 0;
|
||||
field_0x495f = 0;
|
||||
field_0x4960 = 0;
|
||||
mPictureFormat = 0;
|
||||
field_0x4961 = 0;
|
||||
mHeapLockFlag = 0;
|
||||
field_0x4965 = 0;
|
||||
|
||||
@@ -211,13 +211,13 @@ const u16 daDai_c::m_savelabel[] = {
|
||||
};
|
||||
|
||||
/* 800568A8-800568B0 .text getMaxDaiza__7daDai_cFv */
|
||||
s8 daDai_c::getMaxDaiza() {
|
||||
return mNowDaizaNum;
|
||||
int daDai_c::getMaxDaiza() {
|
||||
return (u8)mNowDaizaNum; // cast is weird, but it's the only way I've found to match its uses in d_a_npc_people
|
||||
}
|
||||
|
||||
/* 800568B0-800568B8 .text getDaizaSetItemNum__7daDai_cFv */
|
||||
s8 daDai_c::getDaizaSetItemNum() {
|
||||
return mNowItemNum;
|
||||
int daDai_c::getDaizaSetItemNum() {
|
||||
return (u8)mNowItemNum; // cast is weird, but it's the only way I've found to match its uses in d_a_npc_people
|
||||
}
|
||||
|
||||
bool daNpc_Os_c::m_playerRoom[3] = { false, false, false };
|
||||
|
||||
+7
-7
@@ -3450,9 +3450,9 @@ s32 dKy_moon_type_chk() {
|
||||
}
|
||||
|
||||
/* 80197404-80197504 .text dKy_telescope_lookin_chk__FP4cXyzff */
|
||||
bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
|
||||
bool ret = false;
|
||||
if (dComIfGp_getScopeType() != 0 && dComIfGd_getView()->mFovy > minFov) {
|
||||
BOOL dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
|
||||
BOOL ret = false;
|
||||
if (dComIfGp_getScopeMesgStatus() != 0 && dComIfGd_getView()->mFovy > minFov) {
|
||||
cXyz proj;
|
||||
cXyz center;
|
||||
mDoLib_project((Vec*)pPos, &proj);
|
||||
@@ -3464,8 +3464,8 @@ bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
|
||||
}
|
||||
|
||||
/* 80197504-80197558 .text dKy_moon_look_chk__Fv */
|
||||
bool dKy_moon_look_chk() {
|
||||
bool rt = false;
|
||||
BOOL dKy_moon_look_chk() {
|
||||
BOOL rt = false;
|
||||
if (dKyr_moon_arrival_check()) {
|
||||
rt = dKy_telescope_lookin_chk(&g_env_light.mMoonPos, 100.0f, 20.0f);
|
||||
}
|
||||
@@ -3474,13 +3474,13 @@ bool dKy_moon_look_chk() {
|
||||
}
|
||||
|
||||
/* 80197558-801975A4 .text dKy_orion_look_chk__Fv */
|
||||
bool dKy_orion_look_chk() {
|
||||
BOOL dKy_orion_look_chk() {
|
||||
cXyz pos = dKy_get_orion_pos();
|
||||
return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f);
|
||||
}
|
||||
|
||||
/* 801975A4-801975F0 .text dKy_hokuto_look_chk__Fv */
|
||||
bool dKy_hokuto_look_chk() {
|
||||
BOOL dKy_hokuto_look_chk() {
|
||||
cXyz pos = dKy_get_hokuto_pos();
|
||||
return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f);
|
||||
}
|
||||
|
||||
@@ -312,7 +312,7 @@ void fopMsgM_getScopeMode() {
|
||||
|
||||
/* 8002C624-8002C650 .text fopMsgM_forceSendOn__Fv */
|
||||
bool fopMsgM_forceSendOn() {
|
||||
if (dComIfGp_getScopeType() == 10) {
|
||||
if (dComIfGp_getScopeMesgStatus() == 10) {
|
||||
pushButton = true;
|
||||
return true;
|
||||
}
|
||||
@@ -347,8 +347,8 @@ bool fopMsgM_checkMessageSend() {
|
||||
|
||||
/* 8002C684-8002C6B0 .text fopMsgM_releaseScopeMode__Fv */
|
||||
bool fopMsgM_releaseScopeMode() {
|
||||
if (dComIfGp_getScopeType() == 13) {
|
||||
dComIfGp_setScopeType(11);
|
||||
if (dComIfGp_getScopeMesgStatus() == 13) {
|
||||
dComIfGp_setScopeMesgStatus(11);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user