mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-29 15:33:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Undo file changes

Browse Source
This commit is contained in:
WilliamArnett
2025-05-26 04:59:16 -05:00
parent 1d1c15650d
commit 5bcc47fcd4
24 changed files with 5559 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_am.h
+3
View File
@@ -39,6 +39,9 @@ public:
/* 0x0324 */ cXyz mSpawnPos;
/* 0x0330 */ csXyz mEyeRot;
/* 0x0336 */ csXyz mTargetEyeRot;
#if VERSION == VERSION_DEMO
/* 0x033C */ JPABaseEmitter* m033C_demo;
#endif
/* 0x033C */ JPABaseEmitter* m033C;
/* 0x0340 */ JPABaseEmitter* m0340;
/* 0x0344 */ dPa_smokeEcallBack mSmokeCbs[4];
include/d/actor/d_a_npc_kk1.h
+234 -70
View File
@@ -1,28 +1,71 @@
#ifndef D_A_NPC_KK1_H
#define D_A_NPC_KK1_H
#include "JSystem/JParticle/JPAEmitter.h"
#include "d/d_npc.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_hostIO.h"
class J3DNode;
class daNpc_Kk1_c : public fopAc_ac_c {
static void* searchActor_SWC00(void*, void*);
class daNpc_Kk1_c : public fopNpc_npc_c {
public:
typedef int (daNpc_Kk1_c::*ActionFunc)(void*);
typedef void* (pFunc)(void*, void*);
struct anm_prm_c {
s8 field0;
s8 field1;
u16 field2;
f32 field4;
f32 field8;
u32 fieldC;
};
struct prm_tbl {
u32 field_0x00;
u32 field_0x04;
u32 field_0x08;
u32 field_0x0C;
u32 field_0x10;
f32 field_0x14;
u32 field_0x18;
u32 field_0x1C;
u32 field_0x20;
u32 field_0x24;
f32 field_0x28;
f32 field_0x2C;
u32 field_0x30;
f32 field_0x34;
f32 field_0x38;
f32 field_0x3C;
u32 field_0x40;
f32 field_0x44;
f32 field_0x48;
u32 field_0x4C;
f32 field_0x50;
};
void getSWbit() {}
int getSWbit();
void _nodeCB_Head(J3DNode*, J3DModel*);
void _nodeCB_BackBone(J3DNode*, J3DModel*);
void init_KK1_0();
void createInit();
bool init_KK1_0();
bool createInit();
void play_animation();
void setMtx(bool);
void bckResID(int);
void btpResID(int);
void setBtp(signed char, bool);
void init_texPttrnAnm(signed char, bool);
int bckResID(int);
int btpResID(int);
bool setBtp(signed char, bool);
bool init_texPttrnAnm(signed char, bool);
void play_btp_anm();
void play_eff_anm();
void setAnm_anm(anm_prm_c*);
@@ -34,112 +77,233 @@ public:
void ctrlAnmAtr();
void setAnm_ATR();
void anmAtr(unsigned short);
void next_msgStatus(unsigned long*);
void getMsg_KK1_0();
void getMsg();
u16 next_msgStatus(unsigned long*);
u32 getMsg_KK1_0();
u32 getMsg();
void eventOrder();
void checkOrder();
void chk_talk();
void chk_parts_notMov();
void searchByID(fpc_ProcID, int*);
void partner_search_sub(void* (*)(void*, void*));
bool chk_talk();
bool chk_parts_notMov();
fopAc_ac_c* searchByID(fpc_ProcID, int*);
bool partner_search_sub(pFunc*);
void partner_search();
void lookBack();
void chkAttention();
bool chkAttention();
void setAttention(bool);
void decideType(int);
bool decideType(int);
void cut_init_RUN_START(int);
void cut_move_RUN_START();
bool cut_move_RUN_START();
void cut_init_RUN(int);
void cut_move_RUN();
bool cut_move_RUN();
void cut_init_CATCH_START(int);
void cut_move_CATCH_START();
bool cut_move_CATCH_START();
void cut_init_CATCH_END(int);
void cut_move_CATCH_END();
bool cut_move_CATCH_END();
void cut_init_TRN(int);
void cut_move_TRN();
bool cut_move_TRN();
void cut_init_BYE_START(int);
void cut_move_BYE_START();
bool cut_move_BYE_START();
void cut_init_BYE(int);
void cut_move_BYE();
bool cut_move_BYE();
void cut_init_BYE_CONTINUE(int);
void cut_move_BYE_CONTINUE();
bool cut_move_BYE_CONTINUE();
void cut_init_BYE_END(int);
void cut_move_BYE_END();
bool cut_move_BYE_END();
void cut_init_PLYER_TRN(int);
void cut_move_PLYER_TRN();
bool cut_move_PLYER_TRN();
void cut_init_OTOBOKE(int);
void cut_move_OTOBOKE();
bool cut_move_OTOBOKE();
void cut_init_PLYER_MOV(int);
void cut_move_PLYER_MOV();
bool cut_move_PLYER_MOV();
void cut_init_RUNAWAY_START(int);
void cut_move_RUNAWAY_START();
bool cut_move_RUNAWAY_START();
void cut_init_RUNAWAY_END(int);
void cut_move_RUNAWAY_END();
bool cut_move_RUNAWAY_END();
void privateCut(int);
void endEvent();
void isEventEntry();
int isEventEntry();
void event_proc(int);
void checkCommandTalk();
void set_action(int (daNpc_Kk1_c::*)(void*), void*);
bool checkCommandTalk();
bool set_action(ActionFunc, void*);
void setStt(signed char);
void createTama(float);
void chk_areaIN(float, cXyz);
void startEvent_check();
void chkHitPlayer();
bool chk_areaIN(float, cXyz);
bool startEvent_check();
bool chkHitPlayer();
void set_pthPoint(unsigned char);
void event_move(bool);
void kyoroPos(int);
void kyorokyoro();
void chk_attn();
bool event_move(bool);
cXyz kyoroPos(int);
bool kyorokyoro();
bool chk_attn();
void setBikon(cXyz);
void delBikon();
void setAse();
void flwAse();
void delAse();
void wait_1();
void walk_1();
void wait_2();
BOOL wait_1();
BOOL walk_1();
BOOL wait_2();
void init_CMT_WAI();
void move_CMT_WAI();
void init_CMT_TRN();
void move_CMT_TRN();
void init_CMT_PCK();
void move_CMT_PCK();
void cmmt_1();
void wait_3();
void wait_4();
void talk_1();
void wait_action1(void*);
void demo();
BOOL cmmt_1();
BOOL wait_3();
BOOL wait_4();
BOOL talk_1();
int wait_action1(void*);
u8 demo();
void shadowDraw();
bool _draw();
BOOL _draw();
bool _execute();
bool _delete();
cPhs_State _create();
void bodyCreateHeap();
void effcCreateHeap();
void CreateHeap();
BOOL bodyCreateHeap();
BOOL effcCreateHeap();
BOOL CreateHeap();
public:
/* 0x6C4 */ u8 m6C4[0x72C - 0x6C4];
/* 0x72C */ cXyz m72C;
/* 0x738 */ cXyz m738;
/* 0x744 */ u8 m744[0x750 - 0x744];
/* 0x750 */ cXyz m750;
/* 0x75C */ u8 m75C[0x7C4 - 0x75C];
/* 0x7C4 */ u8 m7C4;
/* 0x7C5 */ u8 m7C5[0x81E - 0x7C5];
/* 0x81E */ u8 m81E;
/* 0x81F */ u8 m81F[0x824 - 0x81F];
};
class daNpc_Kk1_HIO_c {
/* 0x6C4 */ request_of_phase_process_class field_0x6C4;
/* 0x6CC */ s8 m_hed_jnt_num;
/* 0x6CD */ s8 m_bbone_jnt_num;
/* 0x6CE */ char mArcName;
/* 0x6CF */ u8 field_0x6CF;
/* 0x6D0 */ u32 field_0x6D0;
/* 0x6D4 */ u32 mShadowID;
/* 0x6D8 */ mDoExt_btpAnm mBtpAnm;
/* 0x6EC*/ u8 mBtpFrame;
/* 0x6ED*/ s8 field_0x6ED;
/* 0x6EE*/ s16 field_0x6EE;
/* 0x6F0*/ ActionFunc field_0x6F0;
/* 0x6FC*/ fpc_ProcID mPartnerProcID;
/* 0x700*/ u32 field_0x700;
/* 0x704*/ dNpc_PathRun_c mRunPath;
/* 0x70C*/ cXyz field_0x70C;
/* 0x718*/ csXyz field_0x718;
/* 0x71E */ csXyz mAngle;
/* 0x724 */ u8 field_0x724[0x72C - 0x724];
/* 0x72C */ cXyz field_0x72C;
/* 0x738 */ cXyz field_0x738;
/* 0x744 */ u8 field_0x744[0x750 - 0x744];
/* 0x750 */ cXyz field_0x750;
/* 0x75C */ cXyz field_0x75C;
/* 0x768 */ f32 mAnimeFrame;
/* 0x76A */ u8 field_0x76A[4];
/* 0x770 */ s16 mLookBackAngleY;
/* 0x772 */ s16 mLookBackHeadY;
/* 0x774 */ s16 mLookBackBackboneY;
/* 0x776 */ s16 field_0x776;
/* 0x778 */ s32 field_0x778;
/* 0x77C */ s16 mEvtIDTbl[8];
/* 0x78C */ s16 mEvtIDIdx;
/* 0x78E */ s8 field_0x78E[0x792 - 0x78E];
/* 0x792 */ s16 field_0x792;
/* 0x794 */ s16 field_0x794;
/* 0x796 */ s16 mKyoroRNG;
/* 0x798 */ s16 mTimer;
/* 0x79A */ s16 field_0x79A;
/* 0x79C */ s16 field_0x79C;
/* 0x79E */ s16 field_0x79E;
/* 0x7A0 */ s16 field_0x7A0;
/* 0x7A2 */ s16 field_0x7A2;
/* 0x7A4 */ s16 field_0x7A4;
/* 0x7A6 */ s16 field_0x7A6;
/* 0x7A8 */ s16 field_0x7A8;
/* 0x7AA */ s16 field_0x7AA;
/* 0x7AC */ s16 field_0x7AC;
/* 0x7AE */ s16 mMuuruBadResponse;
/* 0x7B0 */ s16 mPrm0;
/* 0x7B2 */ s8 field_0x7B2;
/* 0x7B3 */ u8 field_0x7B3;
/* 0x7B4 */ u8 field_0x7B4;
/* 0x7B5 */ u8 mSWbit;
/* 0x7B6 */ u8 field_0x7B6;
/* 0x7B7 */ u8 field_0x7B7;
/* 0x7B8 */ u8 field_0x7B8;
/* 0x7B9 */ u8 field_0x7B9;
/* 0x7BA */ u8 field_0x7BA;
/* 0x7BB */ u8 field_0x7BB;
/* 0x7BC */ s8 field_0x7BC;
/* 0x7BD */ u8 field_0x7BD;
/* 0x7BE */ u8 field_0x7BE;
/* 0x7BF */ u8 field_0x7BF;
/* 0x7C0 */ u8 field_0x7C0;
/* 0x7C1 */ u8 field_0x7C1;
/* 0x7C2 */ u8 field_0x7C2;
/* 0x7C3 */ u8 field_0x7C3;
/* 0x7C4 */ bool mLockBodyRotation;
/* 0x7C5 */ bool field_0x7C5;
/* 0x7C6 */ u8 field_0x7C6;
/* 0x7C7 */ u8 field_0x7C7;
/* 0x7C8 */ mDoExt_bpkAnm field_0x7C8;
/* 0x7DC */ mDoExt_btkAnm field_0x7DC;
/* 0x7F0 */ mDoExt_bckAnm field_0x7F0;
/* 0x800 */ s16 field_0x800;
/* 0x802 */ s16 field_0x802;
/* 0x804 */ s16 field_0x804;
/* 0x806 */ u16 field_0x806;
/* 0x808*/ J3DModel* field_0x808;
/* 0x80C*/ u8 field_0x80C[0x810-0x80C];
/* 0x810 */ JPABaseEmitter* field_0x810;
/* 0x814 */ s8 mCutsceneIndex;
/* 0x815 */ s8 field_0x815;
/* 0x816 */ s8 field_0x816;
/* 0x817 */ u8 mAnimationNum;
/* 0x818 */ u8 field_0x818;
/* 0x819 */ s8 field_0x819;
/* 0x81A */ s8 field_0x81A;
/* 0x81B */ s8 field_0x81B;
/* 0x81C */ s8 field_0x81C;
/* 0x81D */ s8 field_0x81D;
/* 0x81E */ u8 mWhereToLook;
/* 0x81F */ s8 field_0x81F;
/* 0x820 */ s8 field_0x820;
/* 0x821 */ s8 field_0x821;
/* 0x822 */ s8 field_0x822;
/* 0x823 */ s8 field_0x823;
}; // Size: 0x824
class daNpc_Kk1_HIO_c : mDoHIO_entry_c{
public:
daNpc_Kk1_HIO_c();
virtual ~daNpc_Kk1_HIO_c(){};
public:
/* Place member variables here */
/* 0x04 */ s8 mNo;
/* 0x08 */ s16 mHorizontalDistance;
/* 0x08 */ s32 field_0xA;
/* 0x0C */ s16 field_0xC;
/* 0x0E */ s16 field_0xE;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ s16 field_0x12;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1A;
/* 0x1C */ s16 field_0x1C;
/* 0x1E */ s16 field_0x1E;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ u8 field_0x24;
/* 0x25 */ u8 field_0x25;
/* 0x26 */ s16 field_0x26;
/* 0x28 */ s16 field_0x28;
/* 0x28 */ s16 field_0x2A;
/* 0x2C */ s16 field_0x2C;
/* 0x2C */ s16 field_0x2E;
/* 0x30 */ s16 mScale;
/* 0x32 */ s16 mMaxStep;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3C;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4C;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5C;
};
#endif /* D_A_NPC_KK1_H */
include/d/actor/d_a_npc_km1.h
+44 -119
View File
@@ -1,53 +1,32 @@
#ifndef D_A_NPC_KM1_H
#define D_A_NPC_KM1_H
#include "d/d_npc.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_hostIO.h"
class daNpc_Km1_c : public fopNpc_npc_c {
class daNpc_Km1_c : public fopAc_ac_c {
public:
typedef int (daNpc_Km1_c::*ActionFunc)(void*);
struct anm_prm_c {
s8 field_0x0;
s8 field_0x1;
u16 field_0x2;
float field_0x4;
float field_0x8;
int field_0xC;
};
struct prm_tbl {
u32 field_0x00;
u32 field_0x04;
u32 field_0x08;
u32 field_0x0C;
u32 field_0x10;
f32 field_0x14;
u32 field_0x18;
};
Vec* getAttPos() {return &field_0x780;}
s8 getBackboneJntNum() {return m_backbone_jnt_num;}
void getAttPos() {}
void getBackboneJntNum() {}
void getBackbone_x() {}
void getBackbone_y() {}
Vec* getEyePos() {return &field_0x78C;}
s8 getHeadJntNum() {return m_head_jnt_num;}
void getEyePos() {}
void getHeadJntNum() {}
void getHead_x() {}
void getHead_y() {}
bool createInit();
void createInit();
void setMtx();
bool anmResID(int, int*, int*);
void anmResID(int, int*, int*);
void BtpNum2ResID(int, int*);
void setAnm_tex(signed char);
u8 init_btp(bool, int);
bool initTexPatternAnm(bool);
void init_btp(bool, int);
void initTexPatternAnm(bool);
void playTexPatternAnm();
s32 setAnm_anm(anm_prm_c*);
void setAnm_anm(anm_prm_c*);
void setAnm();
void chngAnmTag();
void ctrlAnmTag();
@@ -56,112 +35,58 @@ public:
void setAnm_ATR(int);
void anmAtr(unsigned short);
void setStt(signed char);
u16 next_msgStatus(unsigned long*);
u32 getMsg();
void next_msgStatus(unsigned long*);
void getMsg();
void eventOrder();
void checkOrder();
void lookBack();
bool chkAttention();
void chkAttention();
void setAttention();
bool decideType(int);
void decideType(int);
void event_actionInit(int);
bool event_action();
void event_action();
void privateCut();
void endEvent();
void event_proc();
bool set_action(ActionFunc, void*);
BOOL wait01();
BOOL talk01();
int wait_action1(void*);
u8 demo();
void set_action(int (daNpc_Km1_c::*)(void*), void*);
void wait01();
void talk01();
void wait_action1(void*);
void demo();
bool _draw();
bool _execute();
bool _delete();
cPhs_State _create();
BOOL CreateHeap();
void CreateHeap();
public:
/* 0x6C4 */ request_of_phase_process_class field_0x6C4;
/* 0x6CC */ s8 m_head_jnt_num;
/* 0x6CD */ s8 m_backbone_jnt_num;
/* 0x6CE */ u8 field_0x6CE[0x6D0 - 0x6CE];
/* 0x6D0 */ u32 mShadowId;
/* 0x6D4 */ J3DModel* field_0x6D4;
/* 0x6D8 */ J3DAnmTexPattern* m_head_tex_pattern;
/* 0x6DC */ mDoExt_btpAnm mBtpAnm;
/* 0x6F0 */ u8 mBtpFrame;
/* 0x6F1 */ u8 field_0x6F1;
/* 0x6F2 */ s16 field_0x6F2;
/* 0x6F4 */ ActionFunc field_0x6F4;
/* 0x700 */ dNpc_EventCut_c mEventCut;
/* 0x76C */ csXyz field_0x76C;
/* 0x772 */ u8 field_0x772[0x774 - 0x772];
/* 0x774 */ cXyz field_0x774;
/* 0x780 */ cXyz field_0x780;
/* 0x78C */ cXyz field_0x78C;
/* 0x798 */ cXyz field_0x798;
/* 0x7A4 */ f32 field_0x7A4;
/* 0x7A8 */ u8 field_0x7A8[0x7AC - 0x7A8];
/* 0x7AC */ f32 field_0x7AC;
/* 0x7B0 */ s16 field_0x7B0;
/* 0x7B2 */ s16 field_0x7B2;
/* 0x7B4 */ s8 field_0x7B4;
/* 0x7B5 */ s8 field_0x7B5;
/* 0x7B6 */ u8 field_0x7B6;
/* 0x7B7 */ u8 field_0x7B7;
/* 0x7B8 */ u8 field_0x7B8;
/* 0x7B9 */ u8 field_0x7B9[0x7BC - 0x7B9];
/* 0x7BC */ s32 field_0x7BC;
/* 0x7C0 */ s32 field_0x7C0;
/* 0x7C4 */ u8 field_0x7C4;
/* 0x7C5 */ u8 field_0x7C5;
/* 0x7C6 */ bool mHeadOnlyFollow;
/* 0x7C7 */ u8 field_0x7C7;
/* 0x7C8 */ u8 field_0x7C8;
/* 0x7C8 */ s8 field_0x7C9;
/* 0x7CA */ s8 field_0x7CA;
/* 0x7CB */ u8 field_0x7CB;
/* 0x7CC */ u8 field_0x7CC;
/* 0x7CD */ s8 field_0x7CD;
/* 0x7CE */ s8 field_0x7CE;
/* 0x7CF */ s8 field_0x7CF;
/* 0x7D0 */ s8 field_0x7D0;
/* 0x7D1 */ s8 field_0x7D1;
/* 0x7D2 */ s8 field_0x7D2;
/* 0x7D3 */ s8 field_0x7D3;
/* 0x7D4 */ s8 field_0x7D4;
/* 0x7D5 */ s8 field_0x7D5;
/* 0x7D6 */ s8 field_0x7D6;
/* 0x7D7 */ s8 field_0x7D7;
}; // Size: 0x7D8
/* 0x6C4 */ u8 m6C4[0x6CC - 0x6C4];
/* 0x6CC */ u8 mHeadJntIdx;
/* 0x6CD */ u8 mBackBoneJntIdx;
/* 0x6CE */ u8 m6CE[0x6F4 - 0x6CE];
/* 0x6F4 */ int (daNpc_Km1_c::*m6F4)();
/* 0x700 */ u8 m700[0x76C - 0x700];
/* 0x76C */ csXyz m76C;
/* 0x772 */ u8 m772[0x774 - 0x772];
/* 0x774 */ cXyz m774;
/* 0x780 */ cXyz m780;
/* 0x78C */ cXyz m78C;
/* 0x798 */ cXyz m798;
/* 0x7A4 */ u8 m7A4[0x7B0 - 0x7A4];
/* 0x7B0 */ s16 m7B0;
/* 0x7B2 */ u8 m7B2[0x7B8 - 0x7B2];
/* 0x7B8 */ u8 m7B8;
/* 0x7B9 */ u8 m7B9[0x7C7 - 0x7B9];
/* 0x7C7 */ u8 m7C7;
/* 0x7C8 */ u8 m7C8[0x7D8 - 0x7C8];
};
class daNpc_Km1_HIO_c : public JORReflexible{
struct daNpc_Km1_HIO__PrmTbl{
s16 field_0;
s16 field_2;
s16 field_4;
s16 field_6;
s16 field_8;
s16 field_A;
s16 field_C;
s16 field_E;
s16 field_10;
s16 field_12;
f32 mAttentionArrowYOffset;
f32 field_18;
}; // Size: 0x1C
class daNpc_Km1_HIO_c {
public:
daNpc_Km1_HIO_c();
virtual ~daNpc_Km1_HIO_c(){};
public:
/* Place member variables here */
/* 0x4 */ s8 mNo;
/* 0x5 */ s8 field_0x5;
/* 0x6 */ s8 field_0x6;
/* 0x7 */ s8 field_0x7;
/* 0x8 */ int field_0x8;
/* 0xC */ daNpc_Km1_HIO__PrmTbl mPrmTbl;
};
#endif /* D_A_NPC_KM1_H */
include/d/actor/d_a_npc_photo.h
+102 -28
View File
@@ -3,14 +3,25 @@
#include "f_op/f_op_actor.h"
#include "d/d_cc_d.h"
#include "d/d_npc.h"
struct sPhotoAnmDat {
/* 0x00 */ u8 field_0x00;
/* 0x01 */ u8 field_0x01;
/* 0x02 */ u8 field_0x02;
};
class daNpcPhoto_c : public fopAc_ac_c {
class daNpcPhoto_c : public fopNpc_npc_c {
public:
void getPhaseP() {}
enum Prm_e {
PRM_RAIL_ID_W = 0x8,
PRM_RAIL_ID_S = 0x10,
PRM_ARG0_W = 0x8,
PRM_ARG0_S = 0x0,
};
request_of_phase_process_class* getPhaseP() { return &mPhs1; }
void incMsgTbl() {}
void isDate() {}
void nullMsgTbl() {}
@@ -20,12 +31,12 @@ public:
daNpcPhoto_c();
cPhs_State _create();
void createHeap();
void createInit();
BOOL createHeap();
cPhs_State createInit();
bool _delete();
bool _draw();
bool _execute();
void executeCommon();
bool executeCommon();
void executeSetMode(unsigned char);
void executeWait();
void executeTalk();
@@ -36,46 +47,109 @@ public:
void eventMove();
void privateCut();
void eventMesSetInit(int);
void eventMesSet();
bool eventMesSet();
void eventSeSetInit(int);
void eventPosSetInit();
void eventGetItemInit();
void eventGetItem();
bool eventGetItem();
void eventSetAngleInit();
void eventSetEyeInit();
void eventSetEye();
bool eventSetEye();
void eventTurnToPlayerInit();
void eventTurnToPlayer();
bool eventTurnToPlayer();
void eventClrHanmeInit();
void eventGetPhotoInit();
void eventGetPhoto();
bool eventGetPhoto();
void eventMesSetUbInit(int);
void eventMesSetUb();
void eventLookUb();
void talk2(int);
bool eventMesSetUb();
bool eventLookUb();
u16 talk2(int);
void setMsgCamera();
void next_msgStatus(unsigned long*);
void getMsg();
void setMessage(unsigned long);
u16 next_msgStatus(u32*);
u32 getMsg();
void setMessage(u32);
void setAnmFromMsgTag();
void getPrmRailID();
void getPrmArg0();
u8 getPrmRailID();
u8 getPrmArg0();
void setMtx();
void chkAttention();
void lookBack();
void initTexPatternAnm(bool, int);
BOOL initTexPatternAnm(bool, int);
void playTexPatternAnm();
void playAnm();
void setAnm(unsigned char, int, float);
void setAnmTbl(sPhotoAnmDat*);
void XyCheckCB(int);
void XyEventCB(int);
void isPhotoOk();
void isPhotoDxOk();
void setAnm(u8, int, f32);
bool setAnmTbl(sPhotoAnmDat*);
s16 XyCheckCB(int);
s16 XyEventCB(int);
BOOL isPhotoOk();
BOOL isPhotoDxOk();
void setCollision(dCcD_Cyl*, cXyz, float, float);
static const char m_arcname[4];
public:
/* Place member variables here */
};
typedef void(daNpcPhoto_c::*MoveFunc_t)();
/* 0x6C4 */ request_of_phase_process_class mPhs1;
/* 0x6CC */ request_of_phase_process_class mPhs2;
/* 0x6D4 */ J3DAnmTexPattern* m_head_tex_pattern;
/* 0x6D8 */ mDoExt_btpAnm mBtpAnm;
/* 0x6EC */ u32 mShadowId;
/* 0x6F0 */ dNpc_PathRun_c mPathRun;
/* 0x6F8 */ dCcD_Cyl field_0x6F8[2];
/* 0x958 */ cXyz field_0x958;
/* 0x964 */ cXyz mLookAtPos;
/* 0x970 */ cXyz mEyePos;
/* 0x97C */ sPhotoAnmDat* mpAnmDat;
/* 0x980 */ u32* field_0x980;
/* 0x984 */ f32 field_0x984;
/* 0x988 */ f32 field_0x988;
/* 0x98C */ f32 field_0x98C;
/* 0x990 */ int mMsgNno;
/* 0x994 */ bool field_0x994;
/* 0x996 */ s16 mPhotoLinkBackEventIdx;
/* 0x998 */ s16 mPhotoGetItemEventIdx;
/* 0x99A */ s16 mPhotoGetItem2EventIdx;
/* 0x99C */ s16 mPhotoGetPhotoEventIdx;
/* 0x99E */ s16 mPhotoGalleryEventIdx;
/* 0x9A0 */ s16 mPhotoCounterTalk0EventIdx;
/* 0x9A2 */ s16 mPhotoCounterTalk1EventIdx;
/* 0x9A4 */ s16 mPhotoDateUB4EventIdx;
/* 0x9A6 */ s16 field_0x9A6;
/* 0x9A8 */ s16 field_0x9A8;
/* 0x9AA */ u8 field_0x9AA[0x9AC - 0x9AA];
/* 0x9AC */ s16 field_0x9AC;
/* 0x9AE */ s16 field_0x9AE;
/* 0x9B0 */ s16 field_0x9B0;
/* 0x9B2 */ s16 field_0x9B2;
/* 0x9B4 */ s16 mTimer;
/* 0x9B6 */ s16 field_0x9B6;
/* 0x9B8 */ s16 field_0x9B8;
/* 0x9BA */ s16 field_0x9BA;
/* 0x9BC */ bool field_0x9BC;
/* 0x9BD */ bool field_0x9BD;
/* 0x9BE */ u8 field_0x9BE;
/* 0x9BF */ u8 mFrame;
/* 0x9C0 */ u8 field_0x9C0;
/* 0x9C1 */ u8 field_0x9C1;
/* 0x9C2 */ bool field_0x9C2;
/* 0x9C3 */ u8 field_0x9C3;
/* 0x9C4 */ u8 field_0x9C4[0x9C5 - 0x9C4];
/* 0x9C5 */ u8 mItemNo;
/* 0x9C6 */ u8 field_0x9C6;
/* 0x9C7 */ bool field_0x9C7;
/* 0x9C8 */ u8 field_0x9C8;
/* 0x9C9 */ u8 field_0x9C9;
/* 0x9CA */ s8 field_0x9CA;
/* 0x9CB */ s8 mActIdx;
/* 0x9CC */ bool field_0x9CC;
/* 0x9CD */ bool field_0x9CD;
/* 0x9D0 */ u8* field_0x9D0;
/* 0x9D4 */ bool field_0x9D4;
/* 0x9D5 */ u8 field_0x9D5;
/* 0x9D6 */ s8 field_0x9D6;
/* 0x9D7 */ bool field_0x9D7;
/* 0x9D8 */ bool field_0x9D8;
}; // Size: 0x9DC
#endif /* D_A_NPC_PHOTO_H */
include/d/actor/d_a_player_main.h
+28 -20
View File
@@ -209,7 +209,7 @@ public:
~daPy_dmEcallBack_c() {}
daPy_dmEcallBack_c() {}
static int getTimer() { return m_timer; }
static s16 getTimer() { return m_timer; }
static void setTimer(s16 timer) { m_timer = timer; }
static void decTimer() { m_timer--; }
@@ -1237,7 +1237,9 @@ public:
BOOL dProcOpenTreasure_init();
BOOL dProcOpenTreasure();
void setGetItemSound(u16, int);
#if VERSION > VERSION_DEMO
BOOL setGetDemo();
#endif
BOOL dProcGetItem_init();
BOOL dProcGetItem();
BOOL dProcUnequip_init();
@@ -1677,8 +1679,12 @@ public:
BOOL procFoodSet();
void setSwordModel(BOOL);
void setLightSaver();
#if VERSION == VERSION_DEMO
BOOL checkLastDemoSwordNoDraw(int);
#else
BOOL checkDemoShieldNoDraw();
BOOL checkDemoSwordNoDraw(BOOL);
#endif
BOOL checkChanceMode();
BOOL checkCutRollChange() const;
int getSwordBlurColor();
@@ -1731,32 +1737,32 @@ public:
J3DAnmTextureSRTKey* getIceArrowBtk() { return mpIceArrowBtk; }
J3DAnmTextureSRTKey* getLightArrowBtk() { return mpLightArrowBtk; }
bool checkUpperAnime(u16 i_idx) const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == i_idx; }
bool checkNoUpperAnime() const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xFFFF; }
BOOL checkUpperAnime(u16 i_idx) const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == i_idx; }
BOOL checkNoUpperAnime() const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xFFFF; }
bool checkGrabAnime() const { return checkGrabAnimeLight() || checkGrabAnimeHeavy(); };
bool checkGrabAnimeLight() const { return checkUpperAnime(LKANM_BCK_GRABWAIT); };
bool checkGrabAnimeHeavy() const { return checkUpperAnime(LKANM_BCK_GRABWAITB); };
bool checkBoomerangCatchAnime() const { return checkUpperAnime(LKANM_BCK_BOOMCATCH); };
bool checkBoomerangThrowAnime() const { return checkUpperAnime(LKANM_BCK_BOOMTHROW); };
bool checkBoomerangReadyAnime() const { return checkUpperAnime(LKANM_BCK_BOOMWAIT); };
bool checkHookshotReadyAnime() const { return checkUpperAnime(LKANM_BCK_HOOKSHOTWAIT); }
bool checkDashDamageAnime() const { return checkUpperAnime(LKANM_BCK_DAMDASH); }
bool checkBowReloadAnime() const { return checkUpperAnime(LKANM_BCK_ARROWRELORD); }
bool checkBowShootAnime() const { return checkUpperAnime(LKANM_BCK_ARROWSHOOT); }
bool checkBowWaitAnime() const { return checkUpperAnime(LKANM_BCK_BOWWAIT); }
bool checkGuardSlip() const {
BOOL checkGrabAnime() const { return checkGrabAnimeLight() || checkGrabAnimeHeavy(); };
BOOL checkGrabAnimeLight() const { return checkUpperAnime(LKANM_BCK_GRABWAIT); };
BOOL checkGrabAnimeHeavy() const { return checkUpperAnime(LKANM_BCK_GRABWAITB); };
BOOL checkBoomerangCatchAnime() const { return checkUpperAnime(LKANM_BCK_BOOMCATCH); };
BOOL checkBoomerangThrowAnime() const { return checkUpperAnime(LKANM_BCK_BOOMTHROW); };
BOOL checkBoomerangReadyAnime() const { return checkUpperAnime(LKANM_BCK_BOOMWAIT); };
BOOL checkHookshotReadyAnime() const { return checkUpperAnime(LKANM_BCK_HOOKSHOTWAIT); }
BOOL checkDashDamageAnime() const { return checkUpperAnime(LKANM_BCK_DAMDASH); }
BOOL checkBowReloadAnime() const { return checkUpperAnime(LKANM_BCK_ARROWRELORD); }
BOOL checkBowShootAnime() const { return checkUpperAnime(LKANM_BCK_ARROWSHOOT); }
BOOL checkBowWaitAnime() const { return checkUpperAnime(LKANM_BCK_BOWWAIT); }
BOOL checkGuardSlip() const {
return mCurProc == daPyProc_GUARD_SLIP_e ||
mCurProc == daPyProc_CROUCH_DEFENSE_SLIP_e;
}
bool checkUpperGuardAnime() const {
BOOL checkUpperGuardAnime() const {
return checkUpperAnime(LKANM_BCK_ATNG) ||
checkUpperAnime(LKANM_BCK_ATNGHAM);
}
s16 checkTinkleShield() const { return mTinkleShieldTimer; }
void setTinkleShield(s16 time) { mTinkleShieldTimer = time; }
bool checkNoDamageMode() const { return checkEquipDragonShield() || checkTinkleShield() != 0; }
BOOL checkNoDamageMode() const { return checkEquipDragonShield() || checkTinkleShield() != 0; }
s16 checkTinkleHover() const { return mTinkleHoverTimer; }
void setHoverBoots(s16 time) {
onNoResetFlg0(daPyFlg0_HOVER_BOOTS);
@@ -1764,12 +1770,12 @@ public:
}
void onShipTact() { onNoResetFlg1(daPyFlg1_SHIP_TACT); }
void offShipTact() { offNoResetFlg1(daPyFlg1_SHIP_TACT); }
bool checkShipGetOff() { return mCurProc == daPyProc_SHIP_GET_OFF_e; }
BOOL checkShipGetOff() { return mCurProc == daPyProc_SHIP_GET_OFF_e; }
void onShipDrop(s16 param_1) {
onNoResetFlg0(daPyFlg0_SHIP_DROP);
m3550 = param_1;
}
bool checkCarryActionNow() const {
BOOL checkCarryActionNow() const {
return mCurProc == daPyProc_GRAB_PUT_e ||
mCurProc == daPyProc_GRAB_UP_e ||
mCurProc == daPyProc_GRAB_THROW_e;
@@ -1792,7 +1798,7 @@ public:
mActivePlayerBombs--;
}
}
bool checkSwordEquip() const {
BOOL checkSwordEquip() const {
return dComIfGs_getSelectEquip(0) != dItem_NONE_e || checkSwordMiniGame();
}
@@ -2204,7 +2210,9 @@ public:
/* 0x362C */ fpc_ProcID mTactZevPartnerId;
/* 0x3630 */ fpc_ProcID m3630;
/* 0x3634 */ fpc_ProcID mWhirlId;
#if VERSION > VERSION_DEMO
/* 0x3638 */ fpc_ProcID mMsgId;
#endif
/* 0x363C */ J3DFrameCtrl* mpSeAnmFrameCtrl;
/* 0x3640 */ s16 m3640;
/* 0x3644 */ f32 m3644;
include/d/actor/d_a_tag_photo.h
+5 -2
View File
@@ -7,7 +7,7 @@ class daTagPhoto_c : public fopAc_ac_c {
public:
daTagPhoto_c();
void getTagNo() {}
int getTagNo() { return mTagNo; }
cPhs_State _create();
void createHeap();
@@ -32,6 +32,9 @@ public:
public:
/* Place member variables here */
};
/* 0x290 */ u8 field_0x290[0x318 - 0x290];
/* 0x318 */ u8 mTagNo;
/* 0x31C */ u8 field_0x31C[0x320 - 0x31C];
}; // Size: 0x320
#endif /* D_A_TAG_PHOTO_H */
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -91,7 +91,7 @@ public:
cXyz* speed = NULL, csXyz* angle = NULL, csXyz* shape_angle = NULL);
void GroundCheckInit(dBgS&);
void GroundCheck(dBgS&);
f32 GroundRoofProc(dBgS&);
void GroundRoofProc(dBgS&);
void LineCheck(dBgS&);
void CrrPos(dBgS&);
f32 GetWallAllR();
include/d/d_cc_uty.h
+3 -1
View File
@@ -29,6 +29,8 @@ void def_se_set_p(fopAc_ac_c*, cXyz*, cCcD_Obj*, unsigned long);
fopAc_ac_c* at_power_check(CcAtInfo*);
fopAc_ac_c* cc_at_check(fopAc_ac_c*, CcAtInfo*);
inline void dCc_GetAc(void*) {}
inline fopAc_ac_c* dCc_GetAc(void* i_obj) {
return ((cCcD_Obj*)i_obj)->GetAc();
}
#endif /* D_CC_UTY_H */
include/d/d_com_inf_game.h
+8
View File
@@ -522,6 +522,10 @@ public:
u8 getPictureStatus() { return mPictureStatus; }
void setPictureStatusOn() { mPictureStatus = 2; }
void setPictureStatusGetOn(u8 to_set) {
mPictureStatus = 3;
field_0x495f = to_set;
}
u8 getScopeMesgStatus() { return mScopeMesgStatus; }
void setScopeMesgStatus(u8 status) { mScopeMesgStatus = status; }
@@ -2768,6 +2772,10 @@ inline void dComIfGp_setPictureStatusOn() {
g_dComIfG_gameInfo.play.setPictureStatusOn();
}
inline void dComIfGp_setPictureStatusGetOn(u8 to_set){
g_dComIfG_gameInfo.play.setPictureStatusGetOn(to_set);
}
inline s16 dComIfGp_getMiniGameRupee() {
return g_dComIfG_gameInfo.play.getMiniGameRupee();
}
include/d/d_drawlist.h
+4
View File
@@ -413,7 +413,11 @@ public:
class dDlst_mirrorPacket : public J3DPacket {
public:
void init(ResTIMG*);
#if VERSION == VERSION_DEMO
void update(Mtx, u8);
#else
void update(Mtx, u8, f32);
#endif
virtual void draw();
/* 0x0010 */ u8 field_0x0010[0x0040 - 0x0010];
include/d/d_picture_box.h
+1 -1
View File
@@ -67,5 +67,5 @@ class dJle_Pb_c {
void draw();
void _delete(JKRExpHeap*);
};
void dPb_erasePicture();
#endif /* D_PICTURE_BOX_H */
include/f_op/f_op_actor_mng.h
+2 -3
View File
@@ -430,15 +430,14 @@ inline f32 fopAcM_searchActorDistanceY(fopAc_ac_c* actorA, fopAc_ac_c* actorB) {
return actorB->current.pos.y - actorA->current.pos.y;
}
inline u16 fopAcM_GetSetId(fopAc_ac_c* p_actor) {
inline int fopAcM_GetSetId(fopAc_ac_c* p_actor) {
return p_actor->setID;
}
inline void dComIfGs_onActor(int bitNo, int roomNo);
inline void fopAcM_onActor(fopAc_ac_c* p_actor) {
int setId = fopAcM_GetSetId(p_actor);
dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor));
dComIfGs_onActor(fopAcM_GetSetId(p_actor), fopAcM_GetHomeRoomNo(p_actor));
}
inline bool fopAcM_IsFirstCreating(void* i_actor) {