mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-29 16:14:54 -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-05-28 20:21:14 -07:00
parent 351afd6686 e5c032f6e6
commit 46a67c658c
981 changed files with 5306 additions and 4931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug-report.yml
+116
View File
@@ -0,0 +1,116 @@
name: Bug Report
description: Report an issue with Dusklight
type: Bug
body:
- type: checkboxes
id: official-build-certification
attributes:
label: Mods and Forks
description: Certify that this issue exists on the official builds of Dusklight
options:
- label: The bug occurs on an **official release** of Dusklight, without any forks or third-party patches installed
required: true
validations:
required: true
- type: input
id: dusklight-version
attributes:
label: Dusklight Version
placeholder: ex. 1.3.1
validations:
required: true
- type: textarea
id: bug-description
attributes:
label: Bug Description
placeholder: Describe the bug you are encountering
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: Steps to Reproduce
placeholder: |
1. Load save
2. Go to Hyrule Field
3. See bug
- type: textarea
id: expected-behavior
attributes:
label: Expected Behavior
placeholder: Describe what should be happening
- type: textarea
id: current-behavior
attributes:
label: Current Behavior
placeholder: Describe what is happening instead
- type: dropdown
id: system-os-architecture
attributes:
label: OS / Architecture
description: The operating system and architecture you are running Dusklight on
options:
- Windows x86-64
- Windows ARM64
- MacOS ARM64
- MacOS x86-64
- Linux ARM64
- Linux x84-64
- Android ARM64
- iOS ARM64
validations:
required: true
- type: dropdown
id: game-region
attributes:
label: Game Region
description: The game region you are playing on
options:
- NTSC-U (North America)
- PAL (Europe)
validations:
required: true
- type: input
id: game-language
attributes:
label: Game Language
description: The language you are playing the game in
placeholder: ex. English, Spanish, etc.
- type: dropdown
attributes:
label: Graphics Backend
options:
- Vulkan
- D3D12
- Metal
- D3D11
- OpenGL ES
- Unsure / Default
default: 5
- type: textarea
id: texture-packs-mods
attributes:
label: Texture Packs and Mods
placeholder: List any texture packs or mods you had installed
- type: upload
id: logs-upload
attributes:
label: Logs and Other Files
description: Include any relevant logs, config files, or saves to reproduce the bug
- type: textarea
id: additional-context
attributes:
label: Additional Context
placeholder: Any other information that might be helpful
.github/ISSUE_TEMPLATE/feature-request.yml
+24
View File
@@ -0,0 +1,24 @@
name: Feature Request
description: Request a new Dusklight feature. Not all requests can/will be included, but we will take these ideas into consideration.
type: Feature
body:
- type: textarea
id: feature-description
attributes:
label: Feature Description
placeholder: Describe the feature you are requesting
validations:
required: true
- type: input
id: feature-platform
attributes:
label: Platform
description: If applicable, list the platforms this feature applies to. If it is for all platforms, feel free to leave this field blank.
placeholder: ex. Mac, Android, Steam Deck, etc.
- type: textarea
id: feature-related-info
attributes:
label: Additional Information
placeholder: Any other information that might be helpful (related features, existing implementations, open pull requests or issues, etc.)
.github/workflows/build.yml
+5
View File
@@ -5,7 +5,12 @@ on:
paths-ignore:
- '*.md'
- '*LICENSE'
- 'docs/**'
pull_request:
paths-ignore:
- '*.md'
- '*LICENSE'
- 'docs/**'
concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }}
CMakeLists.txt
+2 -4
View File
@@ -219,10 +219,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
# -Wno-multichar: Multi-character constants ('ABCD') are implementation-defined but all compilers
# (CW, GCC, Clang, MSVC) encode them identically in big-endian order.
# For >4-char literals (which GCC/Clang truncate to int), use the MULTI_CHAR() macro.
# -Wwrite-strings: Game code relies on implicit const char* -> char* conversions
# -Wdeprecated-declarations: JSystem uses std::iterator, deprecated in C++17
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar -Wno-write-strings")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-write-strings -Wno-trigraphs -Wno-deprecated-declarations")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations")
set(CMAKE_INSTALL_RPATH "$ORIGIN")
set(CMAKE_BUILD_RPATH "$ORIGIN")
elseif (APPLE)
@@ -232,7 +231,6 @@ elseif (APPLE)
elseif (MSVC)
add_compile_options(
$<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>
$<$<COMPILE_LANGUAGE:C,CXX>:/Zc:strictStrings->
$<$<COMPILE_LANGUAGE:C,CXX>:/MP>
$<$<COMPILE_LANGUAGE:C,CXX>:/FS>
)
include/SSystem/SComponent/c_lib.h
+1 -1
View File
@@ -98,7 +98,7 @@ T cLib_calcTimer(T* value) {
void MtxInit(void);
void MtxTrans(f32, f32, f32, u8);
void MtxScale(f32, f32, f32, u8);
void MtxPosition(cXyz*, cXyz*);
void MtxPosition(cXyz DUSK_CONST*, cXyz*);
void MtxPush(void);
void MtxPull(void);
include/SSystem/SComponent/c_xyz.h
+3 -3
View File
@@ -45,17 +45,17 @@ struct cXyz : Vec {
~cXyz() = default;
cXyz(const cXyz& vec) = default;
#endif
cXyz(f32 x, f32 y, f32 z) {
DUSK_CONSTEXPR cXyz(f32 x, f32 y, f32 z) {
this->x = x;
this->y = y;
this->z = z;
}
cXyz(const Vec& vec) {
DUSK_CONSTEXPR cXyz(const Vec& vec) {
this->x = vec.x;
this->y = vec.y;
this->z = vec.z;
}
cXyz& operator=(const Vec& vec) {
DUSK_CONSTEXPR cXyz& operator=(const Vec& vec) {
this->x = vec.x;
this->y = vec.y;
this->z = vec.z;
include/Z2AudioLib/Z2StatusMgr.h
+1 -1
View File
@@ -14,7 +14,7 @@ struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
void menuIn();
void menuOut();
bool isMovieDemo();
void setDemoName(char* demoName);
void setDemoName(DUSK_CONST char* demoName);
void processTime();
bool checkDayTime();
void setEventBit(void* eventBit);
include/d/actor/d_a_alink.h
+1 -1
View File
@@ -4551,7 +4551,7 @@ public:
/* 0x03840 */ cXyz* mIronBallChainPos;
/* 0x03844 */ csXyz* mIronBallChainAngle;
/* 0x03848 */ cXyz* field_0x3848;
/* 0x0384C */ cXyz* field_0x384c;
/* 0x0384C */ cXyz DUSK_CONST* field_0x384c;
/* 0x03850 */ daAlink_procFunc mpProcFunc;
#if TARGET_PC
include/d/actor/d_a_b_tn.h
+1 -1
View File
@@ -203,7 +203,7 @@ private:
/* 0x0AAD */ bool mStayNo2Flag;
/* 0x0AAE */ u8 mBlendStatus;
/* 0x0AB0 */ f32 mBlend;
/* 0x0AB4 */ char* mArcName;
/* 0x0AB4 */ char DUSK_CONST* mArcName;
/* 0x0AB8 */ dBgS_AcchCir mAcchCir;
/* 0x0AF8 */ dBgS_ObjAcch mAcch;
/* 0x0CD0 */ dBgS_AcchCir mAcchCirArr[16];
include/d/actor/d_a_door_boss.h
+4 -4
View File
@@ -23,10 +23,10 @@ public:
/* 3 */ ACT_END,
};
char* getArcName();
char* getBmd();
char* getDzb();
char* getBmd2();
DUSK_CONST char* getArcName();
DUSK_CONST char* getBmd();
DUSK_CONST char* getDzb();
DUSK_CONST char* getBmd2();
J3DModelData* getDoorModelData();
int CreateHeap();
void calcMtx();
include/d/actor/d_a_door_bossL1.h
+2 -2
View File
@@ -33,8 +33,8 @@ public:
typedef int (daBdoorL1_c::*actionFunc)();
char* getDoorEventName();
char* getDoorEventName2();
DUSK_CONST char* getDoorEventName();
DUSK_CONST char* getDoorEventName2();
const char* getArcName();
const char* getAnmArcName();
int getDoorType();
include/d/actor/d_a_door_dbdoor00.h
+5 -5
View File
@@ -14,11 +14,11 @@
*/
class daDbDoor00_c : public fopAc_ac_c {
public:
char* getAlwaysArcName();
char* getDzb();
char* getDummyBmdName();
char* getBmdArcName();
char* getBmdName();
DUSK_CONST char* getAlwaysArcName();
DUSK_CONST char* getDzb();
DUSK_CONST char* getDummyBmdName();
DUSK_CONST char* getBmdArcName();
DUSK_CONST char* getBmdName();
J3DModelData* getDoorModelData();
int CreateHeap();
void calcMtx();
include/d/actor/d_a_door_knob00.h
+5 -5
View File
@@ -29,11 +29,11 @@ public:
typedef int (daKnob20_c::*actionFunc)();
char* getAlwaysArcName();
char* getEvArcName();
char* getDzb();
char* getDummyBmd();
char* getBmd();
DUSK_CONST char* getAlwaysArcName();
DUSK_CONST char* getEvArcName();
DUSK_CONST char* getDzb();
DUSK_CONST char* getDummyBmd();
DUSK_CONST char* getBmd();
J3DModelData* getDoorModelData();
int CreateHeap();
void calcMtx();
include/d/actor/d_a_door_mbossL1.h
+8 -8
View File
@@ -54,15 +54,15 @@ public:
typedef int (daMBdoorL1_c::*actionFunc)();
char* getAnmArcName();
char* getArcName();
char* getAlwaysArcName();
DUSK_CONST char* getAnmArcName();
DUSK_CONST char* getArcName();
DUSK_CONST char* getAlwaysArcName();
int getDoorType();
char* getOpenAnm();
char* getCloseAnm();
char* getBmd();
char* getBtk();
char* getDzb();
DUSK_CONST char* getOpenAnm();
DUSK_CONST char* getCloseAnm();
DUSK_CONST char* getBmd();
DUSK_CONST char* getBtk();
DUSK_CONST char* getDzb();
J3DModelData* getDoorModelData();
int CreateHeap();
void calcMtx();
include/d/actor/d_a_door_shutter.h
+6 -6
View File
@@ -45,12 +45,12 @@ public:
ACTION_DEMO,
};
char* getStopBmdName();
char DUSK_CONST* getStopBmdName();
J3DModelData* getStopModelData();
char* getAlwaysArcName();
char* getArcName();
char* getBmdName();
char* getBtk();
char DUSK_CONST* getAlwaysArcName();
char DUSK_CONST* getArcName();
char DUSK_CONST* getBmdName();
char DUSK_CONST* getBtk();
J3DModelData* getModelData();
f32 getSize2X();
int CreateHeap();
@@ -115,7 +115,7 @@ public:
int chkStopOpen();
int chkMakeKey();
virtual char* getDzbName();
virtual char DUSK_CONST* getDzbName();
virtual int getDemoAction();
void onFlag(u16 flag) { field_0x68e |= flag; }
include/d/actor/d_a_e_arrow.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
/* 0x5B4 */ J3DModel* mpModel;
/* 0x5B8 */ u8 mArrowType;
/* 0x5B9 */ u8 mFlags;
/* 0x5BC */ char* mResName;
/* 0x5BC */ char DUSK_CONST* mResName;
/* 0x5C0 */ s16 field_0x5c0;
/* 0x5C2 */ s16 mAction;
/* 0x5C4 */ s16 mMode;
include/d/actor/d_a_e_ba.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
/* 0x5B5 */ u8 mDistanceParam;
/* 0x5B6 */ u8 mType;
/* 0x5B7 */ u8 mPathIndex;
/* 0x5B8 */ char* mArcName;
/* 0x5B8 */ DUSK_CONST char* mArcName;
/* 0x5BC */ u8 field_0x5bc;
/* 0x5BD */ s8 mPathPoint;
/* 0x5BE */ s8 mPathStep;
include/d/actor/d_a_e_rd.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
/* 0x05CC */ s16 target_ya;
/* 0x05D0 */ mDoExt_McaMorfSO* anm_p;
/* 0x05D4 */ Z2CreatureEnemy sound;
/* 0x0678 */ char* resName;
/* 0x0678 */ DUSK_CONST char* resName;
/* 0x067C */ int anm;
/* 0x0680 */ int field_0x680;
/* 0x0684 */ dJntCol_c mJntCol;
include/d/actor/d_a_e_rdy.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
/* 0x05C8 */ s16 mTargetAngleY;
/* 0x05CC */ mDoExt_McaMorfSO* mpMorf;
/* 0x05D0 */ Z2CreatureEnemy mSound;
/* 0x0674 */ char* mpArcName;
/* 0x0674 */ char DUSK_CONST* mpArcName;
/* 0x0678 */ int mAnm;
/* 0x067C */ u8 field_0x67c[0x680 - 0x67c];
/* 0x0680 */ dJntCol_c mJntCol;
include/d/actor/d_a_e_tt.h
+1 -1
View File
@@ -63,7 +63,7 @@ private:
/* 0x6D4 */ f32 field_0x6d4;
/* 0x6D8 */ s16 mFootJoints[4];
/* 0x6E0 */ s16 field_0x6e0;
/* 0x6E4 */ char* mpResName;
/* 0x6E4 */ char DUSK_CONST* mpResName;
/* 0x6E8 */ u16 mDamageCooldownTimer;
/* 0x6EA */ u8 mGenericTimer;
/* 0x6EC */ int mAttackTimer;
include/d/actor/d_a_e_wb.h
+1 -1
View File
@@ -99,7 +99,7 @@ public:
/* 0x0000 */ fopEn_enemy_c enemy; ///< @brief Base enemy class instance.
/* 0x05AC */ request_of_phase_process_class phase; ///< @brief Phase process request handler.
/* 0x05B4 */ s16 ride_mode; ///< @brief Current sub-action mode within the run action.
/* 0x05B8 */ char* resName; ///< @brief Resource name for loading models/animations.
/* 0x05B8 */ char DUSK_CONST* resName; ///< @brief Resource name for loading models/animations.
/* 0x05BC */ u8 arg0; ///< @brief Creation parameter 1.
/* 0x05BD */ u8 arg1; ///< @brief Creation parameter 2.
/* 0x05BE */ u8 field_0x5be;
include/d/actor/d_a_kago.h
+2 -2
View File
@@ -213,8 +213,8 @@ private:
/* 0x750 */ int field_0x750;
/* 0x754 */ int field_0x754;
/* 0x758 */ int field_0x758;
/* 0x75C */ char* mArcName;
/* 0x760 */ char* mDemoName;
/* 0x75C */ DUSK_CONST char* mArcName;
/* 0x760 */ DUSK_CONST char* mDemoName;
/* 0x764 */ u32 mShadowId;
/* 0x768 */ dPath* mpPath1;
/* 0x76C */ dPath* mpPath2;
include/d/actor/d_a_mg_fish.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
/* 0x5F4 */ s16 mYawToPlayer;
/* 0x5F6 */ s16 field_0x5f6;
/* 0x5F8 */ s16 field_0x5f8;
/* 0x5FC */ char* mResName;
/* 0x5FC */ DUSK_CONST char* mResName;
/* 0x600 */ mDoExt_McaMorf* mpMorf;
/* 0x604 */ J3DAnmTransform* mAnmTransform;
/* 0x608 */ u32 mShadowId;
include/d/actor/d_a_mg_rod.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
/* 0x0000 */ fopAc_ac_c actor;
/* 0x0568 */ request_of_phase_process_class phase;
/* 0x0570 */ char* arcname;
/* 0x0570 */ DUSK_CONST char* arcname;
/* 0x0574 */ u8 arg0;
/* 0x0575 */ u8 arg1;
/* 0x0576 */ u8 arg2;
include/d/actor/d_a_myna.h
+2 -2
View File
@@ -103,8 +103,8 @@ public:
void animePlay();
int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
J3DAnmTransformKey* getTrnsfrmKeyAnm(char*);
J3DAnmTexPattern* getTexPtrnAnm(char*);
J3DAnmTransformKey* getTrnsfrmKeyAnm(DUSK_CONST char*);
J3DAnmTexPattern* getTexPtrnAnm(DUSK_CONST char*);
int checkEndAnm(J3DFrameCtrl*);
int checkEndAnm(f32);
u8 getItemNumMax();
include/d/actor/d_a_npc.h
+4 -4
View File
@@ -519,7 +519,7 @@ public:
/* 0x568 */ daNpcT_faceMotionAnmData_c const* mpFaceMotionAnmData;
/* 0x56C */ daNpcT_motionAnmData_c const* mpMotionAnmData;
/* 0x570 */ daNpcT_evtData_c const* mpEvtData;
/* 0x574 */ char** mpArcNames;
/* 0x574 */ DUSK_CONST char* DUSK_CONST* mpArcNames;
/* 0x578 */ mDoExt_McaMorfSO* mpMorf[2];
/* 0x580 */ Z2Creature mSound;
/* 0x610 */ mDoExt_bckAnm mBckAnm;
@@ -627,7 +627,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, DUSK_CONST char* DUSK_CONST* i_arcNames)
:
mpFaceMotionAnmData(i_faceMotionAnmData),
mpMotionAnmData(i_motionAnmData),
@@ -654,8 +654,8 @@ public:
int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int);
int loadRes(s8 const*, char const**);
void deleteRes(s8 const*, char const**);
int loadRes(s8 const*, char const* DUSK_CONST*);
void deleteRes(s8 const*, char const* DUSK_CONST*);
int execute();
int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL);
void setEnvTevColor();
include/d/actor/d_a_npc2.h
+4 -4
View File
@@ -86,12 +86,12 @@ public:
class daBaseNpc_c : public fopAc_ac_c {
public:
daBaseNpc_c();
J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
J3DAnmTransform* getTrnsfrmKeyAnmP(char DUSK_CONST*, int);
int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
J3DAnmTransform* getTexPtrnAnmP(char*, int);
J3DAnmTransform* getTexPtrnAnmP(char DUSK_CONST*, int);
int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
void orderEvent(int, char*);
void orderEvent(int, char DUSK_CONST*);
void setEnvTevColor();
void setRoomNo();
int checkEndAnm(f32);
@@ -128,7 +128,7 @@ public:
/* 0x808 */ mDoExt_btpAnm mBtp;
/* 0x820 */ mDoExt_btkAnm mBtk;
/* 0x838 */ s16 field_0x838;
/* 0x83C */ u16* field_0x83c;
/* 0x83C */ u16 DUSK_CONST* field_0x83c;
/* 0x840 */ u16 field_0x840;
/* 0x842 */ u16 field_0x842;
/* 0x844 */ u8 field_0x844;
include/d/actor/d_a_npc4.h
+6 -6
View File
@@ -311,10 +311,10 @@ public:
static void* srchActor(void*, void*);
void initialize();
J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int);
J3DAnmTexPattern* getTexPtrnAnmP(char*, int);
J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int);
J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int);
J3DAnmTransformKey* getTrnsfrmKeyAnmP(DUSK_CONST char*, int);
J3DAnmTexPattern* getTexPtrnAnmP(DUSK_CONST char*, int);
J3DAnmTextureSRTKey* getTexSRTKeyAnmP(DUSK_CONST char*, int);
J3DAnmTevRegKey* getTevRegKeyAnmP(DUSK_CONST char*, int);
BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr,
int i_start, int i_end);
BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start,
@@ -336,8 +336,8 @@ public:
BOOL hitChk2(dCcD_Cyl*, BOOL, BOOL);
void setDamage(int, int, int);
int ctrlMsgAnm(int&, int&, fopAc_ac_c*, BOOL);
void orderEvent(int, char*, u16, u16, u8, u16);
void changeEvent(char*, char*, u16, u16);
void orderEvent(int, DUSK_CONST char*, u16, u16, u8, u16);
void changeEvent(DUSK_CONST char*, DUSK_CONST char*, u16, u16);
BOOL chkActorInSight(fopAc_ac_c*, f32);
BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
include/d/actor/d_a_npc_aru.h
+3 -3
View File
@@ -149,7 +149,7 @@ public:
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -171,8 +171,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
void setLastIn() { mLastGoatIn = true; }
static char* mCutNameList[7];
static cutFunc mCutList[7];
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
private:
/* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_ashB.h
+1 -1
View File
@@ -135,7 +135,7 @@ public:
inline bool step(s16, int, f32);
inline void playExpression();
static EventFn mEvtSeqList[2];
static EventFn DUSK_CONST mEvtSeqList[2];
private:
/* 0xB48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_npc_bans.h
+3 -3
View File
@@ -90,7 +90,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -117,8 +117,8 @@ public:
return rv;
}
static char* mCutNameList[4];
static cutFunc mCutList[4];
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static cutFunc DUSK_CONST mCutList[4];
/* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf;
/* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO;
include/d/actor/d_a_npc_besu.h
+3 -3
View File
@@ -112,7 +112,7 @@ public:
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -140,8 +140,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
static char* mCutNameList[15];
static cutFunc mCutList[15];
static char DUSK_CONST* DUSK_CONST mCutNameList[15];
static cutFunc DUSK_CONST mCutList[15];
private:
/* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;
include/d/actor/d_a_npc_blue_ns.h
+1 -1
View File
@@ -124,7 +124,7 @@ public:
return var_r30;
}
static EventFn mEvtSeqList[];
static EventFn DUSK_CONST mEvtSeqList[];
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];
include/d/actor/d_a_npc_bou.h
+3 -3
View File
@@ -89,7 +89,7 @@ public:
daNpc_Bou_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8)
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
:
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
@@ -114,8 +114,8 @@ public:
virtual int drawDbgInfo();
virtual void changeAnm(int*, int*);
static char* mCutNameList[9];
static cutFunc mCutList[9];
static char DUSK_CONST* DUSK_CONST mCutNameList[9];
static cutFunc DUSK_CONST mCutList[9];
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_chat.h
+1 -1
View File
@@ -102,7 +102,7 @@ public:
void setFear() { mFear = true; }
void setTalkFlag() { mTalkFlag = true; }
static eventFunc mEvtSeqList[1];
static eventFunc DUSK_CONST mEvtSeqList[1];
private:
/* 0xB48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_clerka.h
+3 -3
View File
@@ -100,7 +100,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -124,8 +124,8 @@ public:
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_clerkb.h
+3 -3
View File
@@ -113,7 +113,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -137,8 +137,8 @@ public:
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;
include/d/actor/d_a_npc_clerkt.h
+3 -3
View File
@@ -91,7 +91,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -125,8 +125,8 @@ public:
}
}
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_doc.h
+3 -3
View File
@@ -66,7 +66,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
@@ -133,8 +133,8 @@ public:
return (fopAcM_GetParam(this) & 0xFF00) >> 8;
}
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_doorboy.h
+1 -1
View File
@@ -78,7 +78,7 @@ public:
inline int getTimeHour();
inline bool isDummyTalk();
static EventFn mEvtSeqList[1];
static EventFn DUSK_CONST mEvtSeqList[1];
private:
/* 0xB48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_fairy.h
+3 -3
View File
@@ -256,7 +256,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -294,8 +294,8 @@ public:
u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
static char* mCutNameList[18];
static cutFunc mCutList[18];
static char DUSK_CONST* DUSK_CONST mCutNameList[18];
static cutFunc DUSK_CONST mCutList[18];
private:
/* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
/* 0x0E44 */ dCcD_Cyl mCyl;
include/d/actor/d_a_npc_fairy_seirei.h
+3 -3
View File
@@ -71,7 +71,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
int param_6, daNpcT_evtData_c const* param_7, DUSK_CONST char* DUSK_CONST* param_8)
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
@@ -90,8 +90,8 @@ public:
int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static DUSK_CONST char* mCutNameList[1];
static DUSK_CONST cutFunc mCutList[1];
private:
/* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gnd.h
+3 -3
View File
@@ -83,7 +83,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -96,8 +96,8 @@ public:
s32 getNeckJointNo() { return 3; }
s32 getBackboneJointNo() { return 1; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gra.h
+2 -2
View File
@@ -138,9 +138,9 @@ public:
void addCarryNum() { field_0x1692++; }
u8 getPathNoFromParam() { return home.angle.z; }
void setGateWalk() { field_0x14D0 = 1; }
static char* mEvtCutNameList[12];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
typedef BOOL (daNpc_grA_c::*cut_type)(int);
static cut_type mEvtCutList[];
static cut_type DUSK_CONST mEvtCutList[];
private:
typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*);
include/d/actor/d_a_npc_grc.h
+2 -2
View File
@@ -89,8 +89,8 @@ public:
void setPrtcl();
void adjustShapeAngle() {}
static char* mEvtCutNameList;
static EventFn mEvtCutList[1];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static EventFn DUSK_CONST mEvtCutList[1];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grd.h
+2 -2
View File
@@ -81,8 +81,8 @@ public:
BOOL ECut_nodToGrz(int);
void adjustShapeAngle() {}
static char* mEvtCutNameList[2];
static cutFunc mEvtCutList[2];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static cutFunc DUSK_CONST mEvtCutList[2];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grm.h
+3 -3
View File
@@ -120,7 +120,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -131,8 +131,8 @@ public:
BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_grmc.h
+3 -3
View File
@@ -113,7 +113,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -124,8 +124,8 @@ public:
BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
u16 getEyeballMaterialNo() { return 1; };
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_gro.h
+2 -2
View File
@@ -85,8 +85,8 @@ public:
int test(void*);
void adjustShapeAngle() {}
static char* mEvtCutNameList[3];
static cutFunc mEvtCutList[3];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
static cutFunc DUSK_CONST mEvtCutList[3];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grr.h
+2 -2
View File
@@ -83,8 +83,8 @@ public:
int test(void*);
void adjustShapeAngle() {}
static char* mEvtCutNameList;
static cutFunc mEvtCutList[1];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
static cutFunc DUSK_CONST mEvtCutList[1];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grs.h
+2 -2
View File
@@ -84,8 +84,8 @@ public:
void setPrtcl();
void adjustShapeAngle() {}
static char* mEvtCutNameList[2];
static cutFunc mEvtCutList[2];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static cutFunc DUSK_CONST mEvtCutList[2];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_grz.h
+2 -2
View File
@@ -116,8 +116,8 @@ public:
u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
static char* mEvtCutNameList[7];
static cutFunc mEvtCutList[7];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
static cutFunc DUSK_CONST mEvtCutList[7];
private:
/* 0x0B48 */ Z2Creature mSound;
include/d/actor/d_a_npc_gwolf.h
+2 -2
View File
@@ -104,8 +104,8 @@ public:
void setHowlingEndFlag() { field_0xe1c = 2; }
void setHowlingFlag() { field_0xe1c = 1; }
static char* mEvtCutNameList[5];
static cutFunc mEvtCutList[5];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static cutFunc DUSK_CONST mEvtCutList[5];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_hanjo.h
+4 -4
View File
@@ -194,7 +194,7 @@ public:
daNpc_Hanjo_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
u16 getEyeballMaterialNo() { return 2; }
@@ -218,9 +218,9 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static dCcD_SrcGObjInf const mStoneCcDObjInfo;
static char* mCutNameList[6];
static cutFunc mCutList[6];
static dCcD_SrcSph mStoneCcDSph;
static char DUSK_CONST* DUSK_CONST mCutNameList[6];
static cutFunc DUSK_CONST mCutList[6];
static dCcD_SrcSph DUSK_CONST mStoneCcDSph;
private:
/* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
/* 0x0E44 */ J3DModel* mModel1;
include/d/actor/d_a_npc_hoz.h
+3 -3
View File
@@ -91,7 +91,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
@@ -125,8 +125,8 @@ public:
bool getGameStartFlag() { return mGameStartFlag; }
void setPotBreakFlag() { mPotBreakFlag = true; }
static char* mCutNameList[8];
static cutFunc mCutList[];
static char DUSK_CONST* DUSK_CONST mCutNameList[8];
static cutFunc DUSK_CONST mCutList[];
private:
/* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_jagar.h
+3 -3
View File
@@ -138,7 +138,7 @@ public:
daNpc_Jagar_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
u16 getEyeballMaterialNo() { return MAT_JAGA_EYEBALL; }
@@ -223,8 +223,8 @@ public:
return 0;
}
static char* mCutNameList[7];
static cutFunc mCutList[7];
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
private:
/* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO;
/* 0x0E44 */ dCcD_Cyl mCyl1;
include/d/actor/d_a_npc_kakashi.h
+3 -3
View File
@@ -76,7 +76,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
@@ -113,8 +113,8 @@ public:
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
static char* mCutNameList[4];
static int (daNpc_Kakashi_c::*mCutList[])(int);
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int);
private:
/* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kasi_kyu.h
+1 -1
View File
@@ -120,7 +120,7 @@ public:
void chgWeightLight() { mCcStts.SetWeight(0xD8); }
BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
static EventFn mEvtSeqList[1];
static EventFn DUSK_CONST mEvtSeqList[1];
static daTagEscape_c* mTargetTag;
static f32 mTargetTagDist;
static s16 mWolfAngle;
include/d/actor/d_a_npc_kasi_mich.h
+1 -1
View File
@@ -121,7 +121,7 @@ public:
void chgWeightLight() { mCcStts.SetWeight(0xD8); }
BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
static EventFn mEvtSeqList[1];
static EventFn DUSK_CONST mEvtSeqList[1];
static daTagEscape_c* mTargetTag;
static f32 mTargetTagDist;
static s16 mWolfAngle;
include/d/actor/d_a_npc_kkri.h
+3 -3
View File
@@ -71,7 +71,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
@@ -118,8 +118,8 @@ public:
return mpMorf[0]->getModel()->getAnmMtx(5);
}
static char* mCutNameList[3];
static int (daNpc_Kkri_c::*mCutList[])(int);
static char DUSK_CONST* DUSK_CONST mCutNameList[3];
static int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int);
private:
/* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kn.h
+6 -6
View File
@@ -88,7 +88,7 @@ public:
/* 0x05AC */ const daNpcT_faceMotionAnmData_c* mpFaceMotionAnmData;
/* 0x05B0 */ const daNpcT_motionAnmData_c* mpMotionAnmData;
/* 0x05B4 */ const daNpcT_evtData_c* mpEventData;
/* 0x05B8 */ char** mpArcNames;
/* 0x05B8 */ char DUSK_CONST* DUSK_CONST* mpArcNames;
/* 0x05BC */ mDoExt_McaMorfSO* mpModelMorf[2];
/* 0x05C4 */ Z2Creature mSound;
/* 0x0654 */ mDoExt_bckAnm mBckAnm;
@@ -322,8 +322,8 @@ public:
int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
BOOL setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
BOOL setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
int loadRes(s8 const*, char const**);
void deleteRes(s8 const*, char const**);
int loadRes(s8 const*, char const* DUSK_CONST*);
void deleteRes(s8 const*, char const* DUSK_CONST*);
int execute();
int draw(int, int, f32, GXColorS10*, f32, int, int, int);
void setEnvTevColor();
@@ -355,7 +355,7 @@ public:
daNpcT_motionAnmData_c const* param_1,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2, int param_3,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4, int param_5,
daNpcT_evtData_c const* param_6, char** param_7)
daNpcT_evtData_c const* param_6, char DUSK_CONST* DUSK_CONST* param_7)
: mpFaceMotionAnmData(param_0), mpMotionAnmData(param_1), mFaceMotionSeqMngr(param_2, param_3),
mMotionSeqMngr(param_4, param_5), mpEventData(param_6), mpArcNames(param_7)
{
@@ -413,8 +413,8 @@ public:
virtual bool afterSetMotionAnm(int, int, f32, int);
static const dCcD_SrcGObjInf mCcDObjData;
static char* mCutNameList[21];
static cutFunc mCutList[21];
static char DUSK_CONST* DUSK_CONST mCutNameList[21];
static cutFunc DUSK_CONST mCutList[21];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
static s16 mSrchName;
include/d/actor/d_a_npc_knj.h
+3 -3
View File
@@ -75,13 +75,13 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_kolin.h
+3 -3
View File
@@ -93,7 +93,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -120,8 +120,8 @@ public:
virtual void changeAnm(int*, int*);
virtual void changeBck(int*, int*);
static char* mCutNameList[11];
static cutFunc mCutList[11];
static char DUSK_CONST* DUSK_CONST mCutNameList[11];
static cutFunc DUSK_CONST mCutList[11];
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_kolinb.h
+3 -3
View File
@@ -140,7 +140,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -150,8 +150,8 @@ public:
s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; }
s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; }
static char* mCutNameList[7];
static cutFunc mCutList[7];
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_kyury.h
+3 -3
View File
@@ -106,7 +106,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
u16 getEyeballMaterialNo() { return 2; }
s32 getHeadJointNo() { return 4; }
@@ -123,8 +123,8 @@ public:
return nodeNo;
}
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_len.h
+3 -3
View File
@@ -86,7 +86,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -100,8 +100,8 @@ public:
s32 getFootRJointNo() { return 32; }
BOOL chkXYItems() { return TRUE; }
static char* mCutNameList[4];
static cutFunc mCutList[4];
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static cutFunc DUSK_CONST mCutList[4];
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
include/d/actor/d_a_npc_lud.h
+3 -3
View File
@@ -91,7 +91,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -111,8 +111,8 @@ public:
}
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
static char* mCutNameList[8];
static cutFunc mCutList[8];
static char DUSK_CONST* DUSK_CONST mCutNameList[8];
static cutFunc DUSK_CONST mCutList[8];
private:
/* 0xE40 */ mDoExt_McaMorfSO* mpBowlMorf;
include/d/actor/d_a_npc_maro.h
+3 -3
View File
@@ -132,7 +132,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -167,8 +167,8 @@ public:
void startChoccai() { field_0x1134 = 1; }
void endChoccai() { field_0x1134 = 0; }
static char* mCutNameList[17];
static cutFunc mCutList[17];
static char DUSK_CONST* DUSK_CONST mCutNameList[17];
static cutFunc DUSK_CONST mCutList[17];
u8 getGroupId() {
return (fopAcM_GetParam(this) & 0xF0000000) >> 28;
include/d/actor/d_a_npc_midp.h
+3 -3
View File
@@ -130,7 +130,7 @@ public:
daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
u16 getEyeballRMaterialNo() { return 3; }
u16 getEyeballLMaterialNo() { return 2; }
@@ -148,8 +148,8 @@ public:
return nodeNo;
}
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_MIDP_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_moi.h
+3 -3
View File
@@ -128,7 +128,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -158,8 +158,8 @@ public:
bool chkSFight() { return field_0x166b == 1; }
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static char* mCutNameList[5];
static cutFunc mCutList[5];
static char DUSK_CONST* DUSK_CONST mCutNameList[5];
static cutFunc DUSK_CONST mCutList[5];
private:
/* 0x0E40 */ NPC_MOI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_myna2.h
+2 -2
View File
@@ -87,8 +87,8 @@ public:
int getType() { return mType; }
static char* mEvtCutNameList[5];
static EventFn mEvtCutList[];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
static EventFn DUSK_CONST mEvtCutList[];
/* 0xB48 */ u8 field_0xB48[0xB4C - 0xB48];
/* 0xB4C */ daNpcF_Lookat_c mLookat;
include/d/actor/d_a_npc_pachi_besu.h
+3 -3
View File
@@ -115,7 +115,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -144,8 +144,8 @@ public:
void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; }
void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; }
static char* mCutNameList[11];
static cutFunc mCutList[11];
static char DUSK_CONST* DUSK_CONST mCutNameList[11];
static cutFunc DUSK_CONST mCutList[11];
private:
/* 0xE40 */ NPC_PACHI_BESU_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_pachi_maro.h
+3 -3
View File
@@ -149,7 +149,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -184,8 +184,8 @@ public:
void setFMotion_Niramu_to_Besu() { mFMotion = 1; }
void setFMotion_LookNone() { mFMotion = 2; }
static char* mCutNameList[11];
static cutFunc mCutList[11];
static char DUSK_CONST* DUSK_CONST mCutNameList[11];
static cutFunc DUSK_CONST mCutList[11];
private:
/* 0xE40 */ NPC_PACHI_MARO_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_pachi_taro.h
+3 -3
View File
@@ -166,7 +166,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -196,8 +196,8 @@ public:
void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; }
void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; }
static char* mCutNameList[11];
static cutFunc mCutList[11];
static char DUSK_CONST* DUSK_CONST mCutNameList[11];
static cutFunc DUSK_CONST mCutList[11];
private:
/* 0x0E40 */ NPC_PACHI_TARO_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_post.h
+3 -3
View File
@@ -125,7 +125,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -153,8 +153,8 @@ public:
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0x0E40 */ mDoExt_McaMorfSO* mpFlagModelMorf;
include/d/actor/d_a_npc_pouya.h
+3 -3
View File
@@ -121,7 +121,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -146,8 +146,8 @@ public:
MtxP getHeadMtx() { return mpMorf[0]->getModel()->getAnmMtx(4); }
static char* mCutNameList[3];
static cutFunc mCutList[3];
static char DUSK_CONST* DUSK_CONST mCutNameList[3];
static cutFunc DUSK_CONST mCutList[3];
private:
/* 0xE40 */ NPC_POUYA_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_prayer.h
+1 -1
View File
@@ -77,7 +77,7 @@ public:
s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
static EvtSeq mEvtSeqList[];
static EvtSeq DUSK_CONST mEvtSeqList[];
private:
/* 0xB48 */ Z2CreatureCitizen mSound;
include/d/actor/d_a_npc_raca.h
+3 -3
View File
@@ -121,7 +121,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -145,8 +145,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_RACA_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_saru.h
+3 -3
View File
@@ -115,7 +115,7 @@ public:
daNpc_Saru_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
s32 getHeadJointNo() { return JNT_HEAD; }
@@ -133,8 +133,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static char* mCutNameList[4];
static cutFunc mCutList[4];
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
static cutFunc DUSK_CONST mCutList[4];
private:
/* 0xE40 */ NPC_SARU_HIO_CLASS* mpHIO;
/* 0xE44 */ J3DModel* mpRoseModels[2];
include/d/actor/d_a_npc_seib.h
+3 -3
View File
@@ -80,12 +80,12 @@ public:
daNpc_seiB_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_SEIB_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_seic.h
+3 -3
View File
@@ -82,13 +82,13 @@ public:
daNpc_seiC_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {};
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_SEIC_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_seid.h
+3 -3
View File
@@ -81,13 +81,13 @@ public:
daNpc_seiD_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {};
static char* mCutNameList;
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList;
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_SEID_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_seira.h
+3 -3
View File
@@ -100,7 +100,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -114,8 +114,8 @@ public:
BOOL checkChangeJoint(int val) { return val == 4; }
BOOL checkRemoveJoint(int val) { return val == 8; }
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf;
include/d/actor/d_a_npc_seira2.h
+3 -3
View File
@@ -92,7 +92,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -106,8 +106,8 @@ public:
BOOL checkChangeJoint(int val) { return val == 4; }
BOOL checkRemoveJoint(int val) { return val == 8; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf;
include/d/actor/d_a_npc_seirei.h
+3 -3
View File
@@ -83,7 +83,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -99,8 +99,8 @@ public:
u32 getBitSW() { return (fopAcM_GetParam(this) & 0xFF000) >> 12; }
bool getDoBtnChkFlag() { return (fopAcM_GetParam(this) & 0x100) == 0; }
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0xE40 */ NPC_SEIREI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_shad.h
+1 -1
View File
@@ -184,7 +184,7 @@ public:
void lookat();
BOOL drawDbgInfo();
static EventFn mEvtSeqList[14];
static EventFn DUSK_CONST mEvtSeqList[14];
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
s16 getMessageNo() { return shape_angle.x; }
include/d/actor/d_a_npc_shaman.h
+3 -3
View File
@@ -94,7 +94,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) { OS_REPORT("|%06d:%x|daNpc_Sha_c -> コンストラクト\n", g_Counter.mCounter0, this); }
@@ -110,8 +110,8 @@ public:
return nodeNo == 0xFFFF ? -1 : nodeNo;
}
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
static const u16 mEvtBitLabels[6];
static const u16 mTmpBitLabels[6];
static const int mSceneChangeNoTable[48];
include/d/actor/d_a_npc_shoe.h
+1 -1
View File
@@ -110,7 +110,7 @@ public:
inline bool chkFindPlayer();
inline void playMotion();
static EventFn mEvtSeqList[1];
static EventFn DUSK_CONST mEvtSeqList[1];
private:
/* 0xB48 */ J3DModel* mpModel1;
include/d/actor/d_a_npc_shop0.h
+2 -2
View File
@@ -34,12 +34,12 @@ public:
int destroy();
int execute();
int draw();
char* getResName();
char DUSK_CONST* getResName();
void getParam();
int getFlowNodeNum();
int isDelete();
int init();
J3DAnmTransform* getTrnsfrmAnmP(int, char**);
J3DAnmTransform* getTrnsfrmAnmP(int, char DUSK_CONST* DUSK_CONST*);
int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
int setCollision();
int checkEvent();
include/d/actor/d_a_npc_sola.h
+3 -3
View File
@@ -105,14 +105,14 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
s32 getHeadJointNo() { return JNT_HEAD; }
s32 getNeckJointNo() { return JNT_NECK; }
s32 getBackboneJointNo() { return JNT_BACKBONE1; }
static char* mCutNameList[1];
static cutFunc mCutList[1];
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
static cutFunc DUSK_CONST mCutList[1];
private:
/* 0xE40 */ NPC_SOLA_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_soldierA.h
+2 -2
View File
@@ -79,8 +79,8 @@ public:
u8 getType() { return mType; }
static char* mEvtCutNameList[3];
static cutFunc mEvtCutList[3];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
static cutFunc DUSK_CONST mEvtCutList[3];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_soldierB.h
+2 -2
View File
@@ -75,8 +75,8 @@ public:
int ECut_listenLake(int);
int test(void*);
static char* mEvtCutNameList[2];
static cutFunc mEvtCutList[2];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
static cutFunc DUSK_CONST mEvtCutList[2];
private:
/* 0xB48 */ Z2Creature mSound;
include/d/actor/d_a_npc_taro.h
+3 -3
View File
@@ -126,7 +126,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -156,8 +156,8 @@ public:
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xff000000) >> 24; }
static char* mCutNameList[17];
static cutFunc mCutList[17];
static char DUSK_CONST* DUSK_CONST mCutNameList[17];
static cutFunc DUSK_CONST mCutList[17];
private:
/* 0x0E40 */ NPC_TARO_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_the.h
+2 -2
View File
@@ -231,8 +231,8 @@ private:
/* 0xE1D */ bool field_0xe1d;
/* 0xE1E */ u8 mType;
static char* mEvtCutNameList[4];
static EventFn mEvtCutList[4];
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[4];
static EventFn DUSK_CONST mEvtCutList[4];
};
STATIC_ASSERT(sizeof(daNpcThe_c) == 0xE20);
include/d/actor/d_a_npc_tkj.h
+3 -3
View File
@@ -67,7 +67,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
@@ -94,8 +94,8 @@ public:
int getPath() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
static char* mCutNameList[2];
static int (daNpcTkj_c::*mCutList[])(int);
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static int (daNpcTkj_c::* DUSK_CONST mCutList[])(int);
private:
/* 0xE40 */ NPC_TKJ_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_toby.h
+3 -3
View File
@@ -97,7 +97,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -129,8 +129,8 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
static char* mCutNameList[7];
static cutFunc mCutList[7];
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
static cutFunc DUSK_CONST mCutList[7];
private:
/* 0x0E40 */ NPC_TOBY_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_uri.h
+2 -2
View File
@@ -113,7 +113,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
u16 getEyeballMaterialNo() { return 2; }
s32 getHeadJointNo() { return 4; }
@@ -137,7 +137,7 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static const char* mCutNameList[7];
static cutFunc mCutList[7];
static cutFunc DUSK_CONST mCutList[7];
private:
/* 0x0E40 */ NPC_URI_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_wrestler.h
+6 -6
View File
@@ -110,10 +110,10 @@ public:
#endif
struct WrestlerParamList {
daNpc_GetParam1* bck_list;
daNpc_GetParam2* face_list;
daNpc_GetParam1* btp_list;
daNpc_GetParam1* btk_list;
DUSK_CONST daNpc_GetParam1* bck_list;
DUSK_CONST daNpc_GetParam2* face_list;
DUSK_CONST daNpc_GetParam1* btp_list;
DUSK_CONST daNpc_GetParam1* btk_list;
};
struct DemoCamera_c {
@@ -230,7 +230,7 @@ public:
inline void initDemoCamera_ReadyWrestler();
inline void playExpression();
static EventFn mEvtSeqList[7];
static EventFn DUSK_CONST mEvtSeqList[7];
private:
/* 0xB48 */ Z2Creature mSound;
@@ -254,7 +254,7 @@ private:
u8 chkFlag;
} mArenaInfo;
/* 0xE03 */ u8 field_0xe03;
/* 0xE04 */ WrestlerParamList* field_0xe04;
/* 0xE04 */ WrestlerParamList DUSK_CONST* field_0xe04;
/* 0xE08 */ DemoCamera_c mDemoCam;
/* 0xE50 */ f32 mDemoCamFovy;
/* 0xE54 */ f32 field_0xe54;
include/d/actor/d_a_npc_yamid.h
+3 -3
View File
@@ -84,7 +84,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
int i_motionStepNum,
daNpcT_evtData_c const* i_evtData,
char** i_arcNames)
char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
@@ -129,8 +129,8 @@ public:
field_0xe44.OffTgSetBit();
}
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0xE40 */ NPC_YAMID_HIO_CLASS* mpHIO;
include/d/actor/d_a_npc_yamis.h
+3 -3
View File
@@ -81,7 +81,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
@@ -124,8 +124,8 @@ public:
field_0xe44.OffTgSetBit();
}
static char* mCutNameList[2];
static cutFunc mCutList[2];
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
static cutFunc DUSK_CONST mCutList[2];
private:
/* 0xE40 */ NPC_YAMIS_HIO_CLASS* mpHIO;

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