misc cleanup

This commit is contained in:
LagoLunatic
2023-11-19 03:23:36 -05:00
parent 98da19dfac
commit a3ac23c265
8 changed files with 140 additions and 124 deletions
+11 -11
View File
@@ -59,17 +59,17 @@ public:
static void setKeepType(u8 type);
// TODO inlines
// setAtHitPosBuff__9daArrow_cFP4cXyz
// setAtHitNormal__9daArrow_cFv
// setAtHitNormalActor__9daArrow_cFP10fopAc_ac_c
// clrAtHitNormal__9daArrow_cFv
// isSetByZelda__9daArrow_cFv
// clrAtHitPosBuff__9daArrow_cFP4cXyz
// getAtHitPosBuffP__9daArrow_cFv
// getAtHitNormalActor__9daArrow_cFv
// chkAtHitNormal__9daArrow_cFv
// isLinkReflect__9daArrow_cFv
// ArrowAtOff__9daArrow_cFv
void ArrowAtOff() {}
void chkAtHitNormal() {}
void clrAtHitNormal() {}
void clrAtHitPosBuff(cXyz*) {}
void getAtHitNormalActor() {}
void getAtHitPosBuffP() {}
void isLinkReflect() {}
void isSetByZelda() {}
void setAtHitNormal() {}
void setAtHitNormalActor(fopAc_ac_c*) {}
void setAtHitPosBuff(cXyz*) {}
public:
/* 0x290 */ bool mbShotByZelda;
+8 -2
View File
@@ -70,11 +70,17 @@ public:
BOOL releaseLock();
BOOL checkActionNow();
u32 getItemNo() { return m_itemNo; }
void setItemTimerForIball(short param_1, short param_2) {
u32 getItemNo() const { return m_itemNo; }
void setItemTimerForIball(s16 param_1, s16 param_2) {
mDisappearTimer = param_1;
field_0x65a = param_2;
}
// TODO
void setFlag(u8) {}
void clrFlag(u8) {}
void checkFlag(u8) {}
void setStatus(u8) {}
void printStatus() {}
static dCcD_SrcCyl m_cyl_src;
static s32 m_timer_max;
+110
View File
@@ -0,0 +1,110 @@
#ifndef D_A_OBJ_TORIPOST_H
#define D_A_OBJ_TORIPOST_H
#include "d/d_npc.h"
#include "SSystem/SComponent/c_phase.h"
struct daObjTpost_c__letter_data {
/* 0x00 */ bool field_0x00;
/* 0x04 */ u32 mMsgId;
/* 0x08 */ u8 mItemId;
/* 0x0A */ u16 mEventReg;
};
class daObjTpost_c : public fopNpc_npc_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
};
BOOL _createHeap();
void cutProc();
void cutPresentStart(int staffIdx);
void cutPresentProc(int staffIdx);
void cutSetAnmStart(int staffIdx);
void cutSetAnmProc(int staffIdx);
void cutDispLetterStart(int staffIdx);
void cutDispLetterProc(int staffIdx);
void deliverLetter();
s16 getReceiveLetterNum();
s32 getReadableLetterNum();
u8 checkSendPrice();
int getMsgXY();
int getMsgNormal();
u32 getMsg();
u16 next_msgStatus(u32* msgId);
bool checkTalk();
void eventOrder();
void checkOrder();
void setAttention();
void setAnm(s8 param_1, bool param_2);
void setMtx();
void modeWaitInit();
void modeWait();
void modeTalkInit();
void modeTalk();
void modeTalkXYInit();
void modeTalkXY();
void modeReceiveInit();
void modeReceive();
void modeReceiveDemoInit();
void modeReceiveDemo();
void modeProc(Proc_e proc, int newMode);
bool _execute();
void debugDraw();
bool _draw();
void createInit();
void getArg();
int _create();
bool _delete();
inline s32 getSendPrice() { return m_send_price[mPayType]; }
static const char m_arc_name[];
static const daObjTpost_c__letter_data m_letter[];
static const dCcD_SrcCyl m_cyl_src;
private:
static const s32 m_send_price[];
/* 0x6C4 */ u32 mCurMode;
/* 0x6C8 */ s8 field_0x6C8;
/* 0x6C9 */ s8 field_0x6C9;
/* 0x6CA */ s8 field_0x6CA;
/* 0x6CC */ request_of_phase_process_class mPhs;
/* 0x6D4 */ mDoExt_McaMorf* mMorf;
/* 0x6D8 */ dBgS_ObjAcch mAcch;
/* 0x89C */ dBgS_AcchCir mAcchCir;
/* 0x8DC */ int field_0x8DC;
/* 0x8E0 */ int field_0x8E0;
/* 0x8E4 */ int field_0x8E4;
/* 0x8E8 */ u8 mPayType;
/* 0x8E9 */ u8 field_0x8E9;
/* 0x8EA */ u8 field_0x8EA;
/* 0x8EB */ u8 field_0x8EB;
/* 0x8EC */ s32 mNumReadable;
/* 0x8F0 */ u32 field_0x8F0;
/* 0x8F4 */ u8 field_0x8F4;
/* 0x8F5 */ u8 field_0x8F5;
/* 0x8F6 */ u8 field_0x8F6;
/* 0x8F7 */ s8 field_0x8F7;
};
class daObjTpost_HIO_c {
public:
daObjTpost_HIO_c();
virtual ~daObjTpost_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x05 */ bool debug_draw;
/* 0x06 */ s8 field_0x06;
/* 0x07 */ u8 field_0x07;
/* 0x08 */ f32 attn_pos_offset;
/* 0x0C */ f32 eye_pos_offset;
/* 0x10 */ f32 talk_distance;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
};
#endif /* D_A_OBJ_TORIPOST_H */