mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-22 21:22:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Annotate all data with DUSK_GAME_DATA (#2214)

Browse Source 
The hope of auto-importing data via lld MinGW
+ pseudo_reloc is now dead thanks to ARM64,
so I just wrote a script to go annotate every
exported data symbol in the game instead.
This commit is contained in:
Luke Street
2026-07-14 13:49:21 -06:00
committed by GitHub
parent f5d30a886d
commit eed14acdc6
843 changed files with 4817 additions and 4821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/DynamicLink.h
+3 -3
View File
@@ -88,9 +88,9 @@ struct DynamicModuleControl : DynamicModuleControlBase {
/* 0x24 */ s32 mSize;
/* 0x28 */ mDoDvdThd_callback_c* mAsyncLoadCallback;
static u32 sAllocBytes;
static JKRArchive* sArchive;
static JKRFileCache* sFileCache;
static DUSK_GAME_DATA u32 sAllocBytes;
static DUSK_GAME_DATA JKRArchive* sArchive;
static DUSK_GAME_DATA JKRFileCache* sFileCache;
};
#endif /* DYNAMICLINK_H */
include/SSystem/SComponent/c_API.h
+1 -1
View File
@@ -12,6 +12,6 @@ struct cAPI_Interface {
/* 0x14 */ cAPIGph_Mthd blankingOffMtd;
};
extern cAPI_Interface g_cAPI_Interface;
DUSK_GAME_EXTERN cAPI_Interface g_cAPI_Interface;
#endif /* C_API_H */
include/SSystem/SComponent/c_angle.h
+5 -5
View File
@@ -24,11 +24,11 @@ private:
s16 mAngle;
public:
const static cSAngle _0;
const static cSAngle _1;
const static cSAngle _90;
const static cSAngle _180;
const static cSAngle _270;
const static DUSK_GAME_DATA cSAngle _0;
const static DUSK_GAME_DATA cSAngle _1;
const static DUSK_GAME_DATA cSAngle _90;
const static DUSK_GAME_DATA cSAngle _180;
const static DUSK_GAME_DATA cSAngle _270;
#ifdef __MWERKS__
cSAngle() {}
~cSAngle() {}
include/SSystem/SComponent/c_cc_d.h
+1 -1
View File
@@ -435,7 +435,7 @@ public:
cM3dGAab& GetWorkAab() { return mAab; }
static cXyz m_virtual_center;
static DUSK_GAME_DATA cXyz m_virtual_center;
};
STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr));
include/SSystem/SComponent/c_counter.h
+1 -1
View File
@@ -9,7 +9,7 @@ struct counter_class {
u32 mTimer;
};
extern counter_class g_Counter;
DUSK_GAME_EXTERN counter_class g_Counter;
void cCt_Counter(int resetCounter1);
include/SSystem/SComponent/c_lib.h
+1 -1
View File
@@ -102,6 +102,6 @@ void MtxPosition(cXyz DUSK_CONST*, cXyz*);
void MtxPush(void);
void MtxPull(void);
extern Mtx* calc_mtx;
DUSK_GAME_EXTERN Mtx* calc_mtx;
#endif
include/SSystem/SComponent/c_m3d.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct cM3d_Range {
};
#define G_CM3D_F_INF (1000000000.0f)
extern const f32 G_CM3D_F_ABS_MIN;
DUSK_GAME_EXTERN const f32 G_CM3D_F_ABS_MIN;
static void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*);
void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*);
include/SSystem/SComponent/c_malloc.h
+1 -1
View File
@@ -6,7 +6,7 @@
class JKRHeap;
struct cMl {
static JKRHeap* Heap;
static DUSK_GAME_DATA JKRHeap* Heap;
static void init(JKRHeap*);
static void* memalignB(int, u32);
static void free(void*);
include/SSystem/SComponent/c_sxyz.h
+1 -1
View File
@@ -9,7 +9,7 @@ struct SVec {
class csXyz : public SVec {
public:
static const csXyz Zero;
static DUSK_GAME_DATA const csXyz Zero;
~csXyz() {}
csXyz() {}
csXyz(s16, s16, s16);
include/SSystem/SComponent/c_xyz.h
+8 -8
View File
@@ -14,14 +14,14 @@ struct cXy {
};
struct cXyz : Vec {
static const cXyz Zero;
static const cXyz BaseX;
static const cXyz BaseY;
static const cXyz BaseZ;
static const cXyz BaseXY;
static const cXyz BaseXZ;
static const cXyz BaseYZ;
static const cXyz BaseXYZ;
static DUSK_GAME_DATA const cXyz Zero;
static DUSK_GAME_DATA const cXyz BaseX;
static DUSK_GAME_DATA const cXyz BaseY;
static DUSK_GAME_DATA const cXyz BaseZ;
static DUSK_GAME_DATA const cXyz BaseXY;
static DUSK_GAME_DATA const cXyz BaseXZ;
static DUSK_GAME_DATA const cXyz BaseYZ;
static DUSK_GAME_DATA const cXyz BaseXYZ;
#ifdef __MWERKS__
cXyz() {}
~cXyz() {}
include/Z2AudioLib/Z2Audience.h
+2 -2
View File
@@ -256,7 +256,7 @@ inline Z2Audience* Z2GetAudience() {
return JASGlobalInstance<Z2Audience>::getInstance();
}
extern s8 data_80451358;
extern s8 data_80451359;
DUSK_GAME_EXTERN s8 data_80451358;
DUSK_GAME_EXTERN s8 data_80451359;
#endif /* Z2AUDIENCE_H */
include/Z2AudioLib/Z2AudioMgr.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
bool isResetting() { return mResettingFlag; }
static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
static Z2AudioMgr* mAudioMgrPtr;
static DUSK_GAME_DATA Z2AudioMgr* mAudioMgrPtr;
/* 0x0514 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
/* 0x0518 */ bool mResettingFlag;
include/Z2AudioLib/Z2Calc.h
+2 -2
View File
@@ -42,8 +42,8 @@ f32 getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32
f32 getRandom(f32 magnitude, f32 exponent, f32 bias);
f32 getRandom_0_1();
extern const f32 cEqualCSlope;
extern const f32 cEqualPSlope;
DUSK_GAME_EXTERN const f32 cEqualCSlope;
DUSK_GAME_EXTERN const f32 cEqualPSlope;
} // namespace Z2Calc
#endif /* Z2CALC_H */
include/Z2AudioLib/Z2EnvSeMgr.h
+1 -1
View File
@@ -175,7 +175,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
STATIC_ASSERT(sizeof(Z2EnvSeMgr) == 0x30C);
extern Z2EnvSeMgr g_mEnvSeMgr;
DUSK_GAME_EXTERN Z2EnvSeMgr g_mEnvSeMgr;
inline Z2EnvSeMgr* Z2GetEnvSeMgr() {
return JASGlobalInstance<Z2EnvSeMgr>::getInstance();
include/Z2AudioLib/Z2LinkMgr.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
void setUsingIronBall(bool isUsingIronBall) { mUsingIronBall = isUsingIronBall; }
void setMarkState(u8 state) { mMarkState = state; }
static Z2CreatureLink* mLinkPtr;
static DUSK_GAME_DATA Z2CreatureLink* mLinkPtr;
static Z2CreatureLink* getLink() { return mLinkPtr; }
friend class Z2LinkSoundStarter;
include/Z2AudioLib/Z2Param.h
+52 -52
View File
@@ -4,72 +4,72 @@
#include <types.h>
struct Z2Param {
static f32 DISTANCE_MAX;
static f32 MAX_VOLUME_DISTANCE;
static f32 DOLBY_CENTER_VALUE;
static f32 DOLBY_FLONT_DISTANCE_MAX;
static f32 DOLBY_BEHIND_DISTANCE_MAX;
static f32 DISTANCE_FX_PARAM;
static f32 SONIC_SPEED;
static f32 VOL_BGM_DEFAULT;
static f32 VOL_SE_SYSTEM_DEFAULT;
static f32 VOL_SE_LINK_VOICE_DEFAULT;
static f32 VOL_SE_LINK_MOTION_DEFAULT;
static f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
static f32 VOL_SE_CHAR_VOICE_DEFAULT;
static f32 VOL_SE_CHAR_MOVE_DEFAULT;
static f32 VOL_SE_OBJECT_DEFAULT;
static f32 VOL_SE_ATMOSPHERE_DEFAULT;
static f32 VOL_BGM_TALKING;
static f32 VOL_SE_SYSTEM_TALKING;
static f32 VOL_SE_LINK_VOICE_TALKING;
static f32 VOL_SE_LINK_MOTION_TALKING;
static f32 VOL_SE_LINK_FOOTNOTE_TALKING;
static f32 VOL_SE_CHAR_VOICE_TALKING;
static f32 VOL_SE_CHAR_MOVE_TALKING;
static f32 VOL_SE_OBJECT_TALKING;
static f32 VOL_SE_ATMOSPHERE_TALKING;
static f32 VOL_BGM_PAUSING;
static f32 VOL_SE_SYSTEM_PAUSING;
static f32 VOL_SE_LINK_VOICE_PAUSING;
static f32 VOL_SE_LINK_MOTION_PAUSING;
static f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
static f32 VOL_SE_CHAR_VOICE_PAUSING;
static f32 VOL_SE_CHAR_MOVE_PAUSING;
static f32 VOL_SE_OBJECT_PAUSING;
static f32 VOL_SE_ATMOSPHERE_PAUSING;
static f32 MIN_DISTANCE_VOLUME;
static f32 ENEMY_LASTHIT_MUTE_VOLUME;
static DUSK_GAME_DATA f32 DISTANCE_MAX;
static DUSK_GAME_DATA f32 MAX_VOLUME_DISTANCE;
static DUSK_GAME_DATA f32 DOLBY_CENTER_VALUE;
static DUSK_GAME_DATA f32 DOLBY_FLONT_DISTANCE_MAX;
static DUSK_GAME_DATA f32 DOLBY_BEHIND_DISTANCE_MAX;
static DUSK_GAME_DATA f32 DISTANCE_FX_PARAM;
static DUSK_GAME_DATA f32 SONIC_SPEED;
static DUSK_GAME_DATA f32 VOL_BGM_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_DEFAULT;
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_DEFAULT;
static DUSK_GAME_DATA f32 VOL_BGM_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_TALKING;
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_TALKING;
static DUSK_GAME_DATA f32 VOL_BGM_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_PAUSING;
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_PAUSING;
static DUSK_GAME_DATA f32 MIN_DISTANCE_VOLUME;
static DUSK_GAME_DATA f32 ENEMY_LASTHIT_MUTE_VOLUME;
// made up names based on HIO labels
static u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
static u8 BGM_CROSS_FADEIN_TIME;
static u8 BGM_CROSS_FADEOUT_TIME;
static u8 BATTLE_BGM_WAIT_TIME;
static DUSK_GAME_DATA u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
static DUSK_GAME_DATA u8 BGM_CROSS_FADEIN_TIME;
static DUSK_GAME_DATA u8 BGM_CROSS_FADEOUT_TIME;
static DUSK_GAME_DATA u8 BATTLE_BGM_WAIT_TIME;
static f32 ENEMY_NEARBY_DIST;
static f32 BATTLE_FADEIN_DIST;
static f32 BATTLE_FADEOUT_DIST;
static u8 FOUND_TRACK_FI_TIME;
static u8 FOUND_TRACK_FO_TIME;
static u8 CLOSE_BATTLE_TRACK_FI_TIME;
static u8 CLOSE_BATTLE_TRACK_FO_TIME;
static DUSK_GAME_DATA u8 FOUND_TRACK_FI_TIME;
static DUSK_GAME_DATA u8 FOUND_TRACK_FO_TIME;
static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FI_TIME;
static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FO_TIME;
static u8 ENDING_BLOW_VOL_DOWN_TIME;
static u8 ENDING_BLOW_VOL_LOWER_TIME;
static u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
static u8 ENDING_BLOW_MIN_FINISH_TIME;
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_DOWN_TIME;
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_TIME;
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
static DUSK_GAME_DATA u8 ENDING_BLOW_MIN_FINISH_TIME;
static u8 DARK_SE_FILTER_ON;
static u8 DARK_SE_LOW_PASS_FILTER_SETTING;
static u8 SYSTEM_SE_USE_DARK_SE_SETTING;
static DUSK_GAME_DATA u8 DARK_SE_FILTER_ON;
static DUSK_GAME_DATA u8 DARK_SE_LOW_PASS_FILTER_SETTING;
static DUSK_GAME_DATA u8 SYSTEM_SE_USE_DARK_SE_SETTING;
static f32 AUDIBLE_DELTA_RANGE_VOLUME;
static f32 AUDIBLE_DELTA_RANGE_PAN;
static f32 AUDIBLE_DELTA_RANGE_DOLBY;
};
extern u8 data_8045086C;
DUSK_GAME_EXTERN u8 data_8045086C;
#endif /* Z2PARAM_H */
include/c/c_damagereaction.h
+10 -10
View File
@@ -12,18 +12,18 @@ public:
BOOL cDmrNowMidnaTalk();
extern u8 cDmr_SkipInfo;
extern u8 data_80450C99;
extern u8 data_80450C9A;
extern u8 data_80450C9B;
extern u8 data_80450C9C;
extern u8 data_80450C9D;
extern u8 data_80450C9E;
extern u8 cDmr_FishingWether;
extern u8 data_80450CA0;
DUSK_GAME_EXTERN u8 cDmr_SkipInfo;
DUSK_GAME_EXTERN u8 data_80450C99;
DUSK_GAME_EXTERN u8 data_80450C9A;
DUSK_GAME_EXTERN u8 data_80450C9B;
DUSK_GAME_EXTERN u8 data_80450C9C;
DUSK_GAME_EXTERN u8 data_80450C9D;
DUSK_GAME_EXTERN u8 data_80450C9E;
DUSK_GAME_EXTERN u8 cDmr_FishingWether;
DUSK_GAME_EXTERN u8 data_80450CA0;
extern "C" {
extern JPTraceParticleCallBack4 JPTracePCB4;
DUSK_GAME_EXTERN JPTraceParticleCallBack4 JPTracePCB4;
}
void debug_actor_create();
include/d/actor/d_a_alink.h
+127 -127
View File
@@ -57,8 +57,8 @@ public:
void setNowOffsetX(f32 i_offset) { mNowOffsetX = i_offset; }
void setNowOffsetY(f32 i_offset) { mNowOffsetY = i_offset; }
static bool m_eye_move_flg;
static u8 m_morf_frame;
static DUSK_GAME_DATA bool m_eye_move_flg;
static DUSK_GAME_DATA u8 m_morf_frame;
/* 0x0F4 */ mutable f32 field_0xf4;
/* 0x0F8 */ mutable f32 field_0xf8;
@@ -3913,20 +3913,20 @@ public:
static u32 getOtherHeapSize() { return 0xF0A60; }
static daAlink_BckData const m_mainBckShield[20];
static daAlink_BckData const m_mainBckSword[5];
static daAlink_BckData const m_mainBckFishing[28];
static daAlink_AnmData const m_anmDataTable[ANM_MAX];
static daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
static daAlink_FaceTexData const m_faceTexDataTable[];
static Vec const m_handLeftOutSidePos;
static Vec const m_handRightOutSidePos;
static Vec const m_handLeftInSidePos;
static Vec const m_handRightInSidePos;
static DUSK_GAME_DATA daAlink_BckData const m_mainBckShield[20];
static DUSK_GAME_DATA daAlink_BckData const m_mainBckSword[5];
static DUSK_GAME_DATA daAlink_BckData const m_mainBckFishing[28];
static DUSK_GAME_DATA daAlink_AnmData const m_anmDataTable[ANM_MAX];
static DUSK_GAME_DATA daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
static DUSK_GAME_DATA daAlink_FaceTexData const m_faceTexDataTable[];
static DUSK_GAME_DATA Vec const m_handLeftOutSidePos;
static DUSK_GAME_DATA Vec const m_handRightOutSidePos;
static DUSK_GAME_DATA Vec const m_handLeftInSidePos;
static DUSK_GAME_DATA Vec const m_handRightInSidePos;
static const daAlink_procInitTable m_procInitTable[];
static daAlink_procFunc m_demoInitTable[];
static const EffParamProc m_fEffParamProc[];
static DUSK_GAME_DATA const daAlink_procInitTable m_procInitTable[];
static DUSK_GAME_DATA daAlink_procFunc m_demoInitTable[];
static DUSK_GAME_DATA const EffParamProc m_fEffParamProc[];
/* 0x0062C */ request_of_phase_process_class mPhaseReq;
/* 0x00634 */ const char* mArcName;
@@ -4649,7 +4649,7 @@ struct daAlinkHIO_basic_c1 {
class daAlinkHIO_basic_c0 {
public:
static daAlinkHIO_basic_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_basic_c1 const m;
};
class daAlinkHIO_basic_c : public daAlinkHIO_data_c {
@@ -4700,7 +4700,7 @@ public:
class daAlinkHIO_move_c0 {
public:
static daAlinkHIO_move_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_move_c1 const m;
};
class daAlinkHIO_move_c : public daAlinkHIO_data_c {
@@ -4746,7 +4746,7 @@ public:
class daAlinkHIO_atnMove_c0 {
public:
static daAlinkHIO_atnMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_atnMove_c1 const m;
};
class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c {
@@ -4792,7 +4792,7 @@ public:
class daAlinkHIO_noActAtnMove_c0 {
public:
static daAlinkHIO_noActAtnMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_noActAtnMove_c1 const m;
};
class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c {
@@ -4834,7 +4834,7 @@ public:
class daAlinkHIO_frontRoll_c0 {
public:
static daAlinkHIO_frontRoll_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_frontRoll_c1 const m;
};
class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c {
@@ -4864,7 +4864,7 @@ public:
class daAlinkHIO_backJump_c0 {
public:
static daAlinkHIO_backJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_backJump_c1 const m;
};
class daAlinkHIO_backJump_c : public daAlinkHIO_data_c {
@@ -4898,7 +4898,7 @@ public:
class daAlinkHIO_sideStep_c0 {
public:
static daAlinkHIO_sideStep_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_sideStep_c1 const m;
};
class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c {
@@ -4936,7 +4936,7 @@ public:
class daAlinkHIO_slide_c0 {
public:
static daAlinkHIO_slide_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_slide_c1 const m;
};
class daAlinkHIO_slide_c : public daAlinkHIO_data_c {
@@ -4964,27 +4964,27 @@ public:
class daAlinkHIO_cutNmV_c0 {
public:
static daAlinkHIO_cutNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
};
class daAlinkHIO_cutNmL_c0 {
public:
static daAlinkHIO_cutNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
};
class daAlinkHIO_cutNmR_c0 {
public:
static daAlinkHIO_cutNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
};
class daAlinkHIO_cutNmSL_c0 {
public:
static daAlinkHIO_cutNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
};
class daAlinkHIO_cutNmSR_c0 {
public:
static daAlinkHIO_cutNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
};
class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c {
@@ -5015,32 +5015,32 @@ public:
class daAlinkHIO_cutFnL_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFnV_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFnS_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFnSl_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFnSm_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFnR_c0 {
public:
static daAlinkHIO_cutFinish_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
};
class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c {
@@ -5077,7 +5077,7 @@ public:
class daAlinkHIO_cutFnJU_c0 {
public:
static daAlinkHIO_cutFnJU_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutFnJU_c1 const m;
};
class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c {
@@ -5104,17 +5104,17 @@ public:
class daAlinkHIO_cutDaL_c0 {
public:
static daAlinkHIO_cutDash_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
};
class daAlinkHIO_cutDaR_c0 {
public:
static daAlinkHIO_cutDash_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
};
class daAlinkHIO_cutDaCharge_c0 {
public:
static daAlinkHIO_cutDash_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
};
class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c {
@@ -5146,7 +5146,7 @@ public:
class daAlinkHIO_cutJump_c0 {
public:
static daAlinkHIO_cutJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutJump_c1 const m;
};
class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c {
@@ -5197,7 +5197,7 @@ public:
class daAlinkHIO_cutTurn_c0 {
public:
static daAlinkHIO_cutTurn_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutTurn_c1 const m;
};
class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c {
@@ -5225,22 +5225,22 @@ public:
class daAlinkHIO_hoCutLA_c0 {
public:
static daAlinkHIO_hoCut_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutLB_c0 {
public:
static daAlinkHIO_hoCut_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutRA_c0 {
public:
static daAlinkHIO_hoCut_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutRB_c0 {
public:
static daAlinkHIO_hoCut_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c {
@@ -5273,7 +5273,7 @@ public:
class daAlinkHIO_hoCutCharge_c0 {
public:
static daAlinkHIO_hoCutCharge_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hoCutCharge_c1 const m;
};
class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c {
@@ -5307,7 +5307,7 @@ public:
class daAlinkHIO_cutDown_c0 {
public:
static daAlinkHIO_cutDown_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutDown_c1 const m;
};
class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c {
@@ -5343,7 +5343,7 @@ public:
class daAlinkHIO_cutHead_c0 {
public:
static daAlinkHIO_cutHead_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutHead_c1 const m;
};
class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c {
@@ -5380,7 +5380,7 @@ public:
class daAlinkHIO_cutLargeJump_c0 {
public:
static daAlinkHIO_cutLargeJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cutLargeJump_c1 const m;
};
class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c {
@@ -5457,7 +5457,7 @@ public:
static daAlinkHIO_cutDown_c0 const mCutDown;
static daAlinkHIO_cutHead_c0 const mCutHead;
static daAlinkHIO_cutLargeJump_c0 const mCutLargeJump;
static daAlinkHIO_cut_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_cut_c1 const m;
};
class daAlinkHIO_cut_c : public daAlinkHIO_data_c {
@@ -5513,12 +5513,12 @@ public:
class daAlinkHIO_gAtPush_c0 {
public:
static daAlinkHIO_guardAttack_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
};
class daAlinkHIO_gAtKick_c0 {
public:
static daAlinkHIO_guardAttack_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
};
class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c {
@@ -5550,7 +5550,7 @@ public:
class daAlinkHIO_turnMove_c0 {
public:
static daAlinkHIO_turnMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_turnMove_c1 const m;
};
class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c {
@@ -5595,7 +5595,7 @@ public:
static daAlinkHIO_gAtPush_c0 const mAtPush;
static daAlinkHIO_gAtKick_c0 const mAtKick;
static daAlinkHIO_turnMove_c0 const mTurnMove;
static daAlinkHIO_guard_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_guard_c1 const m;
};
class daAlinkHIO_guard_c : public daAlinkHIO_data_c {
@@ -5634,7 +5634,7 @@ public:
class daAlinkHIO_crouch_c0 {
public:
static daAlinkHIO_crouch_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_crouch_c1 const m;
};
class daAlinkHIO_crouch_c : public daAlinkHIO_data_c {
@@ -5689,7 +5689,7 @@ public:
class daAlinkHIO_autoJump_c0 {
public:
static daAlinkHIO_autoJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_autoJump_c1 const m;
};
class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c {
@@ -5719,7 +5719,7 @@ public:
class daAlinkHIO_smallJump_c0 {
public:
static daAlinkHIO_smallJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_smallJump_c1 const m;
};
class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c {
@@ -5748,7 +5748,7 @@ public:
class daAlinkHIO_wallCatch_c0 {
public:
static daAlinkHIO_wallCatch_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wallCatch_c1 const m;
};
class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c {
@@ -5774,7 +5774,7 @@ public:
class daAlinkHIO_wallFall_c0 {
public:
static daAlinkHIO_wallFall_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wallFall_c1 const m;
};
class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c {
@@ -5803,7 +5803,7 @@ public:
class daAlinkHIO_wallMove_c0 {
public:
static daAlinkHIO_wallMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wallMove_c1 const m;
};
class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c {
@@ -5839,7 +5839,7 @@ public:
static daAlinkHIO_wallCatch_c0 const mWallCatch;
static daAlinkHIO_wallFall_c0 const mWallFall;
static daAlinkHIO_wallMove_c0 const mWallMove;
static daAlinkHIO_wallHang_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wallHang_c1 const m;
};
class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c {
@@ -5886,7 +5886,7 @@ public:
class daAlinkHIO_pushpull_c0 {
public:
static daAlinkHIO_pushpull_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_pushpull_c1 const m;
};
class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c {
@@ -5920,7 +5920,7 @@ public:
class daAlinkHIO_damNormal_c0 {
public:
static daAlinkHIO_damNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damNormal_c1 const m;
};
class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c {
@@ -5959,12 +5959,12 @@ public:
class daAlinkHIO_damLarge_c0 {
public:
static daAlinkHIO_damLaHu_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
};
class daAlinkHIO_damHuge_c0 {
public:
static daAlinkHIO_damLaHu_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
};
class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c {
@@ -5992,7 +5992,7 @@ public:
class daAlinkHIO_damHorse_c0 {
public:
static daAlinkHIO_damHorse_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damHorse_c1 const m;
};
class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c {
@@ -6027,7 +6027,7 @@ public:
class daAlinkHIO_damFall_c0 {
public:
static daAlinkHIO_damFall_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damFall_c1 const m;
};
class daAlinkHIO_damFall_c : public daAlinkHIO_data_c {
@@ -6057,7 +6057,7 @@ public:
class daAlinkHIO_damCaught_c0 {
public:
static daAlinkHIO_damCaught_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damCaught_c1 const m;
};
class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c {
@@ -6093,7 +6093,7 @@ public:
class daAlinkHIO_damSwim_c0 {
public:
static daAlinkHIO_damSwim_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damSwim_c1 const m;
};
class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c {
@@ -6140,7 +6140,7 @@ public:
class daAlinkHIO_damage_c0 {
public:
static daAlinkHIO_damage_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_damage_c1 const m;
static daAlinkHIO_damNormal_c0 const mDamNormal;
static daAlinkHIO_damLarge_c0 const mDamLarge;
static daAlinkHIO_damHuge_c0 const mDamHuge;
@@ -6192,7 +6192,7 @@ public:
class daAlinkHIO_horse_c0 {
public:
static daAlinkHIO_horse_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_horse_c1 const m;
};
class daAlinkHIO_horse_c : public daAlinkHIO_data_c {
@@ -6231,7 +6231,7 @@ public:
class daAlinkHIO_canoe_c0 {
public:
static daAlinkHIO_canoe_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_canoe_c1 const m;
};
class daAlinkHIO_canoe_c : public daAlinkHIO_data_c {
@@ -6276,7 +6276,7 @@ public:
class daAlinkHIO_bow_c0 {
public:
static daAlinkHIO_bow_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_bow_c1 const m;
};
class daAlinkHIO_bow_c : public daAlinkHIO_data_c {
@@ -6312,7 +6312,7 @@ public:
class daAlinkHIO_boom_c0 {
public:
static daAlinkHIO_boom_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_boom_c1 const m;
};
class daAlinkHIO_boom_c : public daAlinkHIO_data_c {
@@ -6356,7 +6356,7 @@ public:
class daAlinkHIO_bomb_c0 {
public:
static daAlinkHIO_bomb_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_bomb_c1 const m;
};
class daAlinkHIO_bomb_c : public daAlinkHIO_data_c {
@@ -6391,7 +6391,7 @@ public:
class daAlinkHIO_huLight_c0 {
public:
static daAlinkHIO_huLight_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_huLight_c1 const m;
};
class daAlinkHIO_wlLight_c1 {
@@ -6410,7 +6410,7 @@ public:
class daAlinkHIO_wlLight_c0 {
public:
static daAlinkHIO_wlLight_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlLight_c1 const m;
};
class daAlinkHIO_zwLight_c1 { // may be wrong
@@ -6429,7 +6429,7 @@ public:
class daAlinkHIO_zwLight_c0 {
public:
static daAlinkHIO_zwLight_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_zwLight_c1 const m;
};
class daAlinkHIO_light_c : public daAlinkHIO_data_c {
@@ -6465,7 +6465,7 @@ public:
class daAlinkHIO_kandelaar_c0 {
public:
static daAlinkHIO_kandelaar_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_kandelaar_c1 const m;
};
class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c {
@@ -6504,7 +6504,7 @@ public:
class daAlinkHIO_magneBoots_c0 {
public:
static daAlinkHIO_magneBoots_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_magneBoots_c1 const m;
};
class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c {
@@ -6530,7 +6530,7 @@ public:
class daAlinkHIO_fmChain_c0 {
public:
static daAlinkHIO_fmChain_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_fmChain_c1 const m;
};
class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c {
@@ -6570,7 +6570,7 @@ public:
class daAlinkHIO_hookshot_c0 {
public:
static daAlinkHIO_hookshot_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_hookshot_c1 const m;
};
class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c {
@@ -6608,7 +6608,7 @@ public:
class daAlinkHIO_spinner_c0 {
public:
static daAlinkHIO_spinner_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_spinner_c1 const m;
};
class daAlinkHIO_spinner_c : public daAlinkHIO_data_c {
@@ -6664,7 +6664,7 @@ public:
class daAlinkHIO_ironBall_c0 {
public:
static daAlinkHIO_ironBall_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_ironBall_c1 const m;
};
class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c {
@@ -6694,7 +6694,7 @@ public:
class daAlinkHIO_copyRod_c0 {
public:
static daAlinkHIO_copyRod_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_copyRod_c1 const m;
};
class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c {
@@ -6722,7 +6722,7 @@ public:
class daAlinkHIO_pickUp_c0 {
public:
static daAlinkHIO_pickUp_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_pickUp_c1 const m;
};
class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c {
@@ -6769,7 +6769,7 @@ public:
class daAlinkHIO_board_c0 {
public:
static daAlinkHIO_board_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_board_c1 const m;
};
class daAlinkHIO_board_c : public daAlinkHIO_data_c {
@@ -6802,7 +6802,7 @@ public:
class daAlinkHIO_bottle_c0 {
public:
static daAlinkHIO_bottle_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_bottle_c1 const m;
};
class daAlinkHIO_bottle_c : public daAlinkHIO_data_c {
@@ -6850,7 +6850,7 @@ public:
static daAlinkHIO_ironBall_c0 const mIronBall;
static daAlinkHIO_copyRod_c0 const mCopyRod;
static daAlinkHIO_zwLight_c0 const mZoraArmorPL;
static daAlinkHIO_item_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_item_c1 const m;
};
class daAlinkHIO_item_c : public daAlinkHIO_data_c {
@@ -6909,7 +6909,7 @@ public:
class daAlinkHIO_ladder_c0 {
public:
static daAlinkHIO_ladder_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_ladder_c1 const m;
};
class daAlinkHIO_ladder_c : public daAlinkHIO_data_c {
@@ -6949,7 +6949,7 @@ public:
class daAlinkHIO_roofHang_c0 {
public:
static daAlinkHIO_roofHang_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_roofHang_c1 const m;
};
class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c {
@@ -6987,7 +6987,7 @@ public:
class daAlinkHIO_grab_c0 {
public:
static daAlinkHIO_grab_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_grab_c1 const m;
};
class daAlinkHIO_grab_c : public daAlinkHIO_data_c {
@@ -7062,7 +7062,7 @@ public:
class daAlinkHIO_swim_c0 {
public:
static daAlinkHIO_swim_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_swim_c1 const m;
};
class daAlinkHIO_swim_c : public daAlinkHIO_data_c {
@@ -7138,7 +7138,7 @@ public:
class daAlinkHIO_wlMove_c0 {
public:
static daAlinkHIO_wlMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlMove_c1 const m;
};
class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c {
@@ -7181,7 +7181,7 @@ public:
class daAlinkHIO_wlMoveNoP_c0 {
public:
static daAlinkHIO_wlMoveNoP_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlMoveNoP_c1 const m;
};
class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c {
@@ -7220,7 +7220,7 @@ public:
class daAlinkHIO_wlAtnMove_c0 {
public:
static daAlinkHIO_wlAtnMove_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtnMove_c1 const m;
};
class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c {
@@ -7252,7 +7252,7 @@ public:
class daAlinkHIO_wlHowl_c0 {
public:
static daAlinkHIO_wlHowl_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlHowl_c1 const m;
};
class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c {
@@ -7286,7 +7286,7 @@ public:
class daAlinkHIO_wlSideStep_c0 {
public:
static daAlinkHIO_wlSideStep_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlSideStep_c1 const m;
};
class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c {
@@ -7316,7 +7316,7 @@ public:
class daAlinkHIO_wlBackJump_c0 {
public:
static daAlinkHIO_wlBackJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlBackJump_c1 const m;
};
class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c {
@@ -7361,7 +7361,7 @@ public:
class daAlinkHIO_wlAutoJump_c0 {
public:
static daAlinkHIO_wlAutoJump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAutoJump_c1 const m;
};
class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c {
@@ -7390,7 +7390,7 @@ public:
class daAlinkHIO_wlPush_c0 {
public:
static daAlinkHIO_wlPush_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlPush_c1 const m;
};
class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c {
@@ -7426,7 +7426,7 @@ public:
class daAlinkHIO_wlLie_c0 {
public:
static daAlinkHIO_wlLie_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlLie_c1 const m;
};
class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c {
@@ -7465,7 +7465,7 @@ public:
class daAlinkHIO_wlWallHang_c0 {
public:
static daAlinkHIO_wlWallHang_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlWallHang_c1 const m;
};
class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c {
@@ -7497,7 +7497,7 @@ public:
class daAlinkHIO_wlDamNormal_c0 {
public:
static daAlinkHIO_wlDamNormal_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamNormal_c1 const m;
};
class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c {
@@ -7532,12 +7532,12 @@ public:
class daAlinkHIO_wlDamLarge_c0 {
public:
static daAlinkHIO_wlDamLaHu_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
};
class daAlinkHIO_wlDamHuge_c0 {
public:
static daAlinkHIO_wlDamLaHu_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
};
class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c {
@@ -7566,7 +7566,7 @@ public:
class daAlinkHIO_wlDamCaught_c0 {
public:
static daAlinkHIO_wlDamCaught_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamCaught_c1 const m;
};
class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c {
@@ -7599,7 +7599,7 @@ public:
class daAlinkHIO_wlDamFall_c0 {
public:
static daAlinkHIO_wlDamFall_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamFall_c1 const m;
};
class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c {
@@ -7626,7 +7626,7 @@ public:
class daAlinkHIO_wlDamage_c0 {
public:
static daAlinkHIO_wlDamage_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlDamage_c1 const m;
static daAlinkHIO_wlDamNormal_c0 const mNormal;
static daAlinkHIO_wlDamLarge_c0 const mLarge;
static daAlinkHIO_wlDamHuge_c0 const mHuge;
@@ -7676,7 +7676,7 @@ public:
class daAlinkHIO_wlSlide_c0 {
public:
static daAlinkHIO_wlSlide_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlSlide_c1 const m;
};
class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c {
@@ -7711,7 +7711,7 @@ public:
class daAlinkHIO_wlRope_c0 {
public:
static daAlinkHIO_wlRope_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlRope_c1 const m;
};
class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c {
@@ -7747,17 +7747,17 @@ public:
class daAlinkHIO_wlAtWaTl_c0 {
public:
static daAlinkHIO_wlAtWait_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
};
class daAlinkHIO_wlAtWaSc_c0 {
public:
static daAlinkHIO_wlAtWait_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
};
class daAlinkHIO_wlAtWaLr_c0 {
public:
static daAlinkHIO_wlAtWait_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
};
class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c {
@@ -7784,7 +7784,7 @@ public:
class daAlinkHIO_wlAtRoll_c0 {
public:
static daAlinkHIO_wlAtRoll_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtRoll_c1 const m;
};
class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c {
@@ -7819,7 +7819,7 @@ public:
class daAlinkHIO_wlAtNjump_c0 {
public:
static daAlinkHIO_wlAtNjump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtNjump_c1 const m;
};
class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c {
@@ -7860,7 +7860,7 @@ public:
class daAlinkHIO_wlAtCjump_c0 {
public:
static daAlinkHIO_wlAtCjump_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtCjump_c1 const m;
};
class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c {
@@ -7888,7 +7888,7 @@ public:
class daAlinkHIO_wlAtLand_c0 {
public:
static daAlinkHIO_wlAtLand_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtLand_c1 const m;
};
class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c {
@@ -7924,7 +7924,7 @@ public:
class daAlinkHIO_wlAtDown_c0 {
public:
static daAlinkHIO_wlAtDown_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtDown_c1 const m;
};
class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c {
@@ -7961,7 +7961,7 @@ public:
class daAlinkHIO_wlAtLock_c0 {
public:
static daAlinkHIO_wlAtLock_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtLock_c1 const m;
};
class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c {
@@ -8001,7 +8001,7 @@ public:
class daAlinkHIO_wlAtBite_c0 {
public:
static daAlinkHIO_wlAtBite_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAtBite_c1 const m;
};
class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c {
@@ -8046,7 +8046,7 @@ public:
static daAlinkHIO_wlAtDown_c0 const mWlAtDown;
static daAlinkHIO_wlAtLock_c0 const mWlAtLock;
static daAlinkHIO_wlAtBite_c0 const mWlAtBite;
static daAlinkHIO_wlAttack_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlAttack_c1 const m;
};
class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c {
@@ -8093,7 +8093,7 @@ public:
class daAlinkHIO_wlPoint_c0 {
public:
static daAlinkHIO_wlPoint_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlPoint_c1 const m;
};
class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c {
@@ -8129,7 +8129,7 @@ public:
class daAlinkHIO_wlChain_c0 {
public:
static daAlinkHIO_wlChain_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlChain_c1 const m;
};
class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c {
@@ -8186,7 +8186,7 @@ public:
class daAlinkHIO_wlSwim_c0 {
public:
static daAlinkHIO_wlSwim_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlSwim_c1 const m;
};
class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c {
@@ -8215,7 +8215,7 @@ public:
class daAlinkHIO_wlGrab_c0 {
public:
static daAlinkHIO_wlGrab_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlGrab_c1 const m;
};
class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c {
@@ -8245,7 +8245,7 @@ public:
class daAlinkHIO_wlBall_c0 {
public:
static daAlinkHIO_wlBall_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wlBall_c1 const m;
};
class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c {
@@ -8300,7 +8300,7 @@ public:
static daAlinkHIO_wlSwim_c0 const mWlSwim;
static daAlinkHIO_wlGrab_c0 const mWlGrab;
static daAlinkHIO_wlBall_c0 const mWlBall;
static daAlinkHIO_wolf_c1 const m;
static DUSK_GAME_DATA daAlinkHIO_wolf_c1 const m;
};
class daAlinkHIO_wolf_c : public daAlinkHIO_data_c {
include/d/actor/d_a_arrow.h
+1 -1
View File
@@ -161,7 +161,7 @@ private:
/* 0xA10 */ dPa_hermiteEcallBack_c field_0xa10;
/* 0xA28 */ int (daArrow_c::*mProcFunc)();
static s16 m_count;
static DUSK_GAME_DATA s16 m_count;
};
STATIC_ASSERT(sizeof(daArrow_c) == 0xA34);
include/d/actor/d_a_balloon_2D.h
+1 -1
View File
@@ -67,7 +67,7 @@ public:
void hide() { mIsVisible = 0; }
u8 isVisible() { return mIsVisible; }
static daBalloon2D_c* myclass;
static DUSK_GAME_DATA daBalloon2D_c* myclass;
struct ScoreCount {
cXyz field_0x0;
include/d/actor/d_a_bg_obj.h
+4 -4
View File
@@ -89,10 +89,10 @@ public:
void setAction(u8 i_action) { mAction = i_action; }
static createHeapFunc mCreateHeapFunc[];
static createInitFunc mCreateInitFunc[];
static executeFunc mExecuteFunc[];
static tgSetFunc mTgSetFunc[];
static DUSK_GAME_DATA createHeapFunc mCreateHeapFunc[];
static DUSK_GAME_DATA createInitFunc mCreateInitFunc[];
static DUSK_GAME_DATA executeFunc mExecuteFunc[];
static DUSK_GAME_DATA tgSetFunc mTgSetFunc[];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* field_0x5a8[2][2];
include/d/actor/d_a_boomerang.h
+6 -6
View File
@@ -190,12 +190,12 @@ STATIC_ASSERT(sizeof(daBoomerang_c) == 0xDE4);
class daBoomerang_HIO_c0 {
public:
static u16 const m_lockWaitTime;
static f32 const m_minCircleR;
static f32 const m_middleCircleR;
static f32 const m_maxCircleR;
static f32 const m_scale;
static f32 const m_lockWindScale;
static DUSK_GAME_DATA u16 const m_lockWaitTime;
static DUSK_GAME_DATA f32 const m_minCircleR;
static DUSK_GAME_DATA f32 const m_middleCircleR;
static DUSK_GAME_DATA f32 const m_maxCircleR;
static DUSK_GAME_DATA f32 const m_scale;
static DUSK_GAME_DATA f32 const m_lockWindScale;
};
#endif /* D_A_BOOMERANG_H */
include/d/actor/d_a_bullet.h
+3 -3
View File
@@ -18,7 +18,7 @@ class daBullet_Param_c {
public:
virtual ~daBullet_Param_c() {}
static daBullet_HIOParam const m;
static DUSK_GAME_DATA daBullet_HIOParam const m;
};
#if DEBUG
@@ -80,8 +80,8 @@ public:
int wait(void*);
int move(void*);
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcSph mCcDSph;
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
};
STATIC_ASSERT(sizeof(daBullet_c) == 0x95c);
include/d/actor/d_a_coach_fire.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
const CoachFireAttr& attr() { return M_attr; }
static CoachFireAttr const M_attr;
static DUSK_GAME_DATA CoachFireAttr const M_attr;
inline ~daCoachFire_c();
include/d/actor/d_a_cstaF.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
struct BckTbl {
u16 idx[4];
};
static const BckTbl m_bckIdxTable[];
static DUSK_GAME_DATA const BckTbl m_bckIdxTable[];
private:
/* 0x5A0 */ const char* m_arcName;
include/d/actor/d_a_cstatue.h
+1 -1
View File
@@ -99,7 +99,7 @@ public:
mWarpMode = daCstatueWarpMode_Active;
}
static u16 const m_bckIdxTable[daCstatueType_N][7];
static DUSK_GAME_DATA u16 const m_bckIdxTable[daCstatueType_N][7];
private:
/* 0x568 */ const char* mResName;
include/d/actor/d_a_dshutter.h
+9 -9
View File
@@ -65,15 +65,15 @@ public:
f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
static f32 const OPEN_SIZE;
static f32 const OPEN_ACCEL;
static f32 const OPEN_SPEED;
static f32 const OPEN_BOUND_SPEED;
static f32 const OPEN_BOUND_RATIO;
static f32 const CLOSE_ACCEL;
static f32 const CLOSE_SPEED;
static f32 const CLOSE_BOUND_SPEED;
static f32 const CLOSE_BOUND_RATIO;
static DUSK_GAME_DATA f32 const OPEN_SIZE;
static DUSK_GAME_DATA f32 const OPEN_ACCEL;
static DUSK_GAME_DATA f32 const OPEN_SPEED;
static DUSK_GAME_DATA f32 const OPEN_BOUND_SPEED;
static DUSK_GAME_DATA f32 const OPEN_BOUND_RATIO;
static DUSK_GAME_DATA f32 const CLOSE_ACCEL;
static DUSK_GAME_DATA f32 const CLOSE_SPEED;
static DUSK_GAME_DATA f32 const CLOSE_BOUND_SPEED;
static DUSK_GAME_DATA f32 const CLOSE_BOUND_RATIO;
/* 0x5A0 */ dComIfG_resLoader_c mResLoader;
/* 0x5B0 */ J3DModel* mpModel;
include/d/actor/d_a_e_dt.h
+8 -8
View File
@@ -175,14 +175,14 @@ private:
STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174);
struct E_DT_n {
static f32 eDt_ShakeFrame[10];
static f32 eDt_ShakeFrameDemo[10];
static dCcD_SrcSph cc_dt_body_src;
static dCcD_SrcSph cc_dt_tongue_src;
static int mDt_OtamaNum;
static int mDt_OtamaNo[20];
static int m_fall_no;
static cXyz m_tongue_pos;
static DUSK_GAME_DATA f32 eDt_ShakeFrame[10];
static DUSK_GAME_DATA f32 eDt_ShakeFrameDemo[10];
static DUSK_GAME_DATA dCcD_SrcSph cc_dt_body_src;
static DUSK_GAME_DATA dCcD_SrcSph cc_dt_tongue_src;
static DUSK_GAME_DATA int mDt_OtamaNum;
static DUSK_GAME_DATA int mDt_OtamaNo[20];
static DUSK_GAME_DATA int m_fall_no;
static DUSK_GAME_DATA cXyz m_tongue_pos;
};
include/d/actor/d_a_e_ge.h
+1 -1
View File
@@ -101,7 +101,7 @@ private:
/* 0xB9E */ u8 field_0xb9e;
/* 0xB9F */ u8 mHIOInit;
static actionFunc l_actionmenu[9];
static DUSK_GAME_DATA actionFunc l_actionmenu[9];
};
STATIC_ASSERT(sizeof(daE_GE_c) == 0xBA0);
include/d/actor/d_a_e_oc.h
+8 -8
View File
@@ -159,14 +159,14 @@ private:
STATIC_ASSERT(sizeof(daE_OC_c) == 0xe88);
struct E_OC_n {
static f32 const oc_attackb_trans[10];
static f32 const oc_attackc_trans[10];
static dCcD_SrcSph cc_sph_src;
static dCcD_SrcSph at_sph_src;
static daE_OC_c* m_battle_oc;
static daE_OC_c* m_damage_oc;
static daE_OC_c* m_death_oc;
static daE_OC_c* m_talk_oc;
static DUSK_GAME_DATA f32 const oc_attackb_trans[10];
static DUSK_GAME_DATA f32 const oc_attackc_trans[10];
static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
static DUSK_GAME_DATA dCcD_SrcSph at_sph_src;
static DUSK_GAME_DATA daE_OC_c* m_battle_oc;
static DUSK_GAME_DATA daE_OC_c* m_damage_oc;
static DUSK_GAME_DATA daE_OC_c* m_death_oc;
static DUSK_GAME_DATA daE_OC_c* m_talk_oc;
};
#endif /* D_A_E_OC_H */
include/d/actor/d_a_e_ym.h
+1 -1
View File
@@ -215,7 +215,7 @@ private:
STATIC_ASSERT(sizeof(daE_YM_c) == 0xAF8);
struct E_YM_n {
static dCcD_SrcSph cc_sph_src;
static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
};
include/d/actor/d_a_formation_mng.h
+2 -2
View File
@@ -311,10 +311,10 @@ struct daFmtMng_c : public fopAc_ac_c {
}
static FmtMngAttributes const& attr() { return M_attr; }
static FmtMngAttributes const M_attr;
static DUSK_GAME_DATA FmtMngAttributes const M_attr;
typedef void (daFmtMng_c::*ActionFunc)();
static daFmtMng_c::ActionFunc ActionTable[10];
static DUSK_GAME_DATA daFmtMng_c::ActionFunc ActionTable[10];
/* 0x568 */ FmtPos_c* mPos;
/* 0x56C */ FmtMember_c* mMember;
include/d/actor/d_a_grass.h
+3 -3
View File
@@ -41,9 +41,9 @@ public:
static void deleteRoomGrass(int);
static void deleteRoomFlower(int);
static daGrass_c* m_myObj;
static dGrass_packet_c* m_grass;
static dFlower_packet_c* m_flower;
static DUSK_GAME_DATA daGrass_c* m_myObj;
static DUSK_GAME_DATA dGrass_packet_c* m_grass;
static DUSK_GAME_DATA dFlower_packet_c* m_flower;
/* 0x568 */ u8 unk_0x568[0x570 - 0x568];
};
include/d/actor/d_a_horse.h
+3 -3
View File
@@ -351,8 +351,8 @@ public:
m_modelData->getMaterialNodePointer(5)->getShape()->hide();
}
static u16 const m_footJointTable[];
static f32 const m_callLimitDistance2;
static DUSK_GAME_DATA u16 const m_footJointTable[];
static DUSK_GAME_DATA f32 const m_callLimitDistance2;
/* 0x0568 */ request_of_phase_process_class m_phase;
/* 0x0570 */ J3DModel* m_model;
@@ -567,7 +567,7 @@ public:
class daHorse_hio_c0 {
public:
static const daHorse_hio_c1 m;
static DUSK_GAME_DATA const daHorse_hio_c1 m;
};
class daHorse_hio_c : public JORReflexible {
include/d/actor/d_a_hozelda.h
+3 -3
View File
@@ -29,8 +29,8 @@ public:
static void setMorfFrame(u8 i_frame) { mMorfFrame = i_frame; }
static void decMorfFrame() { cLib_calcTimer<u8>(&mMorfFrame); }
static u8 mEyeMoveFlg;
static u8 mMorfFrame;
static DUSK_GAME_DATA u8 mEyeMoveFlg;
static DUSK_GAME_DATA u8 mMorfFrame;
/* 0x0F4 */ f32 field_0xf4;
/* 0x0F8 */ f32 field_0xf8;
@@ -50,7 +50,7 @@ struct daHoZelda_hio_c1 {
struct daHoZelda_hio_c0 {
daHoZelda_hio_c0() {}
static daHoZelda_hio_c1 const m;
static DUSK_GAME_DATA daHoZelda_hio_c1 const m;
};
class daHoZelda_hio_c : public JORReflexible {
include/d/actor/d_a_itembase.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
virtual u8 getCollisionH();
virtual u8 getCollisionR();
static daItemBase_data const m_data;
static DUSK_GAME_DATA daItemBase_data const m_data;
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModel;
include/d/actor/d_a_midna.h
+5 -5
View File
@@ -32,7 +32,7 @@ public:
class daMidna_hio_c0 {
public:
static daMidna_hio_c1 const m;
static DUSK_GAME_DATA daMidna_hio_c1 const m;
};
STATIC_ASSERT(sizeof(daMidna_hio_c0::m) == 0x20);
@@ -87,8 +87,8 @@ public:
/* 0x0FC */ f32 mNowOffsetX;
/* 0x100 */ f32 mNowOffsetY;
static bool sEyeMoveFlg;
static u8 sMorfFrame;
static DUSK_GAME_DATA bool sEyeMoveFlg;
static DUSK_GAME_DATA u8 sMorfFrame;
};
STATIC_ASSERT(sizeof(daMidna_matAnm_c) == 0x104);
@@ -420,8 +420,8 @@ public:
static u32 getOtherHeapSize() { return 0x1D0; }
static daMidna_texData_s const m_texDataTable[21];
static daMidna_anmData_s const m_anmDataTable[53];
static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21];
static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53];
private:
/* 0x568 */ request_of_phase_process_class mPhase;
include/d/actor/d_a_mirror.h
+2 -2
View File
@@ -58,8 +58,8 @@ public:
static u32 getMirrorRoomPrm() { return 0xFF03; }
typedef int (daMirror_c::*entryModelFunc)(J3DModel*);
static entryModelFunc m_entryModel;
static daMirror_c* m_myObj;
static DUSK_GAME_DATA entryModelFunc m_entryModel;
static DUSK_GAME_DATA daMirror_c* m_myObj;
/* 0x570 */ dMirror_packet_c mPacket;
/* 0x6f8 */ J3DModel* mpModel;
include/d/actor/d_a_movie_player.h
+1 -1
View File
@@ -170,7 +170,7 @@ public:
static int daMP_c_Callback_Main(daMP_c*);
static int daMP_c_Callback_Draw(daMP_c*);
static daMP_c* m_myObj;
static DUSK_GAME_DATA daMP_c* m_myObj;
private:
/* 0x568 */ u32 (*mpGetMovieRestFrame)(void);
include/d/actor/d_a_myna.h
+2 -2
View File
@@ -131,8 +131,8 @@ public:
typedef void (daMyna_c::*ProcFunc)();
typedef int (daMyna_c::*BaseMotionFunc)(int);
static dCcD_SrcSph const mCcDSph;
static daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
static DUSK_GAME_DATA dCcD_SrcSph const mCcDSph;
static DUSK_GAME_DATA daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ mDoExt_McaMorfSO* mpMorf;
include/d/actor/d_a_nbomb.h
+1 -1
View File
@@ -91,7 +91,7 @@ public:
s16 getExTime() { return mExTime; }
static const char* m_arcNameList[6];
static DUSK_GAME_DATA const char* m_arcNameList[6];
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModel;
include/d/actor/d_a_npc.h
+6 -6
View File
@@ -776,12 +776,12 @@ public:
return chkFindActor(daPy_getPlayerActorClass(), param_0, param_1);
}
static dCcD_SrcGObjInf const mCcDObjData;
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
static fopAc_ac_c* mFindActorPtrs[50];
static s16 mSrchName;
static int mFindCount;
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjData;
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50];
static DUSK_GAME_DATA s16 mSrchName;
static DUSK_GAME_DATA int mFindCount;
enum Mode {
/* 0 */ MODE_ENTER,
include/d/actor/d_a_npc2.h
+6 -6
View File
@@ -113,9 +113,9 @@ public:
virtual void drawOtherMdls();
virtual bool dbgDraw();
static dCcD_SrcGObjInf const mCcDObj;
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObj;
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
public:
/* 0x56C */ dBgS_ObjAcch mAcch;
@@ -173,9 +173,9 @@ public:
virtual int ToFore() { return 1; }
virtual int ToBack() { return 1; }
static const char* m_name;
static int m_dzb_id;
static MoveBGActor_SetFunc m_set_func;
static DUSK_GAME_DATA const char* m_name;
static DUSK_GAME_DATA int m_dzb_id;
static DUSK_GAME_DATA MoveBGActor_SetFunc m_set_func;
public:
/* 0xA14 */ dBgW* mpBgw;
include/d/actor/d_a_npc4.h
+7 -7
View File
@@ -394,13 +394,13 @@ public:
void onHide() { mHide = true; }
void offHide() { mHide = false; }
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
static fopAc_ac_c* mFindActorPList[100];
static s32 mFindCount;
static s16 mSrchActorName;
static char mFileNameBuf[0x15];
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
static DUSK_GAME_DATA fopAc_ac_c* mFindActorPList[100];
static DUSK_GAME_DATA s32 mFindCount;
static DUSK_GAME_DATA s16 mSrchActorName;
static DUSK_GAME_DATA char mFileNameBuf[0x15];
};
STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);
include/d/actor/d_a_npc_aru.h
+3 -3
View File
@@ -17,7 +17,7 @@ class daNpc_Aru_Param_c {
public:
virtual ~daNpc_Aru_Param_c() {}
static daNpc_Aru_HIOParam const m;
static DUSK_GAME_DATA daNpc_Aru_HIOParam const m;
};
#if DEBUG
@@ -171,8 +171,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
void setLastIn() { mLastGoatIn = true; }
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
private:
/* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_ash.h
+2 -2
View File
@@ -12,7 +12,7 @@ public:
daNpcAsh_Param_c() {}
virtual ~daNpcAsh_Param_c() {}
static const daNpcAsh_HIOParam m;
static DUSK_GAME_DATA const daNpcAsh_HIOParam m;
};
#if DEBUG
@@ -143,7 +143,7 @@ public:
inline bool step(s16, bool);
inline void playExpression();
static EventFn mEvtSeqList[6];
static DUSK_GAME_DATA EventFn mEvtSeqList[6];
private:
/* 0xB48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_npc_ashB.h
+2 -2
View File
@@ -12,7 +12,7 @@ class daNpcAshB_Param_c {
public:
virtual ~daNpcAshB_Param_c() {}
static const daNpcAshB_HIOParam m;
static DUSK_GAME_DATA const daNpcAshB_HIOParam m;
};
#if DEBUG
@@ -135,7 +135,7 @@ public:
inline bool step(s16, int, f32);
inline void playExpression();
static EventFn DUSK_CONST mEvtSeqList[2];
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[2];
private:
/* 0xB48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_npc_bans.h
+3 -3
View File
@@ -22,7 +22,7 @@ class daNpc_Bans_Param_c {
public:
virtual ~daNpc_Bans_Param_c() {}
static daNpc_Bans_HIOParam const m;
static DUSK_GAME_DATA daNpc_Bans_HIOParam const m;
};
#if DEBUG
@@ -117,8 +117,8 @@ public:
return rv;
}
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static cutFunc DUSK_CONST mCutList[4];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[4];
/* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf;
/* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO;
include/d/actor/d_a_npc_besu.h
+3 -3
View File
@@ -15,7 +15,7 @@ class daNpc_Besu_Param_c {
public:
virtual ~daNpc_Besu_Param_c() {}
static const daNpc_Besu_HIOParam m;
static DUSK_GAME_DATA const daNpc_Besu_HIOParam m;
};
#if DEBUG
@@ -140,8 +140,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
static char DUSK_CONST* DUSK_CONST mCutNameList[15];
static cutFunc DUSK_CONST mCutList[15];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[15];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[15];
private:
/* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;
include/d/actor/d_a_npc_blue_ns.h
+2 -2
View File
@@ -14,7 +14,7 @@ class daNpcBlueNS_Param_c {
public:
virtual ~daNpcBlueNS_Param_c() {}
static const daNpcBlueNS_HIOParam m;
static DUSK_GAME_DATA const daNpcBlueNS_HIOParam m;
};
#if DEBUG
@@ -124,7 +124,7 @@ public:
return var_r30;
}
static EventFn DUSK_CONST mEvtSeqList[];
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[];
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];
include/d/actor/d_a_npc_bou.h
+3 -3
View File
@@ -16,7 +16,7 @@ struct daNpc_Bou_HIOParam {
public:
virtual ~daNpc_Bou_Param_c() {}
static const daNpc_Bou_HIOParam m;
static DUSK_GAME_DATA const daNpc_Bou_HIOParam m;
};
#if DEBUG
@@ -114,8 +114,8 @@ public:
virtual int drawDbgInfo();
virtual void changeAnm(int*, int*);
static char DUSK_CONST* DUSK_CONST mCutNameList[9];
static cutFunc DUSK_CONST mCutList[9];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[9];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[9];
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_bouS.h
+2 -2
View File
@@ -29,7 +29,7 @@ class daNpcBouS_Param_c {
public:
virtual ~daNpcBouS_Param_c() {}
static daNpcBouS_HIOParam const m;
static DUSK_GAME_DATA daNpcBouS_HIOParam const m;
};
#if DEBUG
@@ -128,7 +128,7 @@ public:
mForcibleTalk = 1;
}
static eventFunc mEvtSeqList[4];
static DUSK_GAME_DATA eventFunc mEvtSeqList[4];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_cd.h
+2 -2
View File
@@ -25,7 +25,7 @@ public:
J3DModelData* getObjMdlDataP(int);
virtual ~daNpcCd_c() {}
static dCcD_SrcCyl const m_cylDat;
static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
/* 0x56C */ request_of_phase_process_class mPhase1;
/* 0x574 */ request_of_phase_process_class mPhase2;
@@ -101,7 +101,7 @@ public:
STATIC_ASSERT(sizeof(daNpcCd_HIO_c) == 0x29BC);
extern daNpcCd_HIO_c l_Cd_HIO;
DUSK_GAME_EXTERN daNpcCd_HIO_c l_Cd_HIO;
inline f32 HIO_atnOfs(int param_1) {
s16 rv;
if (param_1 < 16) {
include/d/actor/d_a_npc_cd2.h
+2 -2
View File
@@ -87,7 +87,7 @@ struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c {
/* 0x20C4 */ daNpcCd2_HIO_WChild_c field_0x20c4[14];
};
extern daNpcCd2_HIO_c l_Cd2_HIO;
DUSK_GAME_EXTERN daNpcCd2_HIO_c l_Cd2_HIO;
inline s16 Cd2_HIO_atnOfs(int param_1) {
s16 rv;
@@ -269,7 +269,7 @@ public:
J3DAnmTexPattern* getTexAnmP(int);
virtual ~daNpcCd2_c() {}
static dCcD_SrcCyl const m_cylDat;
static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
/* 0x56C */ request_of_phase_process_class mPhase1;
/* 0x574 */ request_of_phase_process_class mPhase2;
include/d/actor/d_a_npc_cdn3.h
+46 -46
View File
@@ -334,52 +334,52 @@ public:
actionFunc mExecFn;
};
static const ActionPair ActionTable[8];
static seqFunc* m_funcTbl[44];
static seqFunc m_seq00_funcTbl[2];
static seqFunc m_seq01_funcTbl[2];
static seqFunc m_seq02_funcTbl[2];
static seqFunc m_seq03_funcTbl[2];
static seqFunc m_seq04_funcTbl[2];
static seqFunc m_seq05_funcTbl[4];
static seqFunc m_seq06_funcTbl[4];
static seqFunc m_seq07_funcTbl[2];
static seqFunc m_seq08_funcTbl[7];
static seqFunc m_seq09_funcTbl[2];
static seqFunc m_seq10_funcTbl[2];
static seqFunc m_seq11_funcTbl[6];
static seqFunc m_seq12_funcTbl[2];
static seqFunc m_seq13_funcTbl[6];
static seqFunc m_seq14_funcTbl[2];
static seqFunc m_seq15_funcTbl[2];
static seqFunc m_seq16_funcTbl[7];
static seqFunc m_seq17_funcTbl[2];
static seqFunc m_seq18_funcTbl[2];
static seqFunc m_seq19_funcTbl[7];
static seqFunc m_seq20_funcTbl[2];
static seqFunc m_seq21_funcTbl[2];
static seqFunc m_seq22_funcTbl[4];
static seqFunc m_seq23_funcTbl[7];
static seqFunc m_seq24_funcTbl[5];
static seqFunc m_seq25_funcTbl[7];
static seqFunc m_seq26_funcTbl[3];
static seqFunc m_seq27_funcTbl[2];
static seqFunc m_seq28_funcTbl[3];
static seqFunc m_seq29_funcTbl[3];
static seqFunc m_seq30_funcTbl[6];
static seqFunc m_seq31_funcTbl[6];
static seqFunc m_seq32_funcTbl[7];
static seqFunc m_seq33_funcTbl[7];
static seqFunc m_seq34_funcTbl[9];
static seqFunc m_seq35_funcTbl[2];
static seqFunc m_seq36_funcTbl[4];
static seqFunc m_seq37_funcTbl[2];
static seqFunc m_seq38_funcTbl[2];
static seqFunc m_seq39_funcTbl[2];
static seqFunc m_seq40_funcTbl[3];
static seqFunc m_seq41_funcTbl[2];
static seqFunc m_seq42_funcTbl[2];
static seqFunc m_seq43_funcTbl[3];
static DUSK_GAME_DATA const ActionPair ActionTable[8];
static DUSK_GAME_DATA seqFunc* m_funcTbl[44];
static DUSK_GAME_DATA seqFunc m_seq00_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq01_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq02_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq03_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq04_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq05_funcTbl[4];
static DUSK_GAME_DATA seqFunc m_seq06_funcTbl[4];
static DUSK_GAME_DATA seqFunc m_seq07_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq08_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq09_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq10_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq11_funcTbl[6];
static DUSK_GAME_DATA seqFunc m_seq12_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq13_funcTbl[6];
static DUSK_GAME_DATA seqFunc m_seq14_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq15_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq16_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq17_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq18_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq19_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq20_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq21_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq22_funcTbl[4];
static DUSK_GAME_DATA seqFunc m_seq23_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq24_funcTbl[5];
static DUSK_GAME_DATA seqFunc m_seq25_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq26_funcTbl[3];
static DUSK_GAME_DATA seqFunc m_seq27_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq28_funcTbl[3];
static DUSK_GAME_DATA seqFunc m_seq29_funcTbl[3];
static DUSK_GAME_DATA seqFunc m_seq30_funcTbl[6];
static DUSK_GAME_DATA seqFunc m_seq31_funcTbl[6];
static DUSK_GAME_DATA seqFunc m_seq32_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq33_funcTbl[7];
static DUSK_GAME_DATA seqFunc m_seq34_funcTbl[9];
static DUSK_GAME_DATA seqFunc m_seq35_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq36_funcTbl[4];
static DUSK_GAME_DATA seqFunc m_seq37_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq38_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq39_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq40_funcTbl[3];
static DUSK_GAME_DATA seqFunc m_seq41_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq42_funcTbl[2];
static DUSK_GAME_DATA seqFunc m_seq43_funcTbl[3];
/* 0xAC8 */ J3DModel* field_0xac8;
/* 0xACC */ J3DModel* field_0xacc;
include/d/actor/d_a_npc_chat.h
+2 -2
View File
@@ -11,7 +11,7 @@ class daNpcChat_Param_c {
public:
virtual ~daNpcChat_Param_c() {}
static daNpcChat_HIOParam const m;
static DUSK_GAME_DATA daNpcChat_HIOParam const m;
};
#if DEBUG
@@ -102,7 +102,7 @@ public:
void setFear() { mFear = true; }
void setTalkFlag() { mTalkFlag = true; }
static eventFunc DUSK_CONST mEvtSeqList[1];
static DUSK_GAME_DATA eventFunc DUSK_CONST mEvtSeqList[1];
private:
/* 0xB48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_chin.h
+2 -2
View File
@@ -12,7 +12,7 @@ class daNpcChin_Param_c {
public:
virtual ~daNpcChin_Param_c() {}
static daNpcChin_HIOParam const m;
static DUSK_GAME_DATA daNpcChin_HIOParam const m;
};
#if DEBUG
@@ -183,7 +183,7 @@ public:
inline void ForcibleTalk_Off() { field_0xe06 = 0; }
inline u8 getForcibleTalk2() { return field_0xe06; }
static eventFunc mEvtSeqList[8];
static DUSK_GAME_DATA eventFunc mEvtSeqList[8];
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
include/d/actor/d_a_npc_clerka.h
+3 -3
View File
@@ -14,7 +14,7 @@ class daNpc_clerkA_Param_c {
public:
virtual ~daNpc_clerkA_Param_c() {}
static const daNpc_clerkA_HIOParam m;
static DUSK_GAME_DATA const daNpc_clerkA_HIOParam m;
};
#if DEBUG
@@ -124,8 +124,8 @@ public:
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_clerkb.h
+3 -3
View File
@@ -15,7 +15,7 @@ class daNpc_clerkB_Param_c {
public:
virtual ~daNpc_clerkB_Param_c() {}
static const daNpc_clerkB_HIOParam m;
static DUSK_GAME_DATA const daNpc_clerkB_HIOParam m;
};
#if DEBUG
@@ -137,8 +137,8 @@ public:
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;
include/d/actor/d_a_npc_clerkt.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpcClerkt_Param_c {
public:
virtual ~daNpcClerkt_Param_c() {}
static const daNpcClerkt_HIOParam m;
static DUSK_GAME_DATA const daNpcClerkt_HIOParam m;
};
#if DEBUG
@@ -125,8 +125,8 @@ public:
}
}
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_coach.h
+1 -1
View File
@@ -295,7 +295,7 @@ public:
const daNpcCoach_Attr_c& attr() const { return M_attr; }
static daNpcCoach_Attr_c const M_attr;
static DUSK_GAME_DATA daNpcCoach_Attr_c const M_attr;
static u16 const ParticleName[10];
private:
/* 0x0568 */ daNpcChHorse_c mChHorse;
include/d/actor/d_a_npc_doc.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpc_Doc_Param_c {
public:
virtual ~daNpc_Doc_Param_c() {}
static const daNpc_Doc_HIOParam m;
static DUSK_GAME_DATA const daNpc_Doc_HIOParam m;
};
#if DEBUG
@@ -133,8 +133,8 @@ public:
return (fopAcM_GetParam(this) & 0xFF00) >> 8;
}
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_doorboy.h
+2 -2
View File
@@ -12,7 +12,7 @@ class daNpcDoorBoy_Param_c {
public:
virtual ~daNpcDoorBoy_Param_c() {}
static daNpcDoorBoy_HIOParam const m;
static DUSK_GAME_DATA daNpcDoorBoy_HIOParam const m;
};
#if DEBUG
@@ -78,7 +78,7 @@ public:
inline int getTimeHour();
inline bool isDummyTalk();
static EventFn DUSK_CONST mEvtSeqList[1];
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];
private:
/* 0xB48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_drainSol.h
+1 -1
View File
@@ -11,7 +11,7 @@ class daNpcDrSol_Param_c {
public:
virtual ~daNpcDrSol_Param_c() {}
static const daNpcDrSol_HIOParam m;
static DUSK_GAME_DATA const daNpcDrSol_HIOParam m;
};
#if DEBUG
include/d/actor/d_a_npc_fairy.h
+3 -3
View File
@@ -94,7 +94,7 @@ class daNpc_Fairy_Param_c {
public:
virtual ~daNpc_Fairy_Param_c() {}
static daNpc_Fairy_HIOParam const m;
static DUSK_GAME_DATA daNpc_Fairy_HIOParam const m;
};
#if DEBUG
@@ -294,8 +294,8 @@ public:
u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
static char DUSK_CONST* DUSK_CONST mCutNameList[18];
static cutFunc DUSK_CONST mCutList[18];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[18];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[18];
private:
/* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
/* 0x0E44 */ dCcD_Cyl mCyl;
include/d/actor/d_a_npc_fairy_seirei.h
+3 -3
View File
@@ -13,7 +13,7 @@ class daNpc_FairySeirei_Param_c {
public:
virtual ~daNpc_FairySeirei_Param_c() {}
static daNpc_FairySeirei_HIOParam const m;
static DUSK_GAME_DATA daNpc_FairySeirei_HIOParam const m;
};
#if DEBUG
@@ -90,8 +90,8 @@ public:
int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
static DUSK_CONST char* mCutNameList[1];
static DUSK_CONST cutFunc mCutList[1];
static DUSK_GAME_DATA DUSK_CONST char* mCutNameList[1];
static DUSK_GAME_DATA DUSK_CONST cutFunc mCutList[1];
private:
/* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gnd.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_Gnd_Param_c {
public:
virtual ~daNpc_Gnd_Param_c() {}
static const daNpc_Gnd_HIOParam m;
static DUSK_GAME_DATA const daNpc_Gnd_HIOParam m;
};
#if DEBUG
@@ -96,8 +96,8 @@ public:
s32 getNeckJointNo() { return 3; }
s32 getBackboneJointNo() { return 1; }
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gra.h
+3 -3
View File
@@ -21,7 +21,7 @@ class daNpc_grA_Param_c {
public:
virtual ~daNpc_grA_Param_c() {}
static daNpc_grA_HIOParam const m;
static DUSK_GAME_DATA daNpc_grA_HIOParam const m;
};
#if DEBUG
@@ -138,9 +138,9 @@ public:
void addCarryNum() { field_0x1692++; }
u8 getPathNoFromParam() { return home.angle.z; }
void setGateWalk() { field_0x14D0 = 1; }
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
typedef BOOL (daNpc_grA_c::*cut_type)(int);
static cut_type DUSK_CONST mEvtCutList[];
static DUSK_GAME_DATA cut_type DUSK_CONST mEvtCutList[];
private:
typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*);
include/d/actor/d_a_npc_grc.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpc_grC_Param_c {
public:
virtual ~daNpc_grC_Param_c() {}
static daNpc_grC_HIOParam const m;
static DUSK_GAME_DATA daNpc_grC_HIOParam const m;
};
#if DEBUG
@@ -89,8 +89,8 @@ public:
void setPrtcl();
void adjustShapeAngle() {}
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static EventFn DUSK_CONST mEvtCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[1];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grd.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_Grd_Param_c {
public:
virtual ~daNpc_Grd_Param_c() {}
static daNpc_Grd_HIOParam const m;
static DUSK_GAME_DATA daNpc_Grd_HIOParam const m;
};
#if DEBUG
@@ -81,8 +81,8 @@ public:
BOOL ECut_nodToGrz(int);
void adjustShapeAngle() {}
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static cutFunc DUSK_CONST mEvtCutList[2];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grm.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpc_grM_Param_c {
public:
virtual ~daNpc_grM_Param_c() {}
static daNpc_grM_HIOParam const m;
static DUSK_GAME_DATA daNpc_grM_HIOParam const m;
};
#if DEBUG
@@ -131,8 +131,8 @@ public:
BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2];
private:
/* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_grmc.h
+3 -3
View File
@@ -38,7 +38,7 @@ class daNpc_grMC_Param_c {
public:
virtual ~daNpc_grMC_Param_c() {}
static daNpc_grMC_HIOParam const m;
static DUSK_GAME_DATA daNpc_grMC_HIOParam const m;
};
class daNpc_grMC_c : public dShopSystem_c {
@@ -124,8 +124,8 @@ public:
BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
u16 getEyeballMaterialNo() { return 1; };
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList;
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gro.h
+3 -3
View File
@@ -20,7 +20,7 @@ class daNpc_grO_Param_c {
public:
virtual ~daNpc_grO_Param_c() {}
static daNpc_grO_HIOParam const m;
static DUSK_GAME_DATA daNpc_grO_HIOParam const m;
};
#if DEBUG
@@ -85,8 +85,8 @@ public:
int test(void*);
void adjustShapeAngle() {}
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
static cutFunc DUSK_CONST mEvtCutList[3];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[3];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grr.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_grR_Param_c {
public:
virtual ~daNpc_grR_Param_c() {}
static daNpc_grR_HIOParam const m;
static DUSK_GAME_DATA daNpc_grR_HIOParam const m;
};
#if DEBUG
@@ -83,8 +83,8 @@ public:
int test(void*);
void adjustShapeAngle() {}
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static cutFunc DUSK_CONST mEvtCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[1];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grs.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_grS_Param_c {
public:
virtual ~daNpc_grS_Param_c() {}
static const daNpc_grS_HIOParam m;
static DUSK_GAME_DATA const daNpc_grS_HIOParam m;
};
#if DEBUG
@@ -84,8 +84,8 @@ public:
void setPrtcl();
void adjustShapeAngle() {}
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static cutFunc DUSK_CONST mEvtCutList[2];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grz.h
+3 -3
View File
@@ -28,7 +28,7 @@ class daNpc_Grz_Param_c {
public:
virtual ~daNpc_Grz_Param_c() {}
static daNpc_Grz_HIOParam const m;
static DUSK_GAME_DATA daNpc_Grz_HIOParam const m;
};
#if DEBUG
@@ -116,8 +116,8 @@ public:
u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
static cutFunc DUSK_CONST mEvtCutList[7];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[7];
private:
/* 0x0B48 */ Z2Creature mSound;
include/d/actor/d_a_npc_guard.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
u32 getPathID() { return fopAcM_GetParam(this) >> 0x10 & 0xFF; }
static actionFunc ActionTable[7][2];
static DUSK_GAME_DATA actionFunc ActionTable[7][2];
private:
/* 0xAC8 */ J3DModel* mpModel;
include/d/actor/d_a_npc_gwolf.h
+3 -3
View File
@@ -19,7 +19,7 @@ class daNpc_GWolf_Param_c {
public:
virtual ~daNpc_GWolf_Param_c() {}
static daNpc_GWolf_HIOParam const m;
static DUSK_GAME_DATA daNpc_GWolf_HIOParam const m;
};
#if DEBUG
@@ -104,8 +104,8 @@ public:
void setHowlingEndFlag() { field_0xe1c = 2; }
void setHowlingFlag() { field_0xe1c = 1; }
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static cutFunc DUSK_CONST mEvtCutList[5];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[5];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_hanjo.h
+5 -5
View File
@@ -23,7 +23,7 @@ class daNpc_Hanjo_Param_c {
public:
virtual ~daNpc_Hanjo_Param_c() {}
static const daNpc_Hanjo_HIOParam m;
static DUSK_GAME_DATA const daNpc_Hanjo_HIOParam m;
};
#if DEBUG
@@ -217,10 +217,10 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static dCcD_SrcGObjInf const mStoneCcDObjInfo;
static char DUSK_CONST* DUSK_CONST mCutNameList[6];
static cutFunc DUSK_CONST mCutList[6];
static dCcD_SrcSph DUSK_CONST mStoneCcDSph;
static DUSK_GAME_DATA dCcD_SrcGObjInf const mStoneCcDObjInfo;
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[6];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[6];
static DUSK_GAME_DATA dCcD_SrcSph DUSK_CONST mStoneCcDSph;
private:
/* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
/* 0x0E44 */ J3DModel* mModel1;
include/d/actor/d_a_npc_hoz.h
+3 -3
View File
@@ -13,7 +13,7 @@ class daNpc_Hoz_Param_c {
public:
virtual ~daNpc_Hoz_Param_c() {}
static const daNpc_Hoz_HIOParam m;
static DUSK_GAME_DATA const daNpc_Hoz_HIOParam m;
};
#if DEBUG
@@ -125,8 +125,8 @@ public:
bool getGameStartFlag() { return mGameStartFlag; }
void setPotBreakFlag() { mPotBreakFlag = true; }
static char DUSK_CONST* DUSK_CONST mCutNameList[8];
static cutFunc DUSK_CONST mCutList[];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[];
private:
/* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_impal.h
+2 -2
View File
@@ -12,7 +12,7 @@ class daNpcImpal_Param_c {
public:
virtual ~daNpcImpal_Param_c() {}
static const daNpcImpal_HIOParam m;
static DUSK_GAME_DATA const daNpcImpal_HIOParam m;
};
#if DEBUG
@@ -121,7 +121,7 @@ public:
inline void setLookMode(int i_lookMode);
inline void deleteObstacle();
static EventFn mEvtSeqList[4];
static DUSK_GAME_DATA EventFn mEvtSeqList[4];
private:
/* 0xB48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_npc_ins.h
+2 -2
View File
@@ -12,7 +12,7 @@ class daNpcIns_Param_c {
public:
virtual ~daNpcIns_Param_c() {}
static daNpcIns_HIOParam const m;
static DUSK_GAME_DATA daNpcIns_HIOParam const m;
};
#if DEBUG
@@ -119,7 +119,7 @@ public:
inline void playExpression();
BOOL chkAction(actionFunc action) { return action == mAction; }
static eventFunc mEvtSeqList[1];
static DUSK_GAME_DATA eventFunc mEvtSeqList[1];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_jagar.h
+3 -3
View File
@@ -25,7 +25,7 @@ class daNpc_Jagar_Param_c {
public:
virtual ~daNpc_Jagar_Param_c() {}
static const daNpc_Jagar_HIOParam m;
static DUSK_GAME_DATA const daNpc_Jagar_HIOParam m;
};
#if DEBUG
@@ -223,8 +223,8 @@ public:
return 0;
}
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
private:
/* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO;
/* 0x0E44 */ dCcD_Cyl mCyl1;
include/d/actor/d_a_npc_kakashi.h
+3 -3
View File
@@ -14,7 +14,7 @@ class daNpc_Kakashi_Param_c {
public:
virtual ~daNpc_Kakashi_Param_c() {}
static const daNpc_Kakashi_HIOParam m;
static DUSK_GAME_DATA const daNpc_Kakashi_HIOParam m;
};
#if DEBUG
@@ -113,8 +113,8 @@ public:
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int);
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
static DUSK_GAME_DATA int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int);
private:
/* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kasi_hana.h
+5 -5
View File
@@ -25,7 +25,7 @@ class daNpcKasiHana_Param_c {
public:
virtual ~daNpcKasiHana_Param_c() {}
static daNpcKasiHana_HIOParam const m;
static DUSK_GAME_DATA daNpcKasiHana_HIOParam const m;
};
#if DEBUG
@@ -201,10 +201,10 @@ public:
BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
void setEscapePathDir() { if (pl_front_check()) mPath.reverse(); }
static EventFn mEvtSeqList[6];
static daTagEscape_c* mTargetTag;
static f32 mTargetTagDist;
static s16 mWolfAngle;
static DUSK_GAME_DATA EventFn mEvtSeqList[6];
static DUSK_GAME_DATA daTagEscape_c* mTargetTag;
static DUSK_GAME_DATA f32 mTargetTagDist;
static DUSK_GAME_DATA s16 mWolfAngle;
private:
/* 0x0B48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_kasi_kyu.h
+5 -5
View File
@@ -14,7 +14,7 @@ class daNpcKasiKyu_Param_c {
public:
virtual ~daNpcKasiKyu_Param_c() {}
static daNpcKasiKyu_HIOParam const m;
static DUSK_GAME_DATA daNpcKasiKyu_HIOParam const m;
};
#if DEBUG
@@ -120,10 +120,10 @@ public:
void chgWeightLight() { mCcStts.SetWeight(0xD8); }
BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
static EventFn DUSK_CONST mEvtSeqList[1];
static daTagEscape_c* mTargetTag;
static f32 mTargetTagDist;
static s16 mWolfAngle;
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];
static DUSK_GAME_DATA daTagEscape_c* mTargetTag;
static DUSK_GAME_DATA f32 mTargetTagDist;
static DUSK_GAME_DATA s16 mWolfAngle;
private:
/* 0x0B48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_kasi_mich.h
+5 -5
View File
@@ -23,7 +23,7 @@ class daNpcKasiMich_Param_c {
public:
virtual ~daNpcKasiMich_Param_c() {}
static daNpcKasiMich_HIOParam const m;
static DUSK_GAME_DATA daNpcKasiMich_HIOParam const m;
};
#if DEBUG
@@ -121,10 +121,10 @@ public:
void chgWeightLight() { mCcStts.SetWeight(0xD8); }
BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
static EventFn DUSK_CONST mEvtSeqList[1];
static daTagEscape_c* mTargetTag;
static f32 mTargetTagDist;
static s16 mWolfAngle;
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];
static DUSK_GAME_DATA daTagEscape_c* mTargetTag;
static DUSK_GAME_DATA f32 mTargetTagDist;
static DUSK_GAME_DATA s16 mWolfAngle;
private:
/* 0x0B48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_kkri.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_Kkri_Param_c {
public:
virtual ~daNpc_Kkri_Param_c() {}
static const daNpc_Kkri_HIOParam m;
static DUSK_GAME_DATA const daNpc_Kkri_HIOParam m;
};
#if DEBUG
@@ -118,8 +118,8 @@ public:
return mpMorf[0]->getModel()->getAnmMtx(5);
}
static char DUSK_CONST* DUSK_CONST mCutNameList[3];
static int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int);
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[3];
static DUSK_GAME_DATA int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int);
private:
/* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kn.h
+9 -9
View File
@@ -25,7 +25,7 @@ class daNpc_Kn_Param_c {
public:
virtual ~daNpc_Kn_Param_c() {}
static const daNpc_Kn_HIOParam m;
static DUSK_GAME_DATA const daNpc_Kn_HIOParam m;
};
#if DEBUG
@@ -412,14 +412,14 @@ public:
virtual ~daNpc_Kn_c();
virtual bool afterSetMotionAnm(int, int, f32, int);
static const dCcD_SrcGObjInf mCcDObjData;
static char DUSK_CONST* DUSK_CONST mCutNameList[21];
static cutFunc DUSK_CONST mCutList[21];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
static s16 mSrchName;
static fopAc_ac_c* mFindActorPtrs[50];
static int mFindCount;
static DUSK_GAME_DATA const dCcD_SrcGObjInf mCcDObjData;
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[21];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[21];
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
static DUSK_GAME_DATA s16 mSrchName;
static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50];
static DUSK_GAME_DATA int mFindCount;
private:
/* 0x0E44 */ J3DModel* mpPodModel;
include/d/actor/d_a_npc_knj.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_Knj_Param_c {
public:
virtual ~daNpc_Knj_Param_c() {}
static const daNpc_Knj_HIOParam m;
static DUSK_GAME_DATA const daNpc_Knj_HIOParam m;
};
#if DEBUG
@@ -80,8 +80,8 @@ public:
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kolin.h
+3 -3
View File
@@ -18,7 +18,7 @@ class daNpc_Kolin_Param_c {
public:
virtual ~daNpc_Kolin_Param_c() {}
static daNpc_Kolin_HIOParam const m;
static DUSK_GAME_DATA daNpc_Kolin_HIOParam const m;
};
#if DEBUG
@@ -120,8 +120,8 @@ public:
virtual void changeAnm(int*, int*);
virtual void changeBck(int*, int*);
static char DUSK_CONST* DUSK_CONST mCutNameList[11];
static cutFunc DUSK_CONST mCutList[11];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[11];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[11];
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_kolinb.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpc_Kolinb_Param_c {
public:
virtual ~daNpc_Kolinb_Param_c() {}
static daNpc_Kolinb_HIOParam const m;
static DUSK_GAME_DATA daNpc_Kolinb_HIOParam const m;
};
#if DEBUG
@@ -150,8 +150,8 @@ public:
s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; }
s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; }
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_kyury.h
+3 -3
View File
@@ -11,7 +11,7 @@ class daNpc_Kyury_Param_c {
public:
virtual ~daNpc_Kyury_Param_c() {}
static const daNpc_Kyury_HIOParam m;
static DUSK_GAME_DATA const daNpc_Kyury_HIOParam m;
};
#if DEBUG
@@ -123,8 +123,8 @@ public:
return nodeNo;
}
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2];
private:
/* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_len.h
+3 -3
View File
@@ -14,7 +14,7 @@ class daNpc_Len_Param_c {
public:
virtual ~daNpc_Len_Param_c() {}
static const daNpc_Len_HIOParam m;
static DUSK_GAME_DATA const daNpc_Len_HIOParam m;
};
#if DEBUG
@@ -100,8 +100,8 @@ public:
s32 getFootRJointNo() { return 32; }
BOOL chkXYItems() { return TRUE; }
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static cutFunc DUSK_CONST mCutList[4];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[4];
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_lud.h
+3 -3
View File
@@ -12,7 +12,7 @@ class daNpc_Lud_Param_c {
public:
virtual ~daNpc_Lud_Param_c() {}
static const daNpc_Lud_HIOParam m;
static DUSK_GAME_DATA const daNpc_Lud_HIOParam m;
};
#if DEBUG
@@ -111,8 +111,8 @@ public:
}
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
static char DUSK_CONST* DUSK_CONST mCutNameList[8];
static cutFunc DUSK_CONST mCutList[8];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[8];
private:
/* 0xE40 */ mDoExt_McaMorfSO* mpBowlMorf;
include/d/actor/d_a_npc_maro.h
+3 -3
View File
@@ -14,7 +14,7 @@ class daNpc_Maro_Param_c {
public:
virtual ~daNpc_Maro_Param_c() {}
static const daNpc_Maro_HIOParam m;
static DUSK_GAME_DATA const daNpc_Maro_HIOParam m;
};
#if DEBUG
@@ -167,8 +167,8 @@ public:
void startChoccai() { field_0x1134 = 1; }
void endChoccai() { field_0x1134 = 0; }
static char DUSK_CONST* DUSK_CONST mCutNameList[17];
static cutFunc DUSK_CONST mCutList[17];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[17];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[17];
u8 getGroupId() {
return (fopAcM_GetParam(this) & 0xF0000000) >> 28;
include/d/actor/d_a_npc_midp.h
+3 -3
View File
@@ -20,7 +20,7 @@ class daNpc_midP_Param_c {
public:
virtual ~daNpc_midP_Param_c() {}
static const daNpc_midP_HIOParam m;
static DUSK_GAME_DATA const daNpc_midP_HIOParam m;
};
#if DEBUG
@@ -148,8 +148,8 @@ public:
return nodeNo;
}
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList;
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_MIDP_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_moi.h
+3 -3
View File
@@ -26,7 +26,7 @@ class daNpc_Moi_Param_c {
public:
virtual ~daNpc_Moi_Param_c() {}
static const daNpc_Moi_HIOParam m;
static DUSK_GAME_DATA const daNpc_Moi_HIOParam m;
};
#if DEBUG
@@ -158,8 +158,8 @@ public:
bool chkSFight() { return field_0x166b == 1; }
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static char DUSK_CONST* DUSK_CONST mCutNameList[5];
static cutFunc DUSK_CONST mCutList[5];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[5];
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[5];
private:
/* 0x0E40 */ NPC_MOI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_moir.h
+2 -2
View File
@@ -23,7 +23,7 @@ class daNpcMoiR_Param_c {
public:
virtual ~daNpcMoiR_Param_c() {}
static daNpcMoiR_HIOParam const m;
static DUSK_GAME_DATA daNpcMoiR_HIOParam const m;
};
#if DEBUG
@@ -212,7 +212,7 @@ public:
inline void setLookMode(int i_lookMode);
inline void searchActors();
static EventFn mEvtSeqList[4];
static DUSK_GAME_DATA EventFn mEvtSeqList[4];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_myna2.h
+3 -3
View File
@@ -13,7 +13,7 @@ class daNpc_myna2_Param_c {
public:
virtual ~daNpc_myna2_Param_c() {}
static const daNpc_myna2_HIOParam m;
static DUSK_GAME_DATA const daNpc_myna2_HIOParam m;
};
#if DEBUG
@@ -87,8 +87,8 @@ public:
int getType() { return mType; }
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static EventFn DUSK_CONST mEvtCutList[];
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[];
/* 0xB48 */ u8 field_0xB48[0xB4C - 0xB48];
/* 0xB4C */ daNpcF_Lookat_c mLookat;

Some files were not shown because too many files have changed in this diff Show More