mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

Browse Source
This commit is contained in:
gymnast86
2026-07-14 15:33:40 -07:00
parent a4c619ad58 eed14acdc6
commit fa34335a09
844 changed files with 4843 additions and 4842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+10 -10
View File
@@ -221,7 +221,7 @@ static s16 const l_insectNameList[12] = {
f32 l_jumpTop;
#endif
daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_ATRFWS_e},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_ATRFDS_e},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_ATLS_e},
@@ -244,7 +244,7 @@ daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
{dRes_ID_ALANM_BCK_DASHS_e, dRes_ID_ALANM_BCK_ATLS_e},
};
daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
{dRes_ID_ALANM_BCK_ATL_e, dRes_ID_ALANM_BCK_ATL_e},
{dRes_ID_ALANM_BCK_ATR_e, dRes_ID_ALANM_BCK_ATR_e},
{dRes_ID_ALANM_BCK_WALKS_e, dRes_ID_ALANM_BCK_WALKS_e},
@@ -252,7 +252,7 @@ daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
{dRes_ID_ALANM_BCK_SWIMWAIT_e, dRes_ID_ALANM_BCK_SWIMWAITS_e},
};
daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
DUSK_GAME_DATA daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_DASHFISHR_e},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
@@ -283,7 +283,7 @@ daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
{dRes_ID_ALANM_BCK_WAITBTOA_e, dRes_ID_ALANM_BCK_WALKFISHR_e},
};
daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
DUSK_GAME_DATA daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
{dRes_ID_ALANM_BCK_ATRFWS_e, dRes_ID_ALANM_BCK_ATRFW_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
{dRes_ID_ALANM_BCK_ATRFDS_e, dRes_ID_ALANM_BCK_ATRFD_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
{dRes_ID_ALANM_BCK_ATBW_e, dRes_ID_ALANM_BCK_ATBW_e, 0xFE, 0xFE, FTANM_0, dRes_ID_ALANM_BCK_FAT_e, 0x0},
@@ -700,7 +700,7 @@ daAlink_AnmData const daAlink_c::m_anmDataTable[daAlink_c::ANM_MAX] = {
{dRes_ID_ALANM_BCK_ASHIMOTO_e, dRes_ID_ALANM_BCK_ASHIMOTO_e, 0xFE, 0xFE, FTANM_ASHIMOTO, dRes_ID_ALANM_BCK_FASHIMOTO_e, 0x0},
};
daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
DUSK_GAME_DATA daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
{dRes_ID_ALANM_BCK_WL_WAITA_e, 0x0, 0x1, 10, 40, -1, -1},
{dRes_ID_ALANM_BCK_WL_WALKA_e, 0x0, 0x2, 1, 14, -1, -1},
{dRes_ID_ALANM_BCK_WL_WALKB_e, 0x0, 0x2, 1, 14, -1, -1},
@@ -850,7 +850,7 @@ daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[daAlink_c::WANM_MAX] = {
{0x802B, 0xC, 0xC, -1, -1, -1, -1},
};
daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
DUSK_GAME_DATA daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
{dRes_ID_ALANM_BTP_FMABA01_e, dRes_ID_ALANM_BTK_FMABA01_e},
{dRes_ID_ALANM_BTP_FMABA02_e, dRes_ID_ALANM_BTK_FMABA02_e},
{dRes_ID_ALANM_BTP_FMABA03_e, dRes_ID_ALANM_BTK_FMABA03_e},
@@ -1016,7 +1016,7 @@ daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
{dRes_ID_ALANM_BTP_WL_FC_e, dRes_ID_ALANM_BTK_WL_FA_e},
};
const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
DUSK_GAME_DATA const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
{ &daAlink_c::procPreActionUnequip, 0x21 },
{ &daAlink_c::procServiceWait, 0x10000085 },
{ &daAlink_c::procTiredWait, 0x10001185 },
@@ -1371,7 +1371,7 @@ const daAlink_procInitTable daAlink_c::m_procInitTable[] = {
{ &daAlink_c::procDemoCommon, 0x1 },
};
daAlink_procFunc daAlink_c::m_demoInitTable[] = {
DUSK_GAME_DATA daAlink_procFunc daAlink_c::m_demoInitTable[] = {
NULL,
NULL,
NULL,
@@ -2007,9 +2007,9 @@ daAlinkHIO_cut_c::~daAlinkHIO_cut_c() {}
daAlinkHIO_c::~daAlinkHIO_c() {}
bool daAlink_matAnm_c::m_eye_move_flg;
DUSK_GAME_DATA bool daAlink_matAnm_c::m_eye_move_flg;
u8 daAlink_matAnm_c::m_morf_frame;
DUSK_GAME_DATA u8 daAlink_matAnm_c::m_morf_frame;
void daAlink_matAnm_c::init() {
field_0xf4 = 0.0f;
src/d/actor/d_a_alink_HIO_data.inc
+114 -114
View File
@@ -1,7 +1,7 @@
#include "d/actor/d_a_alink.h"
// clang-format off
const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
false,
20000,
-10000,
@@ -30,7 +30,7 @@ const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
5000.0f,
};
const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
{
11,
0.7f,
@@ -58,7 +58,7 @@ const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
0.4f,
};
const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
3000,
2000,
6,
@@ -83,7 +83,7 @@ const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
1.3f,
};
const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
3000,
2000,
6,
@@ -108,7 +108,7 @@ const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
2.3f,
};
const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
{
29,
1.1f,
@@ -147,7 +147,7 @@ const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
60.0f,
};
const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
{
9,
0.7f,
@@ -168,7 +168,7 @@ const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
10.0f,
};
const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
{
5,
1.1f,
@@ -205,7 +205,7 @@ const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
10.0f,
};
const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
{
14,
0.75f,
@@ -248,7 +248,7 @@ const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
{
27,
1.2f,
@@ -264,7 +264,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
{
27,
1.2f,
@@ -280,7 +280,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
{
27,
1.2f,
@@ -296,7 +296,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
{
31,
1.1f,
@@ -312,7 +312,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
{
27,
1.1f,
@@ -328,7 +328,7 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
{
29,
1.0f,
@@ -348,7 +348,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
{
33,
1.0f,
@@ -368,7 +368,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
{
31,
1.1f,
@@ -388,7 +388,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
{
33,
0.9f,
@@ -408,7 +408,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
{
31,
0.9f,
@@ -427,7 +427,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
#pragma pop
#pragma push
const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
{
34,
1.1f,
@@ -445,7 +445,7 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
};
#pragma pop
const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
{
19,
1.0f,
@@ -474,7 +474,7 @@ const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
80.0f,
};
const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
{
17,
1.1f,
@@ -498,7 +498,7 @@ const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
3.0f,
};
const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
{
47,
1.0f,
@@ -548,7 +548,7 @@ const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
{
21,
0.9f,
@@ -564,7 +564,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
{
24,
0.9f,
@@ -580,7 +580,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
{
24,
0.95f,
@@ -596,7 +596,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
{
11,
0.9f,
@@ -610,7 +610,7 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
};
#pragma pop
const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
{
6,
0.45f,
@@ -643,7 +643,7 @@ const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
{
12,
0.8f,
@@ -658,7 +658,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
{
14,
1.0f,
@@ -673,7 +673,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
{
14,
1.0f,
@@ -686,7 +686,7 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
};
#pragma pop
const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
{
8,
1.0f,
@@ -729,7 +729,7 @@ const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
10.0f,
};
const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
{
8,
0.9f,
@@ -762,7 +762,7 @@ const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
1.6f,
};
const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
{
29,
1.3f,
@@ -802,7 +802,7 @@ const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
5.0f,
};
const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
{
18,
-1.100f,
@@ -857,7 +857,7 @@ const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
0.0f,
};
const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
{
14,
1.0f,
@@ -873,7 +873,7 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
{
21,
1.2f,
@@ -888,7 +888,7 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
};
#pragma pop
const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
{
27,
1.0f,
@@ -906,7 +906,7 @@ const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
25.0f,
};
const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
{
11,
1.0f,
@@ -951,7 +951,7 @@ const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
18.0f,
};
const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
{
9,
1.0f,
@@ -978,7 +978,7 @@ const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
5.0f,
};
const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
{
6,
1.2f,
@@ -1036,7 +1036,7 @@ const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
23.0f,
};
const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
{
8,
0.6f,
@@ -1063,7 +1063,7 @@ const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
7.0f,
};
const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
{
19,
1.0f,
@@ -1095,7 +1095,7 @@ const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
4.0f,
};
const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
{
22,
0.8f,
@@ -1112,7 +1112,7 @@ const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
},
};
const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
0.8f,
1.1f,
3.0f,
@@ -1120,7 +1120,7 @@ const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
3.0f,
};
const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
2,
3,
50.0f,
@@ -1131,7 +1131,7 @@ const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
200.0f,
};
const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
0,
120,
7,
@@ -1153,7 +1153,7 @@ const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
0.75f,
};
const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
{
22,
2.3f,
@@ -1190,7 +1190,7 @@ const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
0.5f,
};
const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
{
49,
0.8f,
@@ -1256,7 +1256,7 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
0.5f,
};
const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
{
49,
0.8f,
@@ -1322,7 +1322,7 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
0.5f,
};
const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
{
9,
2.0f,
@@ -1341,7 +1341,7 @@ const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
5000,
};
const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
{
11,
1.2f,
@@ -1367,7 +1367,7 @@ const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
15.0f,
};
const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
{
59,
1.5f,
@@ -1382,7 +1382,7 @@ const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
1.3f,
};
const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
{
22,
1.2f,
@@ -1433,7 +1433,7 @@ const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
15.0f,
};
const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
{
14,
1.0f,
@@ -1471,7 +1471,7 @@ const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
35.0f,
};
const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
{
18,
1.2f,
@@ -1512,7 +1512,7 @@ const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
5.0f,
};
const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
{
23,
1.3f,
@@ -1536,7 +1536,7 @@ const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
0.2f,
};
const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
{
9,
1.0f,
@@ -1572,7 +1572,7 @@ const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
800.0f,
};
const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
{
21,
0.9f,
@@ -1599,7 +1599,7 @@ const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
40.0f,
};
const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
160,
50,
50,
@@ -1624,7 +1624,7 @@ const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
#pragma push
#pragma force_active on
IF_NOT_DUSK(const) daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
DUSK_GAME_DATA IF_NOT_DUSK(const) daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
0,
3,
0,
@@ -1640,7 +1640,7 @@ IF_NOT_DUSK(const) daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
#pragma pop
#if TARGET_PC
// Save original lantern colors incase player reverts to default
const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::original = {
DUSK_GAME_DATA const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::original = {
0,
3,
0,
@@ -1656,7 +1656,7 @@ const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::original = {
#endif
IF_NOT_DUSK(const) daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
DUSK_GAME_DATA IF_NOT_DUSK(const) daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
{
30,
1.1f,
@@ -1691,7 +1691,7 @@ IF_NOT_DUSK(const) daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
#if TARGET_PC
// Save original lantern colors incase player reverts to default
const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::original = {
DUSK_GAME_DATA const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::original = {
{
30,
1.1f,
@@ -1725,7 +1725,7 @@ const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::original = {
};
#endif
const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
{
20,
1.2f,
@@ -1742,7 +1742,7 @@ const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
},
};
const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
{
29,
1.1f,
@@ -1766,7 +1766,7 @@ const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
0.7f,
};
const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
{
18,
0.9f,
@@ -1785,7 +1785,7 @@ const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
30.0f,
};
const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
{
9,
2.5f,
@@ -1835,7 +1835,7 @@ const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
50.0f,
};
const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
{
56,
1.15f,
@@ -1901,7 +1901,7 @@ const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
},
};
const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
{
12,
1.0f,
@@ -1938,7 +1938,7 @@ const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
90.0f,
};
const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
{
21,
0.8f,
@@ -1961,7 +1961,7 @@ const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
60.0f,
};
const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
{
19,
1.1f,
@@ -2002,7 +2002,7 @@ const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
0.5f,
};
const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
19,
1.0f,
0.0f,
@@ -2019,7 +2019,7 @@ const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
2000.0f,
};
const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
771,
0,
182,
@@ -2032,7 +2032,7 @@ const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
0.0f,
};
const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
{
12,
1.0f,
@@ -2056,7 +2056,7 @@ const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
1.3f,
};
const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
{
13,
0.8f,
@@ -2091,7 +2091,7 @@ const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
80.0f,
};
const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
{
34,
1.0f,
@@ -2116,7 +2116,7 @@ const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
3.0f,
};
const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
{
4,
0.9f,
@@ -2199,7 +2199,7 @@ const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
0.55f,
};
const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
{
25,
1.0f,
@@ -2277,7 +2277,7 @@ const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
1.3f,
};
const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
{
14,
1.0f,
@@ -2356,7 +2356,7 @@ const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
0.5f,
};
const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
9000,
100,
5,
@@ -2378,7 +2378,7 @@ const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
30.0f,
};
const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
9000,
100,
3,
@@ -2396,7 +2396,7 @@ const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
2.0f,
};
const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
{
5,
1.0f,
@@ -2433,7 +2433,7 @@ const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
10.0f,
};
const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
{
11,
0.8f,
@@ -2454,7 +2454,7 @@ const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
10.0f,
};
const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
{
49,
1.0f,
@@ -2489,7 +2489,7 @@ const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
0.7f,
};
const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
{
3,
1.2f,
@@ -2531,7 +2531,7 @@ const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
100.0f,
};
const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
1.0f,
3.0f,
1.0f,
@@ -2539,7 +2539,7 @@ const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
0.75f,
};
const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
{
14,
1.5f,
@@ -2568,7 +2568,7 @@ const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
515,
0,
120,
@@ -2582,7 +2582,7 @@ const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
};
#pragma pop
const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
{
13,
1.2f,
@@ -2636,7 +2636,7 @@ const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
10.0f,
};
const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
{
9,
1.0f,
@@ -2671,7 +2671,7 @@ const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
0.25f,
};
const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
{
49,
1.0f,
@@ -2711,7 +2711,7 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
{
49,
1.1f,
@@ -2750,7 +2750,7 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
};
#pragma pop
const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
{
11,
1.0f,
@@ -2774,7 +2774,7 @@ const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
15.0f,
};
const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
300,
5,
1.2f,
@@ -2782,7 +2782,7 @@ const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
1.5f,
};
const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
{
9,
1.1f,
@@ -2800,7 +2800,7 @@ const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
0.7f,
};
const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
{
20,
1.25f,
@@ -2843,7 +2843,7 @@ const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
30.0f,
};
const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
{
16,
1.0f,
@@ -2865,7 +2865,7 @@ const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
{
41,
0.9f,
@@ -2889,7 +2889,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
{
15,
0.9f,
@@ -2913,7 +2913,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
{
42,
1.05f,
@@ -2935,7 +2935,7 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
};
#pragma pop
const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
{
40,
1.0f,
@@ -2948,7 +2948,7 @@ const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
0.0f,
};
const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
{
6,
1.0f,
@@ -2968,7 +2968,7 @@ const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
10.0f,
};
const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
{
3,
2.0f,
@@ -3000,7 +3000,7 @@ const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
0.1f,
};
const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
{
19,
0.9f,
@@ -3025,7 +3025,7 @@ const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
2.0f,
};
const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
{
3,
1.0f,
@@ -3082,7 +3082,7 @@ const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
13.0f,
};
const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
{
6,
3.0f,
@@ -3110,7 +3110,7 @@ const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
1000.0f,
};
const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
{
5,
1.0f,
@@ -3141,7 +3141,7 @@ const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
0.02f,
};
const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
{
59,
1.2f,
@@ -3161,7 +3161,7 @@ const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
30.0f,
};
const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
{
6,
0.9f,
@@ -3203,7 +3203,7 @@ const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
0.2f,
};
const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
{
39,
1.0f,
@@ -3236,7 +3236,7 @@ const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
5.0f,
};
const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
{
25,
0.9f,
@@ -3290,7 +3290,7 @@ const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
7.0f,
};
const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
{
20,
1.5f,
@@ -3330,7 +3330,7 @@ const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
#pragma push
#pragma force_active on
const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
{
64,
1.0f,
@@ -3352,7 +3352,7 @@ const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
};
#pragma pop
const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = {
DUSK_GAME_DATA const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = {
13000,
-10000,
8000,
src/d/actor/d_a_alink_effect.inc
+1 -1
View File
@@ -10,7 +10,7 @@
#include "d/d_k_wmark.h"
#include "dusk/gx_helper.h"
const EffParamProc daAlink_c::m_fEffParamProc[] = {
DUSK_GAME_DATA const EffParamProc daAlink_c::m_fEffParamProc[] = {
&daAlink_c::setEffectFrontRollParam,
&daAlink_c::setEffectSlipParam,
&daAlink_c::setEffectSmallLandParam,
src/d/actor/d_a_alink_horse.inc
+4 -4
View File
@@ -73,19 +73,19 @@ int daAlink_c::getReinRideDirection() {
return DIR_RIGHT;
}
Vec const daAlink_c::m_handLeftOutSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handLeftOutSidePos = {
9.0f, -5.0f, 3.0f
};
Vec const daAlink_c::m_handRightOutSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handRightOutSidePos = {
9.0f, -5.0f, -3.0f
};
Vec const daAlink_c::m_handLeftInSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handLeftInSidePos = {
9.0f, 5.0f, 3.0f
};
Vec const daAlink_c::m_handRightInSidePos = {
DUSK_GAME_DATA Vec const daAlink_c::m_handRightInSidePos = {
9.0f, 5.0f, -3.0f
};
src/d/actor/d_a_balloon_2D.cpp
+2 -2
View File
@@ -229,9 +229,9 @@ int daBalloon2D_c::createHeap() {
return 1;
}
daBalloon2D_HIO_c l_HOSTIO;
DUSK_GAME_DATA daBalloon2D_HIO_c l_HOSTIO;
daBalloon2D_c* daBalloon2D_c::myclass;
DUSK_GAME_DATA daBalloon2D_c* daBalloon2D_c::myclass;
int daBalloon2D_c::create() {
int rv = dComIfG_resLoad(this, l_arcName);
src/d/actor/d_a_bg_obj.cpp
+4 -4
View File
@@ -501,14 +501,14 @@ static dCcD_SrcTri l_tri_src = {
static DUSK_CONST char* l_specName = "spec.dat";
createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
DUSK_GAME_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
&daBgObj_c::CreateHeapType0,
&daBgObj_c::CreateHeapType1,
&daBgObj_c::CreateHeapType1,
&daBgObj_c::CreateHeapType1,
};
createInitFunc daBgObj_c::mCreateInitFunc[] = {
DUSK_GAME_DATA createInitFunc daBgObj_c::mCreateInitFunc[] = {
&daBgObj_c::CreateInitType0,
&daBgObj_c::CreateInitType1,
&daBgObj_c::CreateInitType1,
@@ -519,14 +519,14 @@ int daBgObj_c::Create() {
return (this->*mCreateInitFunc[mSpecData.mSpecType])();
}
executeFunc daBgObj_c::mExecuteFunc[] = {
DUSK_GAME_DATA executeFunc daBgObj_c::mExecuteFunc[] = {
&daBgObj_c::ExecuteType0,
&daBgObj_c::ExecuteType1,
&daBgObj_c::ExecuteType1,
&daBgObj_c::ExecuteType1,
};
tgSetFunc daBgObj_c::mTgSetFunc[] = {
DUSK_GAME_DATA tgSetFunc daBgObj_c::mTgSetFunc[] = {
&daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0,
&daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3,
};
src/d/actor/d_a_boomerang.cpp
+6 -6
View File
@@ -137,17 +137,17 @@ static const u8 lbl_46_rodata_24[6] = {
0x1E,
};
const u16 daBoomerang_HIO_c0::m_lockWaitTime = 10;
DUSK_GAME_DATA const u16 daBoomerang_HIO_c0::m_lockWaitTime = 10;
const f32 daBoomerang_HIO_c0::m_minCircleR = 28.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_minCircleR = 28.0f;
const f32 daBoomerang_HIO_c0::m_middleCircleR = 35.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_middleCircleR = 35.0f;
const f32 daBoomerang_HIO_c0::m_maxCircleR = 80.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_maxCircleR = 80.0f;
const f32 daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f;
const f32 daBoomerang_HIO_c0::m_lockWindScale = 2.0f;
DUSK_GAME_DATA const f32 daBoomerang_HIO_c0::m_lockWindScale = 2.0f;
static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = {
Z2SE_SY_BOOM_LOCK_ON_1,
src/d/actor/d_a_bullet.cpp
+3 -3
View File
@@ -14,14 +14,14 @@ static DUSK_CONST char* l_bmdFileNameList[] = {"hanjo_stone.bmd"};
static BULLET_HIO_CLASS l_HIO;
const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
DUSK_GAME_DATA const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
{0},
};
dCcD_SrcSph daBullet_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daBullet_c::mCcDSph = {
daBullet_c::mCcDObjInfo,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSph
@@ -81,7 +81,7 @@ int daBullet_c::Delete() {
return 1;
}
daBullet_HIOParam const daBullet_Param_c::m = {
DUSK_GAME_DATA daBullet_HIOParam const daBullet_Param_c::m = {
-3.0f,
255.0f,
3.0f,
src/d/actor/d_a_coach_fire.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_coach_fire.h"
CoachFireAttr const daCoachFire_c::M_attr = {
DUSK_GAME_DATA CoachFireAttr const daCoachFire_c::M_attr = {
50.0f, // radius
4.0f, // field_0x04
36, // field_0x08
src/d/actor/d_a_cstaF.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ static const char l_arcNameFB[] = "CstaFB";
static const char l_spStageName[8] = "R_SP209";
const daCstaF_c::BckTbl daCstaF_c::m_bckIdxTable[] = {
DUSK_GAME_DATA const daCstaF_c::BckTbl daCstaF_c::m_bckIdxTable[] = {
{9, 9, 8, 7},
{9, 9, 8, 7}
};
src/d/actor/d_a_cstatue.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ enum CStatueAnimIndex {
CStatueAnimIndex_N,
};
u16 const daCstatue_c::m_bckIdxTable[daCstatueType_N][CStatueAnimIndex_N] = {
DUSK_GAME_DATA u16 const daCstatue_c::m_bckIdxTable[daCstatueType_N][CStatueAnimIndex_N] = {
// daCstatueType_NORMAL
{CStatueAnimSwing, CStatueAnimWalk, CStatueAnimSwing, CStatueAnimFall, CStatueAnimStop,
CStatueAnimStart, CStatueAnimSwingre},
src/d/actor/d_a_e_dd.cpp
+1 -1
View File
@@ -1775,7 +1775,7 @@ static cPhs_Step daE_DD_Create(fopAc_ac_c* a_this) {
return phase;
}
actor_method_class l_daE_DD_Method = {
DUSK_GAME_DATA actor_method_class l_daE_DD_Method = {
(process_method_func)daE_DD_Create,
(process_method_func)daE_DD_Delete,
(process_method_func)daE_DD_Execute,
src/d/actor/d_a_e_dn.cpp
+1 -1
View File
@@ -1031,7 +1031,7 @@ static int way_check(e_dn_class* i_this) {
return 2;
}
int learn_check;
DUSK_GAME_DATA int learn_check;
static void* shot_s_sub(void* i_actor, void* i_data) {
UNUSED(i_data);
src/d/actor/d_a_e_dt.cpp
+8 -8
View File
@@ -124,15 +124,15 @@ enum Joint {
/* 0x2A */ JNT_TAIL_2,
};
f32 E_DT_n::eDt_ShakeFrame[10] = {
DUSK_GAME_DATA f32 E_DT_n::eDt_ShakeFrame[10] = {
20.0f, 22.0f, 24.0f, 26.0f, 28.0f, 30.0f, 32.0f, 34.0f, 36.0f, 38.0f,
};
f32 E_DT_n::eDt_ShakeFrameDemo[10] = {
DUSK_GAME_DATA f32 E_DT_n::eDt_ShakeFrameDemo[10] = {
310.0f, 312.0f, 314.0f, 316.0f, 318.0f, 320.0f, 322.0f, 324.0f, 326.0f, 328.0f,
};
dCcD_SrcSph E_DT_n::cc_dt_body_src = {
DUSK_GAME_DATA dCcD_SrcSph E_DT_n::cc_dt_body_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
{dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -144,7 +144,7 @@ dCcD_SrcSph E_DT_n::cc_dt_body_src = {
} // mSphAttr
};
dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
DUSK_GAME_DATA dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
{dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -700,9 +700,9 @@ void daE_DT_c::setBoxTubaLandEffect() {
}
}
int E_DT_n::mDt_OtamaNum;
DUSK_GAME_DATA int E_DT_n::mDt_OtamaNum;
int E_DT_n::mDt_OtamaNo[20];
DUSK_GAME_DATA int E_DT_n::mDt_OtamaNo[20];
static void* s_otama_todo(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
@@ -726,7 +726,7 @@ int daE_DT_c::getNumberOfOtama() {
return E_DT_n::mDt_OtamaNum;
}
int E_DT_n::m_fall_no;
DUSK_GAME_DATA int E_DT_n::m_fall_no;
static void* s_fall_otama(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
@@ -772,7 +772,7 @@ static void* s_demo_otama(void* i_proc, void* i_this) {
return NULL;
}
cXyz E_DT_n::m_tongue_pos;
DUSK_GAME_DATA cXyz E_DT_n::m_tongue_pos;
static void* s_bomb_search(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))) {
src/d/actor/d_a_e_ge.cpp
+1 -1
View File
@@ -1081,7 +1081,7 @@ void daE_GE_c::executeShield() {
}
}
daE_GE_c::actionFunc daE_GE_c::l_actionmenu[9] = {
DUSK_GAME_DATA daE_GE_c::actionFunc daE_GE_c::l_actionmenu[9] = {
(&daE_GE_c::executeWait), (&daE_GE_c::executeFly), (&daE_GE_c::executeAttack),
(&daE_GE_c::executeBack), (&daE_GE_c::executeDown), (&daE_GE_c::executeSurprise),
(&daE_GE_c::executeCaw), (&daE_GE_c::executeWind), (&daE_GE_c::executeShield),
src/d/actor/d_a_e_mf.cpp
+1 -1
View File
@@ -3264,7 +3264,7 @@ e_mf_class::e_mf_class() {}
AUDIO_INSTANCES;
actor_method_class l_daE_MF_Method = {
DUSK_GAME_DATA actor_method_class l_daE_MF_Method = {
(process_method_func)daE_MF_Create,
(process_method_func)daE_MF_Delete,
(process_method_func)daE_MF_Execute,
src/d/actor/d_a_e_oc.cpp
+8 -8
View File
@@ -58,17 +58,17 @@ public:
#endif
};
f32 const E_OC_n::oc_attackb_trans[10] = {
DUSK_GAME_DATA f32 const E_OC_n::oc_attackb_trans[10] = {
0.0f, 0.0f, 0.0f, 0.0f, 15.3f,
38.4f, 63.3f, 86.2f, 103.3f, 112.0f
};
f32 const E_OC_n::oc_attackc_trans[10] = {
DUSK_GAME_DATA f32 const E_OC_n::oc_attackc_trans[10] = {
0.0f, 31.3f, 72.7f, 91.5f, 91.5f,
91.5f, 91.5f, 91.5f, 91.5f, 91.5f
};
dCcD_SrcSph E_OC_n::cc_sph_src = {
DUSK_GAME_DATA dCcD_SrcSph E_OC_n::cc_sph_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x3}, 0x75}}, // mObj
{0x9, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -80,7 +80,7 @@ dCcD_SrcSph E_OC_n::cc_sph_src = {
} // mSphAttr
};
dCcD_SrcSph E_OC_n::at_sph_src = {
DUSK_GAME_DATA dCcD_SrcSph E_OC_n::at_sph_src = {
{
{0x0, {{0x1000, 0x1, 0xD}, {0x0, 0x0}, 0x0}}, // mObj
{0x9, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -193,13 +193,13 @@ static int daE_OC_Draw(daE_OC_c* i_this) {
return i_this->draw();
}
daE_OC_c* E_OC_n::m_battle_oc;
DUSK_GAME_DATA daE_OC_c* E_OC_n::m_battle_oc;
daE_OC_c* E_OC_n::m_damage_oc;
DUSK_GAME_DATA daE_OC_c* E_OC_n::m_damage_oc;
daE_OC_c* E_OC_n::m_death_oc;
DUSK_GAME_DATA daE_OC_c* E_OC_n::m_death_oc;
daE_OC_c* E_OC_n::m_talk_oc;
DUSK_GAME_DATA daE_OC_c* E_OC_n::m_talk_oc;
static u8 lbl_216_bss_58;
src/d/actor/d_a_e_oct_bg.cpp
+4 -4
View File
@@ -173,10 +173,10 @@ static int daE_OctBg_Delete(daE_OctBg_c* i_this) {
static daE_OctBg_HIO_c l_HIO;
u8 unk_bss_78;
u8 unk_bss_79;
u8 unk_bss_7A;
u8 unk_bss_7B;
DUSK_GAME_DATA u8 unk_bss_78;
DUSK_GAME_DATA u8 unk_bss_79;
DUSK_GAME_DATA u8 unk_bss_7A;
DUSK_GAME_DATA u8 unk_bss_7B;
void daE_OctBg_c::cc_set() {
cXyz cStack_1c;
src/d/actor/d_a_e_ym.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ public:
/* 0x20 */ f32 mMoveRange;
};
dCcD_SrcSph E_YM_n::cc_sph_src = {
DUSK_GAME_DATA dCcD_SrcSph E_YM_n::cc_sph_src = {
{
{0, {{0x400, 1, 13}, {0xD8FBFDFF, 3}, 0x75}},
{dCcD_SE_METAL, 0, 0, 0, {0}},
src/d/actor/d_a_econt.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "d/d_meter2_info.h"
#include "f_pc/f_pc_executor.h"
u8 data_805197E0[4];
DUSK_GAME_DATA u8 data_805197E0[4];
static int daEcont_Draw(econt_class* i_this) {
return 1;
src/d/actor/d_a_formation_mng.cpp
+2 -2
View File
@@ -9,7 +9,7 @@
#include "d/d_save.h"
#include "f_op/f_op_actor_mng.h"
FmtMngAttributes const daFmtMng_c::M_attr = {
DUSK_GAME_DATA FmtMngAttributes const daFmtMng_c::M_attr = {
0x14, 6.0f, 0.5f,
120.0f, 150.0f, 10, 0x4000,
};
@@ -62,7 +62,7 @@ void daFmtMng_c::initMemberPos() {
}
}
daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = {
DUSK_GAME_DATA daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = {
&daFmtMng_c::initWait, &daFmtMng_c::executeWait,
&daFmtMng_c::initWalk, &daFmtMng_c::executeWalk,
&daFmtMng_c::initReverse, &daFmtMng_c::executeReverse,
src/d/actor/d_a_horse.cpp
+3 -3
View File
@@ -76,11 +76,11 @@ static void strippedFunc() {
static char const l_arcName[] = "Horse";
const u16 daHorse_c::m_footJointTable[] = {
DUSK_GAME_DATA const u16 daHorse_c::m_footJointTable[] = {
3, 7, 27, 31,
};
const f32 daHorse_c::m_callLimitDistance2 = 640000.0f;
DUSK_GAME_DATA const f32 daHorse_c::m_callLimitDistance2 = 640000.0f;
static f32 l_autoUpHeight = 50.0f;
@@ -170,7 +170,7 @@ void daHorse_hio_c::genMessage(JORMContext* ctx) {
}
#endif
const daHorse_hio_c1 daHorse_hio_c0::m = {
DUSK_GAME_DATA const daHorse_hio_c1 daHorse_hio_c0::m = {
600,
50,
45,
src/d/actor/d_a_hozelda.cpp
+3 -3
View File
@@ -31,7 +31,7 @@ static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) {
return NULL;
}
const daHoZelda_hio_c1 daHoZelda_hio_c0::m = {
DUSK_GAME_DATA const daHoZelda_hio_c1 daHoZelda_hio_c0::m = {
0x38E,
0x2AAA,
0x4000,
@@ -40,8 +40,8 @@ const daHoZelda_hio_c1 daHoZelda_hio_c0::m = {
4000.0f,
};
u8 daHoZelda_matAnm_c::mEyeMoveFlg;
u8 daHoZelda_matAnm_c::mMorfFrame;
DUSK_GAME_DATA u8 daHoZelda_matAnm_c::mEyeMoveFlg;
DUSK_GAME_DATA u8 daHoZelda_matAnm_c::mMorfFrame;
void daHoZelda_matAnm_c::init() {
field_0xf4 = 0.0f;
src/d/actor/d_a_midna.cpp
+5 -5
View File
@@ -113,7 +113,7 @@ void daMidna_hio_c::genMessage(JORMContext* ctx) {
}
#endif
daMidna_hio_c1 const daMidna_hio_c0::m = {
DUSK_GAME_DATA daMidna_hio_c1 const daMidna_hio_c0::m = {
0,
0,
0,
@@ -130,8 +130,8 @@ daMidna_hio_c1 const daMidna_hio_c0::m = {
25.0f,
};
bool daMidna_matAnm_c::sEyeMoveFlg;
u8 daMidna_matAnm_c::sMorfFrame;
DUSK_GAME_DATA bool daMidna_matAnm_c::sEyeMoveFlg;
DUSK_GAME_DATA u8 daMidna_matAnm_c::sMorfFrame;
void daMidna_matAnm_c::init() {
mOldTransX = 0.0f;
@@ -177,7 +177,7 @@ int daMidna_McaMorfCB1_c::execute(u16 i_jointNo, J3DTransformInfo* transform) {
return 1;
}
daMidna_texData_s const daMidna_c::m_texDataTable[21] = {
DUSK_GAME_DATA daMidna_texData_s const daMidna_c::m_texDataTable[21] = {
0x0405, 0x03A4,
0x03F5, 0x0399,
0x03F6, 0x0399,
@@ -201,7 +201,7 @@ daMidna_texData_s const daMidna_c::m_texDataTable[21] = {
0x03FD, 0x0399,
};
daMidna_anmData_s const daMidna_c::m_anmDataTable[53] = {
DUSK_GAME_DATA daMidna_anmData_s const daMidna_c::m_anmDataTable[53] = {
0x01DC, 0x00, -1.0f, 0,
0x01B7, 0x01, -1.0f, 0,
0x01B8, 0x02, -1.0f, 0,
src/d/actor/d_a_myna.cpp
+2 -2
View File
@@ -254,7 +254,7 @@ static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) {
return 0;
}
dCcD_SrcSph const daMyna_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph const daMyna_c::mCcDSph = {
0, 0x400, 1, 0x1F, 0, 0, 0x79, 0xA, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 15.0f,
};
@@ -326,7 +326,7 @@ int daMyna_c::baseMotion06(int param_0) {
return 1;
}
daMyna_c::BaseMotionFunc daMyna_c::mBaseMotionTBL[] = {
DUSK_GAME_DATA daMyna_c::BaseMotionFunc daMyna_c::mBaseMotionTBL[] = {
&daMyna_c::baseMotion00, &daMyna_c::baseMotion01, &daMyna_c::baseMotion02,
&daMyna_c::baseMotion03, &daMyna_c::baseMotion04, &daMyna_c::baseMotion05,
&daMyna_c::baseMotion06,
src/d/actor/d_a_nbomb.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ static dCcD_SrcSph l_sphSrc = {
} // mSphAttr
};
const char* daNbomb_c::m_arcNameList[6] = {
DUSK_GAME_DATA const char* daNbomb_c::m_arcNameList[6] = {
daAlink_c::getAlinkArcName(), daAlink_c::getAlinkArcName(), daAlink_c::getAlinkArcName(),
l_arcNameBombF, l_arcNameBombE, l_arcNameBombEW,
};
src/d/actor/d_a_npc.cpp
+7 -7
View File
@@ -1225,7 +1225,7 @@ void daNpcT_DmgStagger_c::calc(BOOL param_0) {
}
}
dCcD_SrcCyl daNpcT_c::mCcDCyl = {
DUSK_GAME_DATA dCcD_SrcCyl daNpcT_c::mCcDCyl = {
daNpcT_c::mCcDObjData,
{
{
@@ -1236,7 +1236,7 @@ dCcD_SrcCyl daNpcT_c::mCcDCyl = {
}
};
dCcD_SrcSph daNpcT_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daNpcT_c::mCcDSph = {
daNpcT_c::mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSph
@@ -1258,13 +1258,13 @@ void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_a
static_cast<daNpcT_c*>(actor1)->setCutType(cut_type);
}
fopAc_ac_c* daNpcT_c::mFindActorPtrs[50];
DUSK_GAME_DATA fopAc_ac_c* daNpcT_c::mFindActorPtrs[50];
char l_fileNameBuf[0x15];
DUSK_GAME_DATA char l_fileNameBuf[0x15];
s16 daNpcT_c::mSrchName;
DUSK_GAME_DATA s16 daNpcT_c::mSrchName;
int daNpcT_c::mFindCount;
DUSK_GAME_DATA int daNpcT_c::mFindCount;
void* daNpcT_c::srchActor(void* i_actor1, void* i_actor2) {
fopAc_ac_c* actor2 = (fopAc_ac_c*)i_actor2;
@@ -2930,7 +2930,7 @@ BOOL daNpcT_chkTmpBit(u32 i_no) {
return dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
}
const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = {
DUSK_GAME_DATA const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = {
{0, {{0, 0, 0}, {0, 0x00}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
src/d/actor/d_a_npc2.cpp
+5 -5
View File
@@ -7,7 +7,7 @@ static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_
static u16 daBaseNpc_putNurbs(dPnt* i_CPnts, int i_CPntNum, int i_maxPntNum, dPnt* o_curve_p, BOOL i_isClosed);
static s16 daBaseNpc_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1);
dCcD_SrcCyl daBaseNpc_c::mCcDCyl = {
DUSK_GAME_DATA dCcD_SrcCyl daBaseNpc_c::mCcDCyl = {
daBaseNpc_c::mCcDObj,
{
{
@@ -18,7 +18,7 @@ dCcD_SrcCyl daBaseNpc_c::mCcDCyl = {
}
};
dCcD_SrcSph daBaseNpc_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daBaseNpc_c::mCcDSph = {
daBaseNpc_c::mCcDObj,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSph
@@ -701,11 +701,11 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
return moveBgActor->MoveBGCreateHeap();
}
const char* daBaseNpc_moveBgActor_c::m_name;
DUSK_GAME_DATA const char* daBaseNpc_moveBgActor_c::m_name;
int daBaseNpc_moveBgActor_c::m_dzb_id;
DUSK_GAME_DATA int daBaseNpc_moveBgActor_c::m_dzb_id;
MoveBGActor_SetFunc daBaseNpc_moveBgActor_c::m_set_func;
DUSK_GAME_DATA MoveBGActor_SetFunc daBaseNpc_moveBgActor_c::m_set_func;
int daBaseNpc_moveBgActor_c::MoveBGCreateHeap() {
if (!CreateHeap()) {
src/d/actor/d_a_npc4.cpp
+8 -8
View File
@@ -707,7 +707,7 @@ void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac
}
}
dCcD_SrcCyl daNpcF_c::mCcDCyl = {
DUSK_GAME_DATA dCcD_SrcCyl daNpcF_c::mCcDCyl = {
daNpcF_c::mCcDObjInfo,
{
{
@@ -718,18 +718,18 @@ dCcD_SrcCyl daNpcF_c::mCcDCyl = {
}
};
dCcD_SrcSph daNpcF_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daNpcF_c::mCcDSph = {
daNpcF_c::mCcDObjInfo,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSph
} // mSphAttr
};
char daNpcF_c::mFileNameBuf[0x15];
DUSK_GAME_DATA char daNpcF_c::mFileNameBuf[0x15];
fopAc_ac_c* daNpcF_c::mFindActorPList[100];
DUSK_GAME_DATA fopAc_ac_c* daNpcF_c::mFindActorPList[100];
s32 daNpcF_c::mFindCount;
DUSK_GAME_DATA s32 daNpcF_c::mFindCount;
void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) {
void* param_1_copy = param_1;
@@ -746,7 +746,7 @@ void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) {
return NULL;
}
s16 daNpcF_c::mSrchActorName;
DUSK_GAME_DATA s16 daNpcF_c::mSrchActorName;
void* daNpcF_c::srchActor(void* i_proc, void* i_this) {
void* i_this_copy = i_this;
@@ -2159,14 +2159,14 @@ int daNpcF_MoveBgActor_c::MoveBGDraw() {
return Draw();
}
dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
DUSK_GAME_DATA dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
{0}
};
dCcD_SrcGObjInf const daNpcF_c::mCcDObjInfo = {
DUSK_GAME_DATA dCcD_SrcGObjInf const daNpcF_c::mCcDObjInfo = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
src/d/actor/d_a_npc_aru.cpp
+3 -3
View File
@@ -146,7 +146,7 @@ enum Type {
/* 0x4 */ TYPE_4,
};
const daNpc_Aru_HIOParam daNpc_Aru_Param_c::m = {
DUSK_GAME_DATA const daNpc_Aru_HIOParam daNpc_Aru_Param_c::m = {
220.0f,
-3.0f,
1.0f,
@@ -350,7 +350,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{11, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Aru_c::mCutNameList[7] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Aru_c::mCutNameList[7] = {
"",
"RIDEON_HORSE",
"GOTO_BULLRUNNING_STAGE",
@@ -360,7 +360,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Aru_c::mCutNameList[7] = {
"NO_ENTRANCE",
};
daNpc_Aru_c::cutFunc DUSK_CONST daNpc_Aru_c::mCutList[7] = {
DUSK_GAME_DATA daNpc_Aru_c::cutFunc DUSK_CONST daNpc_Aru_c::mCutList[7] = {
NULL,
&daNpc_Aru_c::cutRideOnHorse,
&daNpc_Aru_c::cutGotoBullRunningStage,
src/d/actor/d_a_npc_ash.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "SSystem/SComponent/c_math.h"
#include <cstring>
const daNpcAsh_HIOParam daNpcAsh_Param_c::m = {
DUSK_GAME_DATA const daNpcAsh_HIOParam daNpcAsh_Param_c::m = {
35.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -198,7 +198,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[6] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Ash";
daNpcAsh_c::EventFn daNpcAsh_c::mEvtSeqList[6] = {
DUSK_GAME_DATA daNpcAsh_c::EventFn daNpcAsh_c::mEvtSeqList[6] = {
NULL,
&daNpcAsh_c::EvCut_Introduction,
&daNpcAsh_c::EvCut_Meeting,
src/d/actor/d_a_npc_ashB.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
#include "dusk/randomizer/game/verify_item_functions.h"
#endif
const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
DUSK_GAME_DATA const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
205.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -98,7 +98,7 @@ void daNpcAshB_HIO_c::genMessage(JORMContext* ctext) {
}
#endif
daNpcAshB_c::EventFn DUSK_CONST daNpcAshB_c::mEvtSeqList[2] = {
DUSK_GAME_DATA daNpcAshB_c::EventFn DUSK_CONST daNpcAshB_c::mEvtSeqList[2] = {
NULL,
&daNpcAshB_c::EvCut_Appear,
};
src/d/actor/d_a_npc_bans.cpp
+3 -3
View File
@@ -142,7 +142,7 @@ enum Type {
/* 0x5 */ TYPE_DEFAULT,
};
daNpc_Bans_HIOParam const daNpc_Bans_Param_c::m = {
DUSK_GAME_DATA daNpc_Bans_HIOParam const daNpc_Bans_Param_c::m = {
200.0f,
-3.0f,
1.0f,
@@ -339,14 +339,14 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{9, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Bans_c::mCutNameList[4] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Bans_c::mCutNameList[4] = {
"",
"ANGER",
"PURCHASE",
"GO_BACK",
};
daNpc_Bans_c::cutFunc DUSK_CONST daNpc_Bans_c::mCutList[4] = {
DUSK_GAME_DATA daNpc_Bans_c::cutFunc DUSK_CONST daNpc_Bans_c::mCutList[4] = {
NULL,
&daNpc_Bans_c::cutAnger,
&daNpc_Bans_c::cutPurchase,
src/d/actor/d_a_npc_besu.cpp
+3 -3
View File
@@ -284,7 +284,7 @@ enum Event {
/* 0xC */ EVENT_CONVERSATION_ABOUT_ZORA,
};
const daNpc_Besu_HIOParam daNpc_Besu_Param_c::m = {
DUSK_GAME_DATA const daNpc_Besu_HIOParam daNpc_Besu_Param_c::m = {
160.0f,
-3.0f,
1.0f,
@@ -577,7 +577,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Besu_c::mCutNameList[15] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Besu_c::mCutNameList[15] = {
"",
"CONVERSATION_ABOUT_SARU",
"CONVERSATION_ABOUT_PACHINKO",
@@ -595,7 +595,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Besu_c::mCutNameList[15] = {
"THANK_YOU",
};
daNpc_Besu_c::cutFunc DUSK_CONST daNpc_Besu_c::mCutList[15] = {
DUSK_GAME_DATA daNpc_Besu_c::cutFunc DUSK_CONST daNpc_Besu_c::mCutList[15] = {
NULL,
&daNpc_Besu_c::cutConversationAboutSaru,
&daNpc_Besu_c::cutConversationAboutPachinko,
src/d/actor/d_a_npc_blue_ns.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Blue_NS";
static NPC_BLUE_NS_HIO_CLASS l_HIO;
daNpcBlueNS_c::EventFn DUSK_CONST daNpcBlueNS_c::mEvtSeqList[] = {
DUSK_GAME_DATA daNpcBlueNS_c::EventFn DUSK_CONST daNpcBlueNS_c::mEvtSeqList[] = {
NULL,
&daNpcBlueNS_c::_Evt_ChgYami_Chibi,
&daNpcBlueNS_c::_Evt_ChgYami_Debu,
@@ -93,7 +93,7 @@ const static dCcD_SrcCyl l_cyl_src = {
}
};
const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = {
DUSK_GAME_DATA const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = {
55.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_bou.cpp
+3 -3
View File
@@ -119,7 +119,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Bou_c::mCutNameList[9] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Bou_c::mCutNameList[9] = {
"",
"WILDGOAT",
"WILDGOAT_SUCCESS",
@@ -131,7 +131,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Bou_c::mCutNameList[9] = {
"MEETING_AGAIN"
};
daNpc_Bou_c::cutFunc DUSK_CONST daNpc_Bou_c::mCutList[9] = {
DUSK_GAME_DATA daNpc_Bou_c::cutFunc DUSK_CONST daNpc_Bou_c::mCutList[9] = {
NULL,
&daNpc_Bou_c::cutWildGoat,
&daNpc_Bou_c::cutWildGoatSuccess,
@@ -157,7 +157,7 @@ daNpc_Bou_c::~daNpc_Bou_c() {
deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
}
daNpc_Bou_HIOParam const daNpc_Bou_Param_c::m = {
DUSK_GAME_DATA daNpc_Bou_HIOParam const daNpc_Bou_Param_c::m = {
{
210.0f, -3.0f, 1.0f, 600.0f, 255.0f, 200.0f, 35.0f, 40.0f,
0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
src/d/actor/d_a_npc_bouS.cpp
+2 -2
View File
@@ -265,7 +265,7 @@ void daNpcBouS_HIO_c::genMessage(JORMContext* ctx) {
}
#endif
daNpcBouS_c::eventFunc daNpcBouS_c::mEvtSeqList[4] = {
DUSK_GAME_DATA daNpcBouS_c::eventFunc daNpcBouS_c::mEvtSeqList[4] = {
NULL,
&daNpcBouS_c::EvCut_BousIntroSumo1,
&daNpcBouS_c::EvCut_BousIntroSumo2,
@@ -290,7 +290,7 @@ daNpcBouS_c::~daNpcBouS_c() {
#endif
}
daNpcBouS_HIOParam const daNpcBouS_Param_c::m = {
DUSK_GAME_DATA daNpcBouS_HIOParam const daNpcBouS_Param_c::m = {
220.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_cd.cpp
+2 -2
View File
@@ -160,7 +160,7 @@ static anmTblPrm const l_bckTbl_W[10] = {
{"Wspcial_l", 7}, {"Wspcial_l", 8}, {"Wspcial_l", 3}, {"Wspcial_l", 4}, {"Wspcial_l", 5},
};
dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
DUSK_GAME_DATA dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
{
{0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -346,7 +346,7 @@ static anmTblPrm const l_bmdTWTbl[30] = {
{l_resWGNa2[1], 3}, {l_resWANb2[1], 3},
};
daNpcCd_HIO_c l_Cd_HIO;
DUSK_GAME_DATA daNpcCd_HIO_c l_Cd_HIO;
int daNpcCd_c::setAttention(int i_idx) {
static cXyz const a_eyeOfsTbl[30] = {
src/d/actor/d_a_npc_cd2.cpp
+2 -2
View File
@@ -179,7 +179,7 @@ static anmTblPrm const l_bckTbl_W[54] = {
{"Wgeneral", 5}, {"Wgeneral", 6}, {"Wgeneral", 9}, {"Wgeneral", 15},
};
dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
DUSK_GAME_DATA dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
{
{0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -240,7 +240,7 @@ static anmTblPrm const l_btpTWTbl[30] = {
#include "d/actor/d_a_npc_cd2_HIO.inc"
daNpcCd2_HIO_c l_Cd2_HIO;
DUSK_GAME_DATA daNpcCd2_HIO_c l_Cd2_HIO;
int daNpcCd2_c::NpcCreate(int param_1) {
J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
src/d/actor/d_a_npc_cdn3.cpp
+46 -46
View File
@@ -10,7 +10,7 @@
#include "d/d_s_play.h"
#include <cstring>
const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = {
DUSK_GAME_DATA const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = {
{&daNpcCdn3_c::initWait, &daNpcCdn3_c::executeWait},
{&daNpcCdn3_c::initPath, &daNpcCdn3_c::executePath},
{&daNpcCdn3_c::initTalk, &daNpcCdn3_c::executeTalk},
@@ -1500,7 +1500,7 @@ inline int daNpcCdn3_c::draw() {
return 1;
}
daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = {
m_seq00_funcTbl, m_seq01_funcTbl,
m_seq02_funcTbl, m_seq03_funcTbl,
m_seq04_funcTbl, m_seq05_funcTbl,
@@ -1525,25 +1525,25 @@ daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = {
m_seq42_funcTbl, m_seq43_funcTbl,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq00_funcTbl[2] = {&daNpcCdn3_c::walka, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq00_funcTbl[2] = {&daNpcCdn3_c::walka, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq01_funcTbl[2] = {&daNpcCdn3_c::runa, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq01_funcTbl[2] = {&daNpcCdn3_c::runa, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq02_funcTbl[2] = {&daNpcCdn3_c::waita, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq02_funcTbl[2] = {&daNpcCdn3_c::waita, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq03_funcTbl[2] = {&daNpcCdn3_c::talka, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq03_funcTbl[2] = {&daNpcCdn3_c::talka, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq04_funcTbl[2] = {&daNpcCdn3_c::runb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq04_funcTbl[2] = {&daNpcCdn3_c::runb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq05_funcTbl[4] = {&daNpcCdn3_c::turnr, &daNpcCdn3_c::waita,
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq05_funcTbl[4] = {&daNpcCdn3_c::turnr, &daNpcCdn3_c::waita,
&daNpcCdn3_c::talka, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq06_funcTbl[4] = {&daNpcCdn3_c::turnl, &daNpcCdn3_c::waita,
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq06_funcTbl[4] = {&daNpcCdn3_c::turnl, &daNpcCdn3_c::waita,
&daNpcCdn3_c::talka, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq07_funcTbl[2] = {&daNpcCdn3_c::waitwall, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq07_funcTbl[2] = {&daNpcCdn3_c::waitwall, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = {
&daNpcCdn3_c::talkwall,
&daNpcCdn3_c::waitwall,
&daNpcCdn3_c::talkbwall,
@@ -1553,25 +1553,25 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq09_funcTbl[2] = {&daNpcCdn3_c::talkb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq09_funcTbl[2] = {&daNpcCdn3_c::talkb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq10_funcTbl[2] = {&daNpcCdn3_c::talkc, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq10_funcTbl[2] = {&daNpcCdn3_c::talkc, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq11_funcTbl[6] = {&daNpcCdn3_c::talka, &daNpcCdn3_c::waita,
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq11_funcTbl[6] = {&daNpcCdn3_c::talka, &daNpcCdn3_c::waita,
&daNpcCdn3_c::talkb, &daNpcCdn3_c::waitb,
&daNpcCdn3_c::talkc, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq12_funcTbl[2] = {&daNpcCdn3_c::waitb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq12_funcTbl[2] = {&daNpcCdn3_c::waitb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq13_funcTbl[6] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq13_funcTbl[6] = {
&daNpcCdn3_c::browsea, &daNpcCdn3_c::browseb, &daNpcCdn3_c::talka,
&daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq14_funcTbl[2] = {&daNpcCdn3_c::walkb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq14_funcTbl[2] = {&daNpcCdn3_c::walkb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq15_funcTbl[2] = {&daNpcCdn3_c::sitwaita, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq15_funcTbl[2] = {&daNpcCdn3_c::sitwaita, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = {
&daNpcCdn3_c::sittalka,
&daNpcCdn3_c::sitwaita,
&daNpcCdn3_c::sittalkab,
@@ -1581,14 +1581,14 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq17_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq17_funcTbl[2] = {
&daNpcCdn3_c::playm,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq18_funcTbl[2] = {&daNpcCdn3_c::sitwaitb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq18_funcTbl[2] = {&daNpcCdn3_c::sitwaitb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = {
&daNpcCdn3_c::sittalkb,
&daNpcCdn3_c::sitwaitb,
&daNpcCdn3_c::sittalkbb,
@@ -1598,14 +1598,14 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq20_funcTbl[2] = {&daNpcCdn3_c::looka, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq20_funcTbl[2] = {&daNpcCdn3_c::looka, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq21_funcTbl[2] = {&daNpcCdn3_c::lookb, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq21_funcTbl[2] = {&daNpcCdn3_c::lookb, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq22_funcTbl[4] = {&daNpcCdn3_c::looka, &daNpcCdn3_c::lookb,
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq22_funcTbl[4] = {&daNpcCdn3_c::looka, &daNpcCdn3_c::lookb,
&daNpcCdn3_c::waita, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = {
&daNpcCdn3_c::talka,
&daNpcCdn3_c::waita,
&daNpcCdn3_c::talkb,
@@ -1615,11 +1615,11 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq24_funcTbl[5] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq24_funcTbl[5] = {
&daNpcCdn3_c::talkb, &daNpcCdn3_c::talka, &daNpcCdn3_c::talkc, &daNpcCdn3_c::waita, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = {
&daNpcCdn3_c::browsea,
&daNpcCdn3_c::browseb,
&daNpcCdn3_c::talka,
@@ -1629,37 +1629,37 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq26_funcTbl[3] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq26_funcTbl[3] = {
&daNpcCdn3_c::browsea,
&daNpcCdn3_c::browseb,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq27_funcTbl[2] = {&daNpcCdn3_c::dance, NULL};
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq27_funcTbl[2] = {&daNpcCdn3_c::dance, NULL};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq28_funcTbl[3] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq28_funcTbl[3] = {
&daNpcCdn3_c::ladytalka,
&daNpcCdn3_c::normtalka,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq29_funcTbl[3] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq29_funcTbl[3] = {
&daNpcCdn3_c::ladytalkb,
&daNpcCdn3_c::normtalkb,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq30_funcTbl[6] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq30_funcTbl[6] = {
&daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::waita,
&daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq31_funcTbl[6] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq31_funcTbl[6] = {
&daNpcCdn3_c::waita, &daNpcCdn3_c::ladytalkb, &daNpcCdn3_c::talka,
&daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = {
&daNpcCdn3_c::talka,
&daNpcCdn3_c::ladytalka,
&daNpcCdn3_c::waita,
@@ -1669,7 +1669,7 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = {
&daNpcCdn3_c::waita,
&daNpcCdn3_c::ladytalkb,
&daNpcCdn3_c::talka,
@@ -1679,50 +1679,50 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = {
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq34_funcTbl[9] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq34_funcTbl[9] = {
&daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::ladytalkb,
&daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita,
&daNpcCdn3_c::normtalka, &daNpcCdn3_c::normtalkb, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq35_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq35_funcTbl[2] = {
&daNpcCdn3_c::sellme,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = {
&daNpcCdn3_c::ladytalkb,
&daNpcCdn3_c::talka,
&daNpcCdn3_c::waita,
NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq37_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq37_funcTbl[2] = {
&daNpcCdn3_c::sing, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq38_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq38_funcTbl[2] = {
&daNpcCdn3_c::sittalka, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq39_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq39_funcTbl[2] = {
&daNpcCdn3_c::sittalkab, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq40_funcTbl[3] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq40_funcTbl[3] = {
&daNpcCdn3_c::sittalka, &daNpcCdn3_c::sittalkab, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq41_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq41_funcTbl[2] = {
&daNpcCdn3_c::sittalkb, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq42_funcTbl[2] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq42_funcTbl[2] = {
&daNpcCdn3_c::sittalkbb, NULL,
};
daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq43_funcTbl[3] = {
DUSK_GAME_DATA daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq43_funcTbl[3] = {
&daNpcCdn3_c::sittalkb, &daNpcCdn3_c::sittalkbb, NULL,
};
src/d/actor/d_a_npc_chat.cpp
+2 -2
View File
@@ -2182,7 +2182,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Chat";
static NPC_CHAT_HIO_CLASS l_HIO;
daNpcChat_c::eventFunc DUSK_CONST daNpcChat_c::mEvtSeqList[1] = {
DUSK_GAME_DATA daNpcChat_c::eventFunc DUSK_CONST daNpcChat_c::mEvtSeqList[1] = {
NULL,
};
@@ -2218,7 +2218,7 @@ static DUSK_CONSTEXPR anmTblPrm const l_objTWTbl[13] = {
{"objectTW", -1},
};
daNpcChat_HIOParam const daNpcChat_Param_c::m = {
DUSK_GAME_DATA daNpcChat_HIOParam const daNpcChat_Param_c::m = {
55.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_chin.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ static s16 const sLoadResPat_Normal[6] = {0, 1, 2, 4, 5, -1};
static s16 const sLoadResPat_Tw[3] = {0, 3, -1};
daNpcChin_HIOParam const daNpcChin_Param_c::m = {
DUSK_GAME_DATA daNpcChin_HIOParam const daNpcChin_Param_c::m = {
40.0f, -3.0f, 1.0f, 400.0f, 255.0f, 130.0f, 35.0f, 30.0f,
0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
0.6f, 12.0f,
@@ -134,7 +134,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[8] = {
static u8 lit_3861[12];
daNpcChin_c::eventFunc daNpcChin_c::mEvtSeqList[8] = {
DUSK_GAME_DATA daNpcChin_c::eventFunc daNpcChin_c::mEvtSeqList[8] = {
NULL,
&daNpcChin_c::_Evt_GameStart,
&daNpcChin_c::_Evt_GameFailed,
src/d/actor/d_a_npc_clerka.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/d_msg_object.h"
#include <cstring>
const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = {
DUSK_GAME_DATA const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = {
220.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -115,9 +115,9 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -9, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_clerkA_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_clerkA_c::mCutNameList[1] = {""};
daNpc_clerkA_c::cutFunc DUSK_CONST daNpc_clerkA_c::mCutList[1] = {NULL};
DUSK_GAME_DATA daNpc_clerkA_c::cutFunc DUSK_CONST daNpc_clerkA_c::mCutList[1] = {NULL};
daNpc_clerkA_c::~daNpc_clerkA_c() {
deleteObject();
src/d/actor/d_a_npc_clerkb.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/d_msg_object.h"
#include <cstring>
const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = {
DUSK_GAME_DATA const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = {
220.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -120,9 +120,9 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{8, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_clerkB_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_clerkB_c::mCutNameList[1] = {""};
daNpc_clerkB_c::cutFunc DUSK_CONST daNpc_clerkB_c::mCutList[1] = {NULL};
DUSK_GAME_DATA daNpc_clerkB_c::cutFunc DUSK_CONST daNpc_clerkB_c::mCutList[1] = {NULL};
daNpc_clerkB_c::~daNpc_clerkB_c() {
deleteObject();
src/d/actor/d_a_npc_clerkt.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/d_msg_object.h"
#include <cstring>
const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = {
DUSK_GAME_DATA const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = {
120.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -108,9 +108,9 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpcClerkT_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpcClerkT_c::mCutNameList[1] = {""};
daNpcClerkT_c::cutFunc DUSK_CONST daNpcClerkT_c::mCutList[1] = {NULL};
DUSK_GAME_DATA daNpcClerkT_c::cutFunc DUSK_CONST daNpcClerkT_c::mCutList[1] = {NULL};
daNpcClerkT_c::~daNpcClerkT_c() {
deleteObject();
src/d/actor/d_a_npc_coach.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ static int jointRearWheelCallBack(J3DJoint* i_joint, int param_2) {
return 1;
}
daNpcCoach_Attr_c const daNpcCoach_c::M_attr = {
DUSK_GAME_DATA daNpcCoach_Attr_c const daNpcCoach_c::M_attr = {
-3.0f,
-200.0f,
-0.25f,
src/d/actor/d_a_npc_doc.cpp
+3 -3
View File
@@ -84,13 +84,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Doc_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Doc_c::mCutNameList[1] = {""};
daNpc_Doc_c::cutFunc DUSK_CONST daNpc_Doc_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_Doc_c::cutFunc DUSK_CONST daNpc_Doc_c::mCutList[1] = {
NULL,
};
const daNpc_Doc_HIOParam daNpc_Doc_Param_c::m = {
DUSK_GAME_DATA const daNpc_Doc_HIOParam daNpc_Doc_Param_c::m = {
140.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_doorboy.cpp
+2 -2
View File
@@ -117,11 +117,11 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "DoorBoy";
static NPC_DOORBOY_HIO_CLASS l_HIO;
daNpcDoorBoy_c::EventFn DUSK_CONST daNpcDoorBoy_c::mEvtSeqList[1] = {
DUSK_GAME_DATA daNpcDoorBoy_c::EventFn DUSK_CONST daNpcDoorBoy_c::mEvtSeqList[1] = {
NULL
};
daNpcDoorBoy_HIOParam const daNpcDoorBoy_Param_c::m = {
DUSK_GAME_DATA daNpcDoorBoy_HIOParam const daNpcDoorBoy_Param_c::m = {
55.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_drainSol.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[2] = {
"DrainSol2",
};
const daNpcDrSol_HIOParam daNpcDrSol_Param_c::m = {
DUSK_GAME_DATA const daNpcDrSol_HIOParam daNpcDrSol_Param_c::m = {
40.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_fairy.cpp
+3 -3
View File
@@ -150,7 +150,7 @@ enum Type {
/* 0x4 */ TYPE_50F,
};
const daNpc_Fairy_HIOParam daNpc_Fairy_Param_c::m = {
DUSK_GAME_DATA const daNpc_Fairy_HIOParam daNpc_Fairy_Param_c::m = {
190.0f,
-3.0f,
1.0f,
@@ -464,7 +464,7 @@ static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[18] = {
{"RETURN_CANCEL", 1},
};
char DUSK_CONST* DUSK_CONST daNpc_Fairy_c::mCutNameList[18] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Fairy_c::mCutNameList[18] = {
"",
"APPEAR_10F_01",
"APPEAR_10F_02",
@@ -485,7 +485,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Fairy_c::mCutNameList[18] = {
"RETURN_CANCEL",
};
daNpc_Fairy_c::cutFunc DUSK_CONST daNpc_Fairy_c::mCutList[18] = {
DUSK_GAME_DATA daNpc_Fairy_c::cutFunc DUSK_CONST daNpc_Fairy_c::mCutList[18] = {
NULL,
&daNpc_Fairy_c::cutAppear_10F_01,
&daNpc_Fairy_c::cutAppear_10F_02,
src/d/actor/d_a_npc_fairy_seirei.cpp
+3 -3
View File
@@ -53,16 +53,16 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
DUSK_CONST char* daNpc_FairySeirei_c::mCutNameList[1] = {
DUSK_GAME_DATA DUSK_CONST char* daNpc_FairySeirei_c::mCutNameList[1] = {
"",
};
DUSK_CONST daNpc_FairySeirei_c::cutFunc daNpc_FairySeirei_c::mCutList[1] = {
DUSK_GAME_DATA DUSK_CONST daNpc_FairySeirei_c::cutFunc daNpc_FairySeirei_c::mCutList[1] = {
NULL,
};
const daNpc_FairySeirei_HIOParam daNpc_FairySeirei_Param_c::m = {
DUSK_GAME_DATA const daNpc_FairySeirei_HIOParam daNpc_FairySeirei_Param_c::m = {
600.0f, 0.0f, 1.0f, 4000.0f, 255.0f, 200.0f, 0.0f, 60.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0,
0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
src/d/actor/d_a_npc_gnd.cpp
+3 -3
View File
@@ -49,11 +49,11 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
};
char DUSK_CONST* DUSK_CONST daNpc_Gnd_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Gnd_c::mCutNameList[1] = {""};
daNpc_Gnd_c::cutFunc DUSK_CONST daNpc_Gnd_c::mCutList[1] = {NULL};
DUSK_GAME_DATA daNpc_Gnd_c::cutFunc DUSK_CONST daNpc_Gnd_c::mCutList[1] = {NULL};
const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
DUSK_GAME_DATA const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
280.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_gra.cpp
+3 -3
View File
@@ -19,7 +19,7 @@
#include "dusk/randomizer/game/verify_item_functions.h"
#endif
const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
DUSK_GAME_DATA const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
{90.0f, -4.0f, 1.0f, 850.0f, 255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f,
-20.0f, 40.0f, -30.0f, 40.0f, -40.0f, 0.4f, 12.0f, 4, 6, 6, 6,
60.0f, 500.0f, 300.0f, -300.0f, 0x3c, 8, 0, 0, 0, 0, 0},
@@ -293,7 +293,7 @@ void daNpc_grA_HIO_c::genMessage(JORMContext* context) {
}
#endif
char DUSK_CONST* DUSK_CONST daNpc_grA_c::mEvtCutNameList[12] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grA_c::mEvtCutNameList[12] = {
"",
"TALK_SPA",
"GRDS_ROLL",
@@ -308,7 +308,7 @@ char DUSK_CONST* DUSK_CONST daNpc_grA_c::mEvtCutNameList[12] = {
"ROLL_ROCK_CRASH",
};
daNpc_grA_c::cut_type DUSK_CONST daNpc_grA_c::mEvtCutList[] = {
DUSK_GAME_DATA daNpc_grA_c::cut_type DUSK_CONST daNpc_grA_c::mEvtCutList[] = {
NULL,
&daNpc_grA_c::ECut_talkSpa,
&daNpc_grA_c::ECut_grDSRoll,
src/d/actor/d_a_npc_grc.cpp
+3 -3
View File
@@ -230,11 +230,11 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grC";
char DUSK_CONST* DUSK_CONST daNpc_grC_c::mEvtCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grC_c::mEvtCutNameList = "";
daNpc_grC_c::EventFn DUSK_CONST daNpc_grC_c::mEvtCutList[1] = {NULL};
DUSK_GAME_DATA daNpc_grC_c::EventFn DUSK_CONST daNpc_grC_c::mEvtCutList[1] = {NULL};
daNpc_grC_HIOParam const daNpc_grC_Param_c::m = {
DUSK_GAME_DATA daNpc_grC_HIOParam const daNpc_grC_Param_c::m = {
40.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_grd.cpp
+3 -3
View File
@@ -109,12 +109,12 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grD";
char DUSK_CONST* DUSK_CONST daNpc_Grd_c::mEvtCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Grd_c::mEvtCutNameList[2] = {
"",
"NOD_TO_GRZ",
};
daNpc_Grd_c::cutFunc DUSK_CONST daNpc_Grd_c::mEvtCutList[2] = {
DUSK_GAME_DATA daNpc_Grd_c::cutFunc DUSK_CONST daNpc_Grd_c::mEvtCutList[2] = {
NULL,
&daNpc_Grd_c::ECut_nodToGrz,
};
@@ -131,7 +131,7 @@ daNpc_Grd_c::~daNpc_Grd_c() {
}
}
const daNpc_Grd_HIOParam daNpc_Grd_Param_c::m = {
DUSK_GAME_DATA const daNpc_Grd_HIOParam daNpc_Grd_Param_c::m = {
230.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
src/d/actor/d_a_npc_grm.cpp
+3 -3
View File
@@ -122,19 +122,19 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_grM_c::mCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grM_c::mCutNameList[2] = {
"",
"TALK_SPA",
};
daNpc_grM_c::cutFunc DUSK_CONST daNpc_grM_c::mCutList[2] = {
DUSK_GAME_DATA daNpc_grM_c::cutFunc DUSK_CONST daNpc_grM_c::mCutList[2] = {
NULL,
&daNpc_grM_c::cutTalkSpa,
};
static NPC_GRM_HIO_CLASS l_HIO;
daNpc_grM_HIOParam const daNpc_grM_Param_c::m = {
DUSK_GAME_DATA daNpc_grM_HIOParam const daNpc_grM_Param_c::m = {
300.0f, -3.0f, 1.0f, 600.0f, 255.0f, 260.0f, 35.0f, 70.0f, 0.0f, 0.0f, 30.0f,
-30.0f, 30.0f, -10.0f, 20.0f, -20.0f, 0.6f, 12.0f, 8, 6, 8, 6,
0.0f, 0.0f, 0.0f, 0.0f, 60, 8, 0, 0, 0, false, false,
src/d/actor/d_a_npc_grmc.cpp
+3 -3
View File
@@ -149,9 +149,9 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_grMC_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grMC_c::mCutNameList = "";
daNpc_grMC_c::cutFunc DUSK_CONST daNpc_grMC_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_grMC_c::cutFunc DUSK_CONST daNpc_grMC_c::mCutList[1] = {
NULL,
};
@@ -171,7 +171,7 @@ daNpc_grMC_c::~daNpc_grMC_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
daNpc_grMC_HIOParam const daNpc_grMC_Param_c::m = {
DUSK_GAME_DATA daNpc_grMC_HIOParam const daNpc_grMC_Param_c::m = {
140.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_gro.cpp
+3 -3
View File
@@ -330,13 +330,13 @@ void daNpc_grO_HIO_c::genMessage(JORMContext* ctx) {
}
#endif
char DUSK_CONST* DUSK_CONST daNpc_grO_c::mEvtCutNameList[3] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grO_c::mEvtCutNameList[3] = {
"",
"BOKIN_FINISH",
"PUSHOUT",
};
daNpc_grO_c::cutFunc DUSK_CONST daNpc_grO_c::mEvtCutList[3] = {
DUSK_GAME_DATA daNpc_grO_c::cutFunc DUSK_CONST daNpc_grO_c::mEvtCutList[3] = {
NULL,
&daNpc_grO_c::ECut_bokinFinish,
&daNpc_grO_c::cutPushOut,
@@ -360,7 +360,7 @@ daNpc_grO_c::~daNpc_grO_c() {
#endif
}
daNpc_grO_HIOParam const daNpc_grO_Param_c::m = {
DUSK_GAME_DATA daNpc_grO_HIOParam const daNpc_grO_Param_c::m = {
160.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_grr.cpp
+3 -3
View File
@@ -204,13 +204,13 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {NULL};
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grR";
char DUSK_CONST* DUSK_CONST daNpc_grR_c::mEvtCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grR_c::mEvtCutNameList = "";
daNpc_grR_c::cutFunc DUSK_CONST daNpc_grR_c::mEvtCutList[1] = {
DUSK_GAME_DATA daNpc_grR_c::cutFunc DUSK_CONST daNpc_grR_c::mEvtCutList[1] = {
NULL,
};
daNpc_grR_HIOParam const daNpc_grR_Param_c::m = {
DUSK_GAME_DATA daNpc_grR_HIOParam const daNpc_grR_Param_c::m = {
60.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_grs.cpp
+3 -3
View File
@@ -97,12 +97,12 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grS";
static NPC_GRS_HIO_CLASS l_HIO;
char DUSK_CONST* DUSK_CONST daNpc_grS_c::mEvtCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_grS_c::mEvtCutNameList[2] = {
"",
"PUSHOUT",
};
daNpc_grS_c::cutFunc DUSK_CONST daNpc_grS_c::mEvtCutList[2] = {
DUSK_GAME_DATA daNpc_grS_c::cutFunc DUSK_CONST daNpc_grS_c::mEvtCutList[2] = {
NULL,
&daNpc_grS_c::cutPushOut,
};
@@ -126,7 +126,7 @@ daNpc_grS_c::~daNpc_grS_c() {
#endif
}
const daNpc_grS_HIOParam daNpc_grS_Param_c::m = {
DUSK_GAME_DATA const daNpc_grS_HIOParam daNpc_grS_Param_c::m = {
120.0f, -3.0f, 1.0f, 600.0f, 255.0f, 120.0f, 35.0f, 60.0f,
0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -30.0f, 45.0f, -45.0f,
0.6f, 12.0f,
src/d/actor/d_a_npc_grz.cpp
+3 -3
View File
@@ -354,7 +354,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[6] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grZ";
char DUSK_CONST* DUSK_CONST daNpc_Grz_c::mEvtCutNameList[7] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Grz_c::mEvtCutNameList[7] = {
"",
"WAIT",
"REBIRTH",
@@ -364,7 +364,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Grz_c::mEvtCutNameList[7] = {
"STONE_SMASH_SKIP",
};
daNpc_Grz_c::cutFunc DUSK_CONST daNpc_Grz_c::mEvtCutList[7] = {
DUSK_GAME_DATA daNpc_Grz_c::cutFunc DUSK_CONST daNpc_Grz_c::mEvtCutList[7] = {
NULL,
&daNpc_Grz_c::doWaitCut,
&daNpc_Grz_c::doRebirthCut,
@@ -406,7 +406,7 @@ daNpc_Grz_c::~daNpc_Grz_c() {
#endif
}
daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = {
DUSK_GAME_DATA daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = {
130.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_guard.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static int createHeapCallBack(fopAc_ac_c* i_this) {
return static_cast<daNpcGuard_c*>(i_this)->createHeap();
}
daNpcGuard_c::actionFunc daNpcGuard_c::ActionTable[7][2] = {
DUSK_GAME_DATA daNpcGuard_c::actionFunc daNpcGuard_c::ActionTable[7][2] = {
{&daNpcGuard_c::initPath, &daNpcGuard_c::executePath},
{&daNpcGuard_c::initRun, &daNpcGuard_c::executeRun},
{&daNpcGuard_c::initFightWait, &daNpcGuard_c::executeFightWait},
src/d/actor/d_a_npc_gwolf.cpp
+3 -3
View File
@@ -191,7 +191,7 @@ static DUSK_CONSTEXPR s16 l_warpAppearFlag[7] = {
0x01DD, // dSv_event_flag_c::F_0477 - Secret techniques - Distant howling complete (for secret technique 7)
};
char DUSK_CONST* DUSK_CONST daNpc_GWolf_c::mEvtCutNameList[5] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_GWolf_c::mEvtCutNameList[5] = {
"",
"ATTACK_WARP",
"ATTACK_WARP_HORSE",
@@ -199,7 +199,7 @@ char DUSK_CONST* DUSK_CONST daNpc_GWolf_c::mEvtCutNameList[5] = {
"MEET_GWOLFA",
};
daNpc_GWolf_c::cutFunc DUSK_CONST daNpc_GWolf_c::mEvtCutList[5] = {
DUSK_GAME_DATA daNpc_GWolf_c::cutFunc DUSK_CONST daNpc_GWolf_c::mEvtCutList[5] = {
NULL,
&daNpc_GWolf_c::ECut_attackWarp,
&daNpc_GWolf_c::ECut_attackWarpHorse,
@@ -207,7 +207,7 @@ daNpc_GWolf_c::cutFunc DUSK_CONST daNpc_GWolf_c::mEvtCutList[5] = {
&daNpc_GWolf_c::ECut_meetGWolf,
};
daNpc_GWolf_HIOParam const daNpc_GWolf_Param_c::m = {
DUSK_GAME_DATA daNpc_GWolf_HIOParam const daNpc_GWolf_Param_c::m = {
30.0f,
-4.0f,
1.0f,
src/d/actor/d_a_npc_hanjo.cpp
+5 -5
View File
@@ -121,7 +121,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0},
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}};
char DUSK_CONST* DUSK_CONST daNpc_Hanjo_c::mCutNameList[6] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Hanjo_c::mCutNameList[6] = {
"",
"CONVERSATION_ABOUT_SARU",
"CONVERSATION",
@@ -130,7 +130,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Hanjo_c::mCutNameList[6] = {
"DIVE",
};
daNpc_Hanjo_c::cutFunc DUSK_CONST daNpc_Hanjo_c::mCutList[6] = {
DUSK_GAME_DATA daNpc_Hanjo_c::cutFunc DUSK_CONST daNpc_Hanjo_c::mCutList[6] = {
NULL,
&daNpc_Hanjo_c::cutConversationAboutSaru,
&daNpc_Hanjo_c::cutConversation,
@@ -139,11 +139,11 @@ daNpc_Hanjo_c::cutFunc DUSK_CONST daNpc_Hanjo_c::mCutList[6] = {
&daNpc_Hanjo_c::cutDive,
};
dCcD_SrcSph DUSK_CONST daNpc_Hanjo_c::mStoneCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph DUSK_CONST daNpc_Hanjo_c::mStoneCcDSph = {
daNpc_Hanjo_c::mStoneCcDObjInfo, {}
};
daNpc_Hanjo_HIOParam const daNpc_Hanjo_Param_c::m = {
DUSK_GAME_DATA daNpc_Hanjo_HIOParam const daNpc_Hanjo_Param_c::m = {
160.0f, -3.0f, 1.0f, 400.0f,
255.0f, 160.0f, 35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f,
-45.0f, 0.6f, 12.0f, 3, 6, 5, 6, 110.0f, 500.0f, 300.0f, -300.0f, 60, 8, 0, 0, 0, 0, 0,
@@ -152,7 +152,7 @@ daNpc_Hanjo_HIOParam const daNpc_Hanjo_Param_c::m = {
80.0f, 65.0f, 4.0f, 600.0f, 136.0f, 0x500, 90, 90, 2,
};
dCcD_SrcGObjInf const daNpc_Hanjo_c::mStoneCcDObjInfo = {
DUSK_GAME_DATA dCcD_SrcGObjInf const daNpc_Hanjo_c::mStoneCcDObjInfo = {
{0, {{0, 0, 0}, {0, 0}, {0x79}}},
{0, 0, 0, 0, {0}},
{0, 0, 0, 0, {0}},
src/d/actor/d_a_npc_hoz.cpp
+3 -3
View File
@@ -188,7 +188,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{29, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Hoz_c::mCutNameList[8] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Hoz_c::mCutNameList[8] = {
"",
"BOAT_RACE",
"BEFORE_BATTLE",
@@ -199,7 +199,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Hoz_c::mCutNameList[8] = {
"TALK_BREAK",
};
daNpc_Hoz_c::cutFunc DUSK_CONST daNpc_Hoz_c::mCutList[] = {
DUSK_GAME_DATA daNpc_Hoz_c::cutFunc DUSK_CONST daNpc_Hoz_c::mCutList[] = {
NULL,
&daNpc_Hoz_c::ECut_boatRace,
&daNpc_Hoz_c::ECut_beforeBattle,
@@ -210,7 +210,7 @@ daNpc_Hoz_c::cutFunc DUSK_CONST daNpc_Hoz_c::mCutList[] = {
&daNpc_Hoz_c::ECut_talkBreak,
};
const daNpc_Hoz_HIOParam daNpc_Hoz_Param_c::m = {
DUSK_GAME_DATA const daNpc_Hoz_HIOParam daNpc_Hoz_Param_c::m = {
60.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_impal.cpp
+2 -2
View File
@@ -14,7 +14,7 @@
#include "dusk/randomizer/game/verify_item_functions.h"
#endif
daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
DUSK_GAME_DATA daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
135.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -96,7 +96,7 @@ void daNpcImpal_HIO_c::genMessage(JORMContext* ctext) {
}
#endif
daNpcImpal_c::EventFn daNpcImpal_c::mEvtSeqList[4] = {
DUSK_GAME_DATA daNpcImpal_c::EventFn daNpcImpal_c::mEvtSeqList[4] = {
NULL,
&daNpcImpal_c::EvCut_ImpalAppear1,
&daNpcImpal_c::EvCut_ImpalAppear2,
src/d/actor/d_a_npc_ins.cpp
+2 -2
View File
@@ -295,7 +295,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "ins";
daNpcIns_c::eventFunc daNpcIns_c::mEvtSeqList[1] = {
DUSK_GAME_DATA daNpcIns_c::eventFunc daNpcIns_c::mEvtSeqList[1] = {
NULL,
};
@@ -330,7 +330,7 @@ static insect_param_data const l_insectParams[24] = {
{0x01A8, 0x714, 0, 0},
};
daNpcIns_HIOParam const daNpcIns_Param_c::m = {
DUSK_GAME_DATA daNpcIns_HIOParam const daNpcIns_Param_c::m = {
35.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_jagar.cpp
+3 -3
View File
@@ -138,7 +138,7 @@ enum Event {
/* 0x8 */ EVENT_FIND_WOLF_VER2,
};
daNpc_Jagar_HIOParam const daNpc_Jagar_Param_c::m = {
DUSK_GAME_DATA daNpc_Jagar_HIOParam const daNpc_Jagar_Param_c::m = {
170.0f, -3.0f, 1.0f, 400.0f, 255.0f, 160.0f,
35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f,
30.0f, -10.0f, 45.0f, -45.0f, 0.6f, 12.0f,
@@ -315,7 +315,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{13, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Jagar_c::mCutNameList[7] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Jagar_c::mCutNameList[7] = {
"",
"CLIMBUP",
"NEED_YOUR_HELP",
@@ -325,7 +325,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Jagar_c::mCutNameList[7] = {
"FIND_WOLF",
};
daNpc_Jagar_c::cutFunc DUSK_CONST daNpc_Jagar_c::mCutList[7] = {
DUSK_GAME_DATA daNpc_Jagar_c::cutFunc DUSK_CONST daNpc_Jagar_c::mCutList[7] = {
NULL,
&daNpc_Jagar_c::cutClimbUp,
&daNpc_Jagar_c::cutNeedYourHelp,
src/d/actor/d_a_npc_kakashi.cpp
+3 -3
View File
@@ -75,21 +75,21 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kakashi_c::mCutNameList[4] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kakashi_c::mCutNameList[4] = {
"",
"SWDTUTORIAL",
"GET_WOODSWD",
"MAROS_WHISPER",
};
int (daNpc_Kakashi_c::* DUSK_CONST daNpc_Kakashi_c::mCutList[])(int) = {
DUSK_GAME_DATA int (daNpc_Kakashi_c::* DUSK_CONST daNpc_Kakashi_c::mCutList[])(int) = {
NULL,
&daNpc_Kakashi_c::cutSwdTutorial,
&daNpc_Kakashi_c::cutGetWoodSwd,
&daNpc_Kakashi_c::cutMarosWhisper,
};
const daNpc_Kakashi_HIOParam daNpc_Kakashi_Param_c::m = {
DUSK_GAME_DATA const daNpc_Kakashi_HIOParam daNpc_Kakashi_Param_c::m = {
190.0f,
-6.0f,
1.0f,
src/d/actor/d_a_npc_kasi_hana.cpp
+5 -5
View File
@@ -557,7 +557,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[6] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_hana";
daNpcKasiHana_HIOParam const daNpcKasiHana_Param_c::m = {
DUSK_GAME_DATA daNpcKasiHana_HIOParam const daNpcKasiHana_Param_c::m = {
55.0f,
-3.0f,
1.0f,
@@ -611,7 +611,7 @@ void daNpcKasiHana_HIO_c::genMessage(JORMContext* ctext) {
}
#endif
daNpcKasiHana_c::EventFn daNpcKasiHana_c::mEvtSeqList[6] = {
DUSK_GAME_DATA daNpcKasiHana_c::EventFn daNpcKasiHana_c::mEvtSeqList[6] = {
NULL,
&daNpcKasiHana_c::_Evt_Kasi_Appear,
&daNpcKasiHana_c::_Evt_Kasi_Talk,
@@ -1469,11 +1469,11 @@ int daNpcKasiHana_c::fear(int param_1) {
return 1;
}
daTagEscape_c* daNpcKasiHana_c::mTargetTag;
DUSK_GAME_DATA daTagEscape_c* daNpcKasiHana_c::mTargetTag;
f32 daNpcKasiHana_c::mTargetTagDist;
DUSK_GAME_DATA f32 daNpcKasiHana_c::mTargetTagDist;
s16 daNpcKasiHana_c::mWolfAngle;
DUSK_GAME_DATA s16 daNpcKasiHana_c::mWolfAngle;
daTagEscape_c* daNpcKasiHana_c::srchWolfTag() {
mTargetTag = NULL;
src/d/actor/d_a_npc_kasi_kyu.cpp
+5 -5
View File
@@ -140,11 +140,11 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_kyu";
daNpcKasiKyu_c::EventFn DUSK_CONST daNpcKasiKyu_c::mEvtSeqList[1] = {
DUSK_GAME_DATA daNpcKasiKyu_c::EventFn DUSK_CONST daNpcKasiKyu_c::mEvtSeqList[1] = {
NULL
};
daNpcKasiKyu_HIOParam const daNpcKasiKyu_Param_c::m = {
DUSK_GAME_DATA daNpcKasiKyu_HIOParam const daNpcKasiKyu_Param_c::m = {
55.0f,
-3.0f,
1.0f,
@@ -366,11 +366,11 @@ void daNpcKasiKyu_c::setParam() {
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
}
daTagEscape_c* daNpcKasiKyu_c::mTargetTag;
DUSK_GAME_DATA daTagEscape_c* daNpcKasiKyu_c::mTargetTag;
f32 daNpcKasiKyu_c::mTargetTagDist;
DUSK_GAME_DATA f32 daNpcKasiKyu_c::mTargetTagDist;
s16 daNpcKasiKyu_c::mWolfAngle;
DUSK_GAME_DATA s16 daNpcKasiKyu_c::mWolfAngle;
BOOL daNpcKasiKyu_c::main() {
if (mSygnal >= 0) {
src/d/actor/d_a_npc_kasi_mich.cpp
+5 -5
View File
@@ -140,11 +140,11 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_mich";
daNpcKasiMich_c::EventFn DUSK_CONST daNpcKasiMich_c::mEvtSeqList[1] = {
DUSK_GAME_DATA daNpcKasiMich_c::EventFn DUSK_CONST daNpcKasiMich_c::mEvtSeqList[1] = {
NULL
};
daNpcKasiMich_HIOParam const daNpcKasiMich_Param_c::m = {
DUSK_GAME_DATA daNpcKasiMich_HIOParam const daNpcKasiMich_Param_c::m = {
55.0f,
-3.0f,
1.0f,
@@ -366,11 +366,11 @@ void daNpcKasiMich_c::setParam() {
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
}
daTagEscape_c* daNpcKasiMich_c::mTargetTag;
DUSK_GAME_DATA daTagEscape_c* daNpcKasiMich_c::mTargetTag;
f32 daNpcKasiMich_c::mTargetTagDist;
DUSK_GAME_DATA f32 daNpcKasiMich_c::mTargetTagDist;
s16 daNpcKasiMich_c::mWolfAngle;
DUSK_GAME_DATA s16 daNpcKasiMich_c::mWolfAngle;
BOOL daNpcKasiMich_c::main() {
if (mSygnal >= 0) {
src/d/actor/d_a_npc_kkri.cpp
+3 -3
View File
@@ -227,13 +227,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kkri_c::mCutNameList[3] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kkri_c::mCutNameList[3] = {
"",
"CONVERSATION_ABOUT_SOUP",
"YM_LOOK",
};
int (daNpc_Kkri_c::* DUSK_CONST daNpc_Kkri_c::mCutList[])(int) = {
DUSK_GAME_DATA int (daNpc_Kkri_c::* DUSK_CONST daNpc_Kkri_c::mCutList[])(int) = {
NULL,
&daNpc_Kkri_c::cutConversationAboutSoup,
&daNpc_Kkri_c::cutYmLook,
@@ -241,7 +241,7 @@ int (daNpc_Kkri_c::* DUSK_CONST daNpc_Kkri_c::mCutList[])(int) = {
static NPC_KKRI_HIO_CLASS l_HIO;
const daNpc_Kkri_HIOParam daNpc_Kkri_Param_c::m = {
DUSK_GAME_DATA const daNpc_Kkri_HIOParam daNpc_Kkri_Param_c::m = {
180.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_kn.cpp
+9 -9
View File
@@ -17,25 +17,25 @@
#include <cstring>
#endif
dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
DUSK_GAME_DATA dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f},
}
};
dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
DUSK_GAME_DATA dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSphCc
},
};
s16 daNpc_Kn_c::mSrchName;
DUSK_GAME_DATA s16 daNpc_Kn_c::mSrchName;
fopAc_ac_c* daNpc_Kn_c::mFindActorPtrs[50];
DUSK_GAME_DATA fopAc_ac_c* daNpc_Kn_c::mFindActorPtrs[50];
int daNpc_Kn_c::mFindCount;
DUSK_GAME_DATA int daNpc_Kn_c::mFindCount;
void* dummy_srchActor(void* i_actor1, void* i_actor2) {
// Fake function (though a similar one likely existed and got stripped out).
@@ -59,7 +59,7 @@ void* dummy_srchActor(void* i_actor1, void* i_actor2) {
return NULL;
}
const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
DUSK_GAME_DATA const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
{0, {{0, 0, 0}, {0, 0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
{dCcD_SE_NONE, 0, 0, 0, 0},
@@ -68,7 +68,7 @@ const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
#include "d/actor/d_a_npc_kn_base.inc"
const daNpc_Kn_HIOParam daNpc_Kn_Param_c::m = {
DUSK_GAME_DATA const daNpc_Kn_HIOParam daNpc_Kn_Param_c::m = {
50.0f,
-5.0f,
1.0f,
@@ -468,7 +468,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kn_c::mCutNameList[21] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kn_c::mCutNameList[21] = {
"",
"NONE_EQUIP_CHANGE_TALK",
"NO_EQ_CHNGE_TLK_STD",
@@ -492,7 +492,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Kn_c::mCutNameList[21] = {
"SEVENTH_SKILL_GET",
};
daNpc_Kn_c::cutFunc DUSK_CONST daNpc_Kn_c::mCutList[21] = {
DUSK_GAME_DATA daNpc_Kn_c::cutFunc DUSK_CONST daNpc_Kn_c::mCutList[21] = {
NULL,
&daNpc_Kn_c::ECut_noneEquipChangeTalk,
&daNpc_Kn_c::ECut_noneEquipChangeTalkStand,
src/d/actor/d_a_npc_knj.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_npc_knj.h"
#include <cstring>
const daNpc_Knj_HIOParam daNpc_Knj_Param_c::m = {
DUSK_GAME_DATA const daNpc_Knj_HIOParam daNpc_Knj_Param_c::m = {
0.0f, // attention_offset
0.0f, // gravity
1.0f, // scale
@@ -125,9 +125,9 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Knj_c::mCutNameList[1] = {""};
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Knj_c::mCutNameList[1] = {""};
daNpc_Knj_c::cutFunc DUSK_CONST daNpc_Knj_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_Knj_c::cutFunc DUSK_CONST daNpc_Knj_c::mCutList[1] = {
NULL,
};
src/d/actor/d_a_npc_kolin.cpp
+3 -3
View File
@@ -308,7 +308,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{20, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kolin_c::mCutNameList[11] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kolin_c::mCutNameList[11] = {
"",
"NO_RIDE",
"HAIL",
@@ -322,7 +322,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Kolin_c::mCutNameList[11] = {
"THANK_YOU",
};
daNpc_Kolin_c::cutFunc DUSK_CONST daNpc_Kolin_c::mCutList[11] = {
DUSK_GAME_DATA daNpc_Kolin_c::cutFunc DUSK_CONST daNpc_Kolin_c::mCutList[11] = {
NULL,
&daNpc_Kolin_c::cutNoRide,
&daNpc_Kolin_c::cutHail,
@@ -336,7 +336,7 @@ daNpc_Kolin_c::cutFunc DUSK_CONST daNpc_Kolin_c::mCutList[11] = {
&daNpc_Kolin_c::cutThankYou
};
daNpc_Kolin_HIOParam const daNpc_Kolin_Param_c::m = {
DUSK_GAME_DATA daNpc_Kolin_HIOParam const daNpc_Kolin_Param_c::m = {
140.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_kolinb.cpp
+3 -3
View File
@@ -177,7 +177,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kolinb_c::mCutNameList[7] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kolinb_c::mCutNameList[7] = {
"",
"CONVERSATION_IN_HOTEL",
"CONVERSATION_ABOUT_DEATHMT",
@@ -187,7 +187,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Kolinb_c::mCutNameList[7] = {
"THANK_YOU",
};
daNpc_Kolinb_c::cutFunc DUSK_CONST daNpc_Kolinb_c::mCutList[7] = {
DUSK_GAME_DATA daNpc_Kolinb_c::cutFunc DUSK_CONST daNpc_Kolinb_c::mCutList[7] = {
NULL,
&daNpc_Kolinb_c::cutConversationInHotel,
&daNpc_Kolinb_c::cutConversationAboutDeathMt,
@@ -199,7 +199,7 @@ daNpc_Kolinb_c::cutFunc DUSK_CONST daNpc_Kolinb_c::mCutList[7] = {
static NPC_KOLINB_HIO_CLASS l_HIO;
daNpc_Kolinb_HIOParam const daNpc_Kolinb_Param_c::m = {
DUSK_GAME_DATA daNpc_Kolinb_HIOParam const daNpc_Kolinb_Param_c::m = {
100.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_kyury.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_npc_kyury.h"
#include <cstring>
const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = {
DUSK_GAME_DATA const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = {
200.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -127,12 +127,12 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Kyury_c::mCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Kyury_c::mCutNameList[2] = {
"",
"CONVERSATION",
};
daNpc_Kyury_c::cutFunc DUSK_CONST daNpc_Kyury_c::mCutList[2] = {
DUSK_GAME_DATA daNpc_Kyury_c::cutFunc DUSK_CONST daNpc_Kyury_c::mCutList[2] = {
NULL,
&daNpc_Kyury_c::cutConversation,
};
src/d/actor/d_a_npc_len.cpp
+3 -3
View File
@@ -49,7 +49,7 @@ enum Motion {
/* 0x11 */ MOT_UNK_17 = 17,
};
const daNpc_Len_HIOParam daNpc_Len_Param_c::m = {
DUSK_GAME_DATA const daNpc_Len_HIOParam daNpc_Len_Param_c::m = {
230.0f, -3.0f, 1.0f, 450.0f, 255.0f, 210.0f, 35.0f, 40.0f, 0.0f, 0.0f, 15.0f,
-15.0f, 30.0f, -10.0f, 30.0f, -30.0f, 0.6f, 12.0f, 3, 6, 5, 6,
110.0f, 0.0f, 0.0f, 0.0f, 60, 8, 0, 0, 0, 0, 0,
@@ -149,14 +149,14 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {17, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Len_c::mCutNameList[4] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Len_c::mCutNameList[4] = {
"",
"HURRY",
"CONVERSATION_IN_HOTEL",
"TAKE_WOODSTATUE",
};
daNpc_Len_c::cutFunc DUSK_CONST daNpc_Len_c::mCutList[4] = {
DUSK_GAME_DATA daNpc_Len_c::cutFunc DUSK_CONST daNpc_Len_c::mCutList[4] = {
NULL,
&daNpc_Len_c::cutHurry,
&daNpc_Len_c::cutConversationInHotel,
src/d/actor/d_a_npc_lud.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_npc_lud.h"
#include <cstring>
const daNpc_Lud_HIOParam daNpc_Lud_Param_c::m = {
DUSK_GAME_DATA const daNpc_Lud_HIOParam daNpc_Lud_Param_c::m = {
160.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -212,7 +212,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Lud_c::mCutNameList[8] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Lud_c::mCutNameList[8] = {
"",
"HURRY",
"CONVERSATION_IN_HOTEL",
@@ -223,7 +223,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Lud_c::mCutNameList[8] = {
"THANK_YOU",
};
daNpc_Lud_c::cutFunc DUSK_CONST daNpc_Lud_c::mCutList[8] = {
DUSK_GAME_DATA daNpc_Lud_c::cutFunc DUSK_CONST daNpc_Lud_c::mCutList[8] = {
NULL,
&daNpc_Lud_c::cutHurry,
&daNpc_Lud_c::cutConversationInHotel,
src/d/actor/d_a_npc_maro.cpp
+3 -3
View File
@@ -26,7 +26,7 @@
#include <cstring>
#endif
const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = {
DUSK_GAME_DATA const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = {
100.0f,
-3.0f,
1.0f,
@@ -210,7 +210,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Maro_c::mCutNameList[17] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Maro_c::mCutNameList[17] = {
"",
"CONVERSATION_ABOUT_PACHINKO",
"CONVERSATION_ABOUT_WOODSWD",
@@ -230,7 +230,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Maro_c::mCutNameList[17] = {
"TALK_TO_KAKASHI",
};
daNpc_Maro_c::cutFunc DUSK_CONST daNpc_Maro_c::mCutList[17] = {
DUSK_GAME_DATA daNpc_Maro_c::cutFunc DUSK_CONST daNpc_Maro_c::mCutList[17] = {
NULL,
&daNpc_Maro_c::cutConversationAboutPachinko,
&daNpc_Maro_c::cutConversationAboutWoodSwd,
src/d/actor/d_a_npc_midp.cpp
+3 -3
View File
@@ -62,11 +62,11 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
};
char DUSK_CONST* DUSK_CONST daNpc_midP_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_midP_c::mCutNameList = "";
daNpc_midP_c::cutFunc DUSK_CONST daNpc_midP_c::mCutList[1] = { 0 };
DUSK_GAME_DATA daNpc_midP_c::cutFunc DUSK_CONST daNpc_midP_c::mCutList[1] = { 0 };
daNpc_midP_HIOParam const daNpc_midP_Param_c::m = {
DUSK_GAME_DATA daNpc_midP_HIOParam const daNpc_midP_Param_c::m = {
210.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_moi.cpp
+3 -3
View File
@@ -13,7 +13,7 @@
#include "d/actor/d_a_npc_uri.h"
#include <cstring>
const daNpc_Moi_HIOParam daNpc_Moi_Param_c::m = {
DUSK_GAME_DATA const daNpc_Moi_HIOParam daNpc_Moi_Param_c::m = {
200.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -207,11 +207,11 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {18, 4, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Moi_c::mCutNameList[5] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Moi_c::mCutNameList[5] = {
"", "DELIVERED_SW", "APPEARANCE_MOI", "CONVERSATION_WITH_URI", "FIND_WOLF",
};
daNpc_Moi_c::cutFunc DUSK_CONST daNpc_Moi_c::mCutList[5] = {
DUSK_GAME_DATA daNpc_Moi_c::cutFunc DUSK_CONST daNpc_Moi_c::mCutList[5] = {
NULL,
&daNpc_Moi_c::cutDeliveredSw,
&daNpc_Moi_c::cutAppearanceMoi,
src/d/actor/d_a_npc_moir.cpp
+2 -2
View File
@@ -207,7 +207,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "MoiR";
daNpcMoiR_HIOParam const daNpcMoiR_Param_c::m = {
DUSK_GAME_DATA daNpcMoiR_HIOParam const daNpcMoiR_Param_c::m = {
35.0f,
-3.0f,
1.0f,
@@ -261,7 +261,7 @@ void daNpcMoiR_HIO_c::genMessage(JORMContext* ctext) {
static NPC_MOIR_HIO_CLASS l_HIO;
daNpcMoiR_c::EventFn daNpcMoiR_c::mEvtSeqList[4] = {
DUSK_GAME_DATA daNpcMoiR_c::EventFn daNpcMoiR_c::mEvtSeqList[4] = {
NULL,
&daNpcMoiR_c::EvCut_Introduction,
&daNpcMoiR_c::EvCut_Appear,
src/d/actor/d_a_npc_myna2.cpp
+3 -3
View File
@@ -96,7 +96,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[3] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "myna2";
char DUSK_CONST* DUSK_CONST daNpc_myna2_c::mEvtCutNameList[5] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_myna2_c::mEvtCutNameList[5] = {
"",
"FIRST_TALK",
"GAME_FAILURE",
@@ -104,7 +104,7 @@ char DUSK_CONST* DUSK_CONST daNpc_myna2_c::mEvtCutNameList[5] = {
"GAME_GOAL_SUCCESS",
};
daNpc_myna2_c::EventFn DUSK_CONST daNpc_myna2_c::mEvtCutList[] = {
DUSK_GAME_DATA daNpc_myna2_c::EventFn DUSK_CONST daNpc_myna2_c::mEvtCutList[] = {
NULL,
&daNpc_myna2_c::ECut_firstTalk,
&daNpc_myna2_c::ECut_gameFailure,
@@ -112,7 +112,7 @@ daNpc_myna2_c::EventFn DUSK_CONST daNpc_myna2_c::mEvtCutList[] = {
&daNpc_myna2_c::ECut_gameGoalSuccess,
};
const daNpc_myna2_HIOParam daNpc_myna2_Param_c::m = {
DUSK_GAME_DATA const daNpc_myna2_HIOParam daNpc_myna2_Param_c::m = {
60.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_pachi_besu.cpp
+3 -3
View File
@@ -441,7 +441,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Pachi_Besu_c::mCutNameList[11] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Pachi_Besu_c::mCutNameList[11] = {
"",
"TUTRIAL_BEGIN",
"TUTRIAL_BEGIN_SKIP",
@@ -455,7 +455,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Pachi_Besu_c::mCutNameList[11] = {
"TUTRIAL_CAUTION",
};
daNpc_Pachi_Besu_c::cutFunc DUSK_CONST daNpc_Pachi_Besu_c::mCutList[11] = {
DUSK_GAME_DATA daNpc_Pachi_Besu_c::cutFunc DUSK_CONST daNpc_Pachi_Besu_c::mCutList[11] = {
NULL,
&daNpc_Pachi_Besu_c::cutTutrialBegin,
&daNpc_Pachi_Besu_c::cutTutrialBegin_Skip,
@@ -469,7 +469,7 @@ daNpc_Pachi_Besu_c::cutFunc DUSK_CONST daNpc_Pachi_Besu_c::mCutList[11] = {
&daNpc_Pachi_Besu_c::cutTutrialCaution,
};
daNpc_Pachi_Besu_HIOParam const daNpc_Pachi_Besu_Param_c::m = {
DUSK_GAME_DATA daNpc_Pachi_Besu_HIOParam const daNpc_Pachi_Besu_Param_c::m = {
160.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_pachi_maro.cpp
+3 -3
View File
@@ -460,7 +460,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{MOT_ANM_RUN, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Pachi_Maro_c::mCutNameList[11] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Pachi_Maro_c::mCutNameList[11] = {
"",
"TUTRIAL_BEGIN",
"TUTRIAL_BEGIN_SKIP",
@@ -474,7 +474,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Pachi_Maro_c::mCutNameList[11] = {
"TUTRIAL_CAUTION",
};
daNpc_Pachi_Maro_c::cutFunc DUSK_CONST daNpc_Pachi_Maro_c::mCutList[11] = {
DUSK_GAME_DATA daNpc_Pachi_Maro_c::cutFunc DUSK_CONST daNpc_Pachi_Maro_c::mCutList[11] = {
NULL,
&daNpc_Pachi_Maro_c::cutTutrialBegin,
&daNpc_Pachi_Maro_c::cutTutrialBegin_Skip,
@@ -506,7 +506,7 @@ daNpc_Pachi_Maro_c::~daNpc_Pachi_Maro_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
daNpc_Pachi_Maro_HIOParam const daNpc_Pachi_Maro_Param_c::m = {
DUSK_GAME_DATA daNpc_Pachi_Maro_HIOParam const daNpc_Pachi_Maro_Param_c::m = {
100.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_pachi_taro.cpp
+3 -3
View File
@@ -688,7 +688,7 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{MOT_ANM_SAVED, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Pachi_Taro_c::mCutNameList[11] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Pachi_Taro_c::mCutNameList[11] = {
"",
"TUTRIAL_BEGIN",
"TUTRIAL_BEGIN_SKIP",
@@ -702,7 +702,7 @@ char DUSK_CONST* DUSK_CONST daNpc_Pachi_Taro_c::mCutNameList[11] = {
"TUTRIAL_CAUTION",
};
daNpc_Pachi_Taro_c::cutFunc DUSK_CONST daNpc_Pachi_Taro_c::mCutList[11] = {
DUSK_GAME_DATA daNpc_Pachi_Taro_c::cutFunc DUSK_CONST daNpc_Pachi_Taro_c::mCutList[11] = {
NULL,
&daNpc_Pachi_Taro_c::cutTutrialBegin,
&daNpc_Pachi_Taro_c::cutTutrialBegin_Skip,
@@ -734,7 +734,7 @@ daNpc_Pachi_Taro_c::~daNpc_Pachi_Taro_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
daNpc_Pachi_Taro_HIOParam const daNpc_Pachi_Taro_Param_c::m = {
DUSK_GAME_DATA daNpc_Pachi_Taro_HIOParam const daNpc_Pachi_Taro_Param_c::m = {
140.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_passer.cpp
+30 -30
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_npc_passer.h"
#include "d/d_s_play.h"
daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
DUSK_GAME_DATA daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
{&daNpcPasser_c::initPath, &daNpcPasser_c::executePath},
{&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape},
{&daNpcPasser_c::initFear, &daNpcPasser_c::executeFear},
@@ -481,7 +481,7 @@ void daNpcPasser_c::create_init() {
setBaseMtx();
}
daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
daNpcPasser_c::m_seq00_funcTbl, daNpcPasser_c::m_seq01_funcTbl,
daNpcPasser_c::m_seq02_funcTbl, daNpcPasser_c::m_seq03_funcTbl,
daNpcPasser_c::m_seq04_funcTbl, daNpcPasser_c::m_seq05_funcTbl,
@@ -498,51 +498,51 @@ daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
daNpcPasser_c::m_seq26_funcTbl, daNpcPasser_c::m_seq27_funcTbl,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq00_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq00_funcTbl[2] = {
&daNpcPasser_c::walka,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq01_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq01_funcTbl[2] = {
&daNpcPasser_c::runa,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq02_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq02_funcTbl[2] = {
&daNpcPasser_c::waita,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq03_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq03_funcTbl[2] = {
&daNpcPasser_c::talka,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq04_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq04_funcTbl[2] = {
&daNpcPasser_c::runb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq05_funcTbl[4] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq05_funcTbl[4] = {
&daNpcPasser_c::turnr,
&daNpcPasser_c::waita,
&daNpcPasser_c::talka,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq06_funcTbl[4] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq06_funcTbl[4] = {
&daNpcPasser_c::turnl,
&daNpcPasser_c::waita,
&daNpcPasser_c::talka,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq07_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq07_funcTbl[2] = {
&daNpcPasser_c::waitwall,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq08_funcTbl[7] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq08_funcTbl[7] = {
&daNpcPasser_c::talkwall,
&daNpcPasser_c::waitwall,
&daNpcPasser_c::talkbwall,
@@ -552,17 +552,17 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq08_funcTbl[7] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq09_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq09_funcTbl[2] = {
&daNpcPasser_c::talkb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq10_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq10_funcTbl[2] = {
&daNpcPasser_c::talkc,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq11_funcTbl[6] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq11_funcTbl[6] = {
&daNpcPasser_c::talka,
&daNpcPasser_c::waita,
&daNpcPasser_c::talkb,
@@ -571,12 +571,12 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq11_funcTbl[6] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq12_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq12_funcTbl[2] = {
&daNpcPasser_c::waitb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq13_funcTbl[6] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq13_funcTbl[6] = {
&daNpcPasser_c::browsea,
&daNpcPasser_c::browseb,
&daNpcPasser_c::talka,
@@ -585,17 +585,17 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq13_funcTbl[6] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq14_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq14_funcTbl[2] = {
&daNpcPasser_c::walkb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq15_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq15_funcTbl[2] = {
&daNpcPasser_c::sitwaita,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq16_funcTbl[7] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq16_funcTbl[7] = {
&daNpcPasser_c::sittalka,
&daNpcPasser_c::sitwaita,
&daNpcPasser_c::sittalkab,
@@ -605,17 +605,17 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq16_funcTbl[7] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq17_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq17_funcTbl[2] = {
&daNpcPasser_c::playm,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq18_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq18_funcTbl[2] = {
&daNpcPasser_c::sitwaitb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq19_funcTbl[7] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq19_funcTbl[7] = {
&daNpcPasser_c::sittalkb,
&daNpcPasser_c::sitwaitb,
&daNpcPasser_c::sittalkbb,
@@ -625,24 +625,24 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq19_funcTbl[7] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq20_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq20_funcTbl[2] = {
&daNpcPasser_c::looka,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq21_funcTbl[2] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq21_funcTbl[2] = {
&daNpcPasser_c::lookb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq22_funcTbl[4] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq22_funcTbl[4] = {
&daNpcPasser_c::looka,
&daNpcPasser_c::lookb,
&daNpcPasser_c::waita,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq23_funcTbl[7] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq23_funcTbl[7] = {
&daNpcPasser_c::talka,
&daNpcPasser_c::waita,
&daNpcPasser_c::talkb,
@@ -652,7 +652,7 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq23_funcTbl[7] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq24_funcTbl[5] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq24_funcTbl[5] = {
&daNpcPasser_c::talkb,
&daNpcPasser_c::talka,
&daNpcPasser_c::talkc,
@@ -660,7 +660,7 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq24_funcTbl[5] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq25_funcTbl[7] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq25_funcTbl[7] = {
&daNpcPasser_c::browsea,
&daNpcPasser_c::browseb,
&daNpcPasser_c::talka,
@@ -670,13 +670,13 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq25_funcTbl[7] = {
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq26_funcTbl[3] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq26_funcTbl[3] = {
&daNpcPasser_c::browsea,
&daNpcPasser_c::browseb,
NULL,
};
daNpcPasser_c::seqFunc daNpcPasser_c::m_seq27_funcTbl[1] = {
DUSK_GAME_DATA daNpcPasser_c::seqFunc daNpcPasser_c::m_seq27_funcTbl[1] = {
&daNpcPasser_c::waitTime,
};
src/d/actor/d_a_npc_passer2.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ static int createHeapCallBack(fopAc_ac_c* i_this) {
return actor->createHeap();
}
daNpcPasser2_c::actionFunc daNpcPasser2_c::ActionTable[1][2] = {
DUSK_GAME_DATA daNpcPasser2_c::actionFunc daNpcPasser2_c::ActionTable[1][2] = {
{&daNpcPasser2_c::initPath, &daNpcPasser2_c::executePath},
};
src/d/actor/d_a_npc_post.cpp
+3 -3
View File
@@ -159,7 +159,7 @@ enum Type {
/* 0x3 */ TYPE_DEFAULT,
};
daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
DUSK_GAME_DATA daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
190.0f,
-3.0f,
1.0f,
@@ -354,12 +354,12 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{2, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Post_c::mCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Post_c::mCutNameList[2] = {
"",
"DELIVER",
};
daNpc_Post_c::cutFunc DUSK_CONST daNpc_Post_c::mCutList[2] = {
DUSK_GAME_DATA daNpc_Post_c::cutFunc DUSK_CONST daNpc_Post_c::mCutList[2] = {
NULL,
&daNpc_Post_c::cutDeliver,
};
src/d/actor/d_a_npc_pouya.cpp
+3 -3
View File
@@ -14,7 +14,7 @@
#include "dusk/randomizer/game/verify_item_functions.h"
#endif
const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = {
DUSK_GAME_DATA const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = {
120.0f, // attention_offset
-3.0f, // gravity
1.0f, // scale
@@ -153,13 +153,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{-1, 0, 0}, {-1, 0, 0}, {25, -1, 1}, {10, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Pouya_c::mCutNameList[3] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Pouya_c::mCutNameList[3] = {
"",
"HAVE_FAVORTO_ASK",
"RETURN_FAVOR",
};
daNpc_Pouya_c::cutFunc DUSK_CONST daNpc_Pouya_c::mCutList[3] = {
DUSK_GAME_DATA daNpc_Pouya_c::cutFunc DUSK_CONST daNpc_Pouya_c::mCutList[3] = {
NULL,
&daNpc_Pouya_c::cutHaveFavorToAsk,
&daNpc_Pouya_c::cutHaveFavorToAsk,
src/d/actor/d_a_npc_prayer.cpp
+2 -2
View File
@@ -46,12 +46,12 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = {
static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Prayer";
daNpcPray_c::EvtSeq DUSK_CONST daNpcPray_c::mEvtSeqList[] = {
DUSK_GAME_DATA daNpcPray_c::EvtSeq DUSK_CONST daNpcPray_c::mEvtSeqList[] = {
NULL,
&daNpcPray_c::_Evt_GetHeart,
};
const daNpcPray_HIOParam daNpcPray_Param_c::m = {
DUSK_GAME_DATA const daNpcPray_HIOParam daNpcPray_Param_c::m = {
55.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_raca.cpp
+3 -3
View File
@@ -150,13 +150,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Raca_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Raca_c::mCutNameList = "";
daNpc_Raca_c::cutFunc DUSK_CONST daNpc_Raca_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_Raca_c::cutFunc DUSK_CONST daNpc_Raca_c::mCutList[1] = {
NULL,
};
daNpc_Raca_HIOParam const daNpc_Raca_Param_c::m = {
DUSK_GAME_DATA daNpc_Raca_HIOParam const daNpc_Raca_Param_c::m = {
230.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_rafrel.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[7] = {
"RESIST_WIRETAP_RAFREL",
};
const daNpcRafrel_HIOParam daNpcRafrel_Param_c::m = {
DUSK_GAME_DATA const daNpcRafrel_HIOParam daNpcRafrel_Param_c::m = {
35.0f,
-3.0f,
1.0f,
@@ -158,7 +158,7 @@ void daNpcRafrel_HIO_c::genMessage(JORMContext* ctx) {
static NPC_RAFREL_HIO_CLASS l_HIO;
typedef BOOL (daNpcRafrel_c::*EventFn)(int);
EventFn daNpcRafrel_c::mEvtSeqList[] = {
DUSK_GAME_DATA EventFn daNpcRafrel_c::mEvtSeqList[] = {
NULL,
&daNpcRafrel_c::EvCut_Introduction,
&daNpcRafrel_c::EvCut_Meeting,
src/d/actor/d_a_npc_saru.cpp
+3 -3
View File
@@ -216,21 +216,21 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Saru_c::mCutNameList[4] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Saru_c::mCutNameList[4] = {
"",
"FIND_MONKEY",
"HELP_ME",
"YM_LOOK",
};
daNpc_Saru_c::cutFunc DUSK_CONST daNpc_Saru_c::mCutList[4] = {
DUSK_GAME_DATA daNpc_Saru_c::cutFunc DUSK_CONST daNpc_Saru_c::mCutList[4] = {
NULL,
&daNpc_Saru_c::cutFindMonkey,
&daNpc_Saru_c::cutHelpMe,
&daNpc_Saru_c::cutYmLook,
};
daNpc_Saru_HIOParam const daNpc_Saru_Param_c::m = {
DUSK_GAME_DATA daNpc_Saru_HIOParam const daNpc_Saru_Param_c::m = {
140.0f,
-3.0f,
1.0f,
src/d/actor/d_a_npc_seib.cpp
+3 -3
View File
@@ -46,13 +46,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_seiB_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_seiB_c::mCutNameList = "";
daNpc_seiB_c::cutFunc DUSK_CONST daNpc_seiB_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_seiB_c::cutFunc DUSK_CONST daNpc_seiB_c::mCutList[1] = {
0,
};
daNpc_seiB_HIOParam const daNpc_seiB_Param_c::m = {
DUSK_GAME_DATA daNpc_seiB_HIOParam const daNpc_seiB_Param_c::m = {
0.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_seic.cpp
+3 -3
View File
@@ -49,13 +49,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_seiC_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_seiC_c::mCutNameList = "";
daNpc_seiC_c::cutFunc DUSK_CONST daNpc_seiC_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_seiC_c::cutFunc DUSK_CONST daNpc_seiC_c::mCutList[1] = {
0
};
daNpc_seiC_HIOParam const daNpc_seiC_Param_c::m = {
DUSK_GAME_DATA daNpc_seiC_HIOParam const daNpc_seiC_Param_c::m = {
0.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_seid.cpp
+3 -3
View File
@@ -49,13 +49,13 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_seiD_c::mCutNameList = "";
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_seiD_c::mCutNameList = "";
daNpc_seiD_c::cutFunc DUSK_CONST daNpc_seiD_c::mCutList[1] = {
DUSK_GAME_DATA daNpc_seiD_c::cutFunc DUSK_CONST daNpc_seiD_c::mCutList[1] = {
0
};
daNpc_seiD_HIOParam const daNpc_seiD_Param_c::m = {
DUSK_GAME_DATA daNpc_seiD_HIOParam const daNpc_seiD_Param_c::m = {
0.0f,
0.0f,
1.0f,
src/d/actor/d_a_npc_seira.cpp
+3 -3
View File
@@ -111,19 +111,19 @@ static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenc
{25, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
};
char DUSK_CONST* DUSK_CONST daNpc_Seira_c::mCutNameList[2] = {
DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST daNpc_Seira_c::mCutNameList[2] = {
"",
"CONVERSATION_ABOUT_SARU",
};
daNpc_Seira_c::cutFunc DUSK_CONST daNpc_Seira_c::mCutList[2] = {
DUSK_GAME_DATA daNpc_Seira_c::cutFunc DUSK_CONST daNpc_Seira_c::mCutList[2] = {
NULL,
&daNpc_Seira_c::cutConversationAboutSaru,
};
static NPC_SEIRA_HIO_CLASS l_HIO;
const daNpc_Seira_HIOParam daNpc_Seira_Param_c::m = {
DUSK_GAME_DATA const daNpc_Seira_HIOParam daNpc_Seira_Param_c::m = {
210.0f,
-3.0f,
1.0f,

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