diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2026-01-17 05:44:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-17 15:44:37 +0200 |
| commit | b1f44ce5322d0844758bebd487b3f3f5c0363823 (patch) | |
| tree | fb47f2c7f115b2cb51c06223d46784da43e9fe56 /include | |
| parent | 93dcac33431a9f279623d25ff2065def5b2b5eec (diff) | |
d_a_alink cleanup / debug work (#3045)
* start d_a_alink debug cleanup
* d_a_alink_damage debug
* d_a_alink_guard debug
* d_a_alink_bow debug
* d_a_alink_boom debug
* d_a_alink_copyrod debug
* d_a_alink_hvyboots debug
* d_a_alink_grab debug
* d_a_alink_sumou debug
* d_a_alink_horse debug
* d_a_alink_canoe debug
* d_a_alink_crawl / d_a_alink_hang debug
* d_a_alink_swim debug
* d_a_alink_hook / d_a_alink_iceleaf debug
* d_a_alink_bottle debug
* d_a_alink_whistle / d_a_alink_kandelaar / d_a_alink_ironball debug
* d_a_alink_demo debug
* d_a_alink_effect debug
* d_a_alink_wolf debug
* d_a_alink debug / cleanup
* cleanup button status enums
Diffstat (limited to 'include')
31 files changed, 1237 insertions, 1022 deletions
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 413664746b..2393e9c13d 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -221,7 +221,7 @@ public: u32 MskRPrm(u32 mask) const { return mRPrm & mask; } void OnSPrmBit(u32 flag) { mSPrm |= flag; } void OffSPrmBit(u32 flag) { mSPrm &= ~flag; } - u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); } + u32 ChkSPrm(u32 prm) const { return MskSPrm(prm) != 0; } void Set(cCcD_SrcObjCommonBase const& src) { mSPrm = src.mSPrm; } }; diff --git a/include/Z2AudioLib/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr.h index 0510738e61..7432a2bc82 100644 --- a/include/Z2AudioLib/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr.h @@ -58,6 +58,7 @@ public: void setMarkState(u8 state) { mMarkState = state; } static Z2CreatureLink* mLinkPtr; + static Z2CreatureLink* getLink() { return mLinkPtr; } friend class Z2LinkSoundStarter; friend class Z2RideSoundStarter; @@ -96,7 +97,7 @@ private: }; // Size: 0xD0 inline Z2CreatureLink* Z2GetLink() { - return Z2CreatureLink::mLinkPtr; + return Z2CreatureLink::getLink(); } class Z2CreatureRide; diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index a4debb71d2..9e0dc7c712 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -13,7 +13,9 @@ #include "d/d_save.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" + #include "res/Object/AlAnm.h" +#include "res/Object/Always.h" class J2DAnmColorKey; class J2DAnmTransformKey; @@ -72,10 +74,14 @@ public: virtual void draw(); virtual ~daAlink_sight_c() {} - bool getLockFlg() { return mLockFlag; } + void update() { + mLockCursor.update(); + } + + u8 getLockFlg() { return mLockFlag; } void offLockFlg() { mLockFlag = false; } - /* 0x4C */ bool mLockFlag; + /* 0x4C */ u8 mLockFlag; /* 0x4D */ u8 field_0x4d[3]; /* 0x50 */ daAlink_lockCursor_c mLockCursor; }; @@ -150,7 +156,7 @@ public: void offSetFlg() { mSetFlag = FALSE; } virtual ~daAlink_matAnm_c() {} - virtual void calc(J3DMaterial*) const; + virtual void calc(J3DMaterial* i_material) const; static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); } static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; } @@ -168,11 +174,11 @@ public: static bool m_eye_move_flg; static u8 m_morf_frame; - /* 0x0F4 */ f32 field_0xf4; - /* 0x0F8 */ f32 field_0xf8; - /* 0x0FC */ f32 mNowOffsetX; - /* 0x100 */ f32 mNowOffsetY; - /* 0x104 */ int mSetFlag; + /* 0x0F4 */ mutable f32 field_0xf4; + /* 0x0F8 */ mutable f32 field_0xf8; + /* 0x0FC */ mutable f32 mNowOffsetX; + /* 0x100 */ mutable f32 mNowOffsetY; + /* 0x104 */ mutable int mSetFlag; }; // this class is mostly a complete guess @@ -192,21 +198,19 @@ struct daAlink_FaceTexData { }; struct daAlink_AnmData { - /* 0x0 */ daAlink_BckData field_0x0; - /* 0x4 */ u8 field_0x4; - /* 0x5 */ u8 field_0x5; + /* 0x0 */ daAlink_BckData m_bckData; + /* 0x4 */ u8 m_handIndexL; + /* 0x5 */ u8 m_handIndexR; /* 0x6 */ u16 m_faceTexID; /* 0x8 */ u16 m_faceBckID; /* 0xA */ u16 field_0xa; }; // Size: 0xC struct daAlink_WlAnmData { - /* 0x0 */ u16 field_0x0; - /* 0x2 */ u8 field_0x2; - /* 0x3 */ u8 field_0x3; - /* 0x4 */ u16 field_0x4; - /* 0x6 */ u8 field_0x6; - /* 0x7 */ u8 field_0x7; + /* 0x0 */ u16 m_bckID; + /* 0x2 */ u8 m_midnaAnm; + /* 0x3 */ u8 m_voiceIdx; + /* 0x4 */ s8 m_voiceFrames[4]; }; // Size: 0x8 class daAlinkHIO_data_c : public JORReflexible { @@ -3980,6 +3984,15 @@ public: size_t makeFileOutData(char*, char*); void listenPropertyEvent(const JORPropertyEvent*); + enum PropertyID_e { + PROPERTY_POS_DISP_e = 0x4000002, + PROPERTY_RESET_e = 0x4000003, + PROPERTY_SAVE_FILE_e = 0x4000004, + PROPERTY_LOAD_FILE_e = 0x4000005, + PROPERTY_JUMP_HDIST_DISP_e = 0x4000006, + PROPERTY_JUMP_VDIST_DISP_e = 0x4000007, + }; + /* 0x0008 */ daAlinkHIO_basic_c mBasic; /* 0x0094 */ daAlinkHIO_move_c mMove; /* 0x0120 */ daAlinkHIO_atnMove_c mAtnMove; @@ -4483,53 +4496,169 @@ public: }; enum daAlink_FTANM { - FTANM_UNK_0 = 0, - FTANM_UNK_1 = 1, - FTANM_UNK_3 = 3, - FTANM_UNK_4 = 4, - FTANM_UNK_5 = 5, - FTANM_UNK_8 = 8, - FTANM_UNK_9 = 9, - FTANM_UNK_13 = 0x13, - FTANM_UNK_14 = 0x14, - FTANM_UNK_20 = 0x20, - FTANM_UNK_21 = 0x21, - FTANM_UNK_22 = 0x22, - FTANM_UNK_23 = 0x23, - FTANM_UNK_27 = 0x27, - FTANM_UNK_2D = 0x2D, - FTANM_UNK_39 = 0x39, - FTANM_UNK_48 = 0x48, - FTANM_UNK_75 = 0x75, - FTANM_UNK_76 = 0x76, - FTANM_UNK_77 = 0x77, - FTANM_UNK_7A = 0x7A, - FTANM_UNK_7B = 0x7B, - FTANM_UNK_7C = 0x7C, - FTANM_UNK_8A = 0x8A, - FTANM_UNK_8B = 0x8B, - FTANM_UNK_8C = 0x8C, - FTANM_UNK_8D = 0x8D, - FTANM_UNK_8E = 0x8E, - FTANM_UNK_8F = 0x8F, - FTANM_UNK_90 = 0x90, - FTANM_UNK_91 = 0x91, - FTANM_UNK_92 = 0x92, - FTANM_UNK_93 = 0x93, - FTANM_UNK_95 = 0x95, - FTANM_UNK_96 = 0x96, - FTANM_UNK_97 = 0x97, - FTANM_UNK_98 = 0x98, - FTANM_UNK_99 = 0x99, - FTANM_UNK_9A = 0x9A, - FTANM_UNK_9B = 0x9B, - FTANM_UNK_9C = 0x9C, - FTANM_UNK_9D = 0x9D, - FTANM_UNK_9E = 0x9E, - FTANM_UNK_9F = 0x9F, - FTANM_UNK_A0 = 0xA0, - FTANM_UNK_A1 = 0xA1, - FTANM_UNK_A2 = 0xA2, + FTANM_0, + FTANM_MABA01, + FTANM_MABA02, + FTANM_MABA03, + FTANM_MABA01_L, + FTANM_MABA01_R, + FTANM_MABAGOMA, + FTANM_DAM01, + FTANM_FINISHA, + FTANM_ARELORD, + FTANM_ARELORDTAME, + FTANM_PUSHW, + FTANM_PULLW, + FTANM_WAITST, + FTANM_CUTST, + FTANM_A_WAITST, + FTANM_WAITHDB, + FTANM_WAITWATOWB, + FTANM_CUTUNG, + FTANM_CUTDL, + FTANM_CUTDR, + FTANM_SWIMINGA, + FTANM_SWIMP, + FTANM_SWIMDIVE, + FTANM_GRABP, + FTANM_GRABUP, + FTANM_HEAVYTHROW, + FTANM_GRABNG, + FTANM_SWAITA, + FTANM_PICKUP, + FTANM_DOOROPA, + FTANM_DOOROPB, + FTANM_CUTHLA, + FTANM_CUTHLB, + FTANM_CUTHRA, + FTANM_CUTHRB, + FTANM_CUTHTB, + FTANM_TURNBS, + FTANM_ROLLFGOOD, + FTANM_B_A, + FTANM_C_A, + FTANM_TURNBACK, + FTANM_DAMFFUP, + FTANM_DAMFBUP, + FTANM_DAMFRLUP, + FTANM_WAITATOS, + FTANM_CUTA, + FTANM_CUTL, + FTANM_CUTR, + FTANM_CUTF, + FTANM_CUTEA, + FTANM_CUTEB, + FTANM_CUTEG, + FTANM_CHANGEATOW, + FTANM_CHANGEWTOA, + FTANM_SWAITHA, + FTANM_SWIATHB, + FTANM_DASHWIND, + FTANM_CUTTB, + FTANM_CUTT, + FTANM_CUTJST, + FTANM_CUTJED, + FTANM_BINDRINKST, + FTANM_BINDRINK, + FTANM_BINDRINKED, + FTANM_BINBAD, + FTANM_BINOP, + FTANM_BINOUT, + FTANM_BINFAIRY, + FTANM_BINSWINGS, + FTANM_BINSWINGU, + FTANM_BINGET, + FTANM_I_BINGET, + FTANM_K_BINGET, + FTANM_GRASSAST, + FTANM_CATCHTAKA, + FTANM_E_A, + FTANM_BOXOPSHORT, + FTANM_BOXOPKICK, + FTANM_BOXOP, + FTANM_DIE, + FTANM_DIEH, + FTANM_SWIMDIEA, + FTANM_SWIMDIEP, + FTANM_ENTRANCE, + FTANM_COWCATCHST, + FTANM_COWTHROW_L, + FTANM_COWTHROW_R, + FTANM_DIEHUP, + FTANM_CUTRE, + FTANM_CUTU, + FTANM_CUTUED, + FTANM_CLIMBHANGMISS, + FTANM_DAMFBW, + FTANM_UNK_94, + FTANM_UNK_95, + FTANM_UNK_96, + FTANM_UNK_97, + FTANM_UNK_98, + FTANM_UNK_99, + FTANM_UNK_100, + FTANM_UNK_101, + FTANM_UNK_102, + FTANM_UNK_103, + FTANM_UNK_104, + FTANM_UNK_105, + FTANM_UNK_106, + FTANM_UNK_107, + FTANM_UNK_108, + FTANM_SPILLH, + FTANM_HANGH, + FTANM_RODSWING, + FTANM_RODSWINGL, + FTANM_GETSWL, + FTANM_TURNLS, + FTANM_TURNRS, + FTANM_KEYCATCHH, + FTANM_DEMOTALKA, + FTANM_DEMOTALKB, + FTANM_DEMOTALKC, + FTANM_CANORELEASE, + FTANM_WAITINSECT, + FTANM_I_A, + FTANM_J_A, + FTANM_K_A, + FTANM_ATDEFNG, + FTANM_DEMOMHOP, + FTANM_CUTEHST, + FTANM_CUTEH, + FTANM_CUTTJP, + FTANM_CUTTJST, + FTANM_CUTTJ, + FTANM_CUTTJED, + FTANM_UNK_133, + FTANM_UNK_134, + FTANM_UNK_135, + FTANM_ODOROKU, + FTANM_ASHIMOTO, + FTANM_UNAZUKU, + FTANM_WL_MABA01, + FTANM_WL_MABA02, + FTANM_WL_SWAITA, + FTANM_WL_SWIMP, + FTANM_WL_SWAITB, + FTANM_WL_DAM, + FTANM_WL_B_A, + FTANM_WL_DAMFFBUP, + FTANM_WL_DAMFLRUP, + FTANM_WL_WAITST, + FTANM_WL_LANDDAMA, + FTANM_WL_LANDDAMAST, + FTANM_WL_ATTACKUNG, + FTANM_WL_DASHWIND, + FTANM_WL_THROUGH, + FTANM_WL_ATTACKREST, + FTANM_WL_ATTACKREED, + FTANM_WL_DIE, + FTANM_WL_SWIMDIEA, + FTANM_WL_SWIMDIEP, + FTANM_WL_MDSHOCK, + FTANM_WL_ENTRANCE, + FTANM_WL_HOWLC, + FTANM_WL_C_A, }; enum daAlink_WARP_MAT_MODE { @@ -4685,6 +4814,7 @@ public: /* 0x90 */ WANM_PIG_GANON_THROW_LEFT_END, /* 0x91 */ WANM_PIG_GANON_THROW_RIGHT_START, /* 0x92 */ WANM_PIG_GANON_THROW_RIGHT_END, + WANM_MAX, }; enum MODE_FLG { @@ -5072,6 +5202,8 @@ public: /* 0x15D */ PROC_GLARE, /* 0x15E */ PROC_HORSE_CALL_WAIT, /* 0x15F */ PROC_QUAKE_WAIT, + + PROC_MAX, }; enum daAlink_ITEM_BTN { @@ -5104,6 +5236,14 @@ public: EFFPROC_SUMOU, EFFPROC_NONE, }; + + enum daAlink_RIDETYPE { + RIDETYPE_HORSE = 1, + RIDETYPE_BOAR, + RIDETYPE_CANOE, + RIDETYPE_BOARD, + RIDETYPE_SPINNER, + }; class firePointEff_c { public: @@ -5125,29 +5265,29 @@ public: static BOOL getE3Zhint(); static const char* getAlinkArcName(); - static bool checkStageName(char const*); - void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); - void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*); - void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*); - int jointControll(int); + static bool checkStageName(char const* i_stageName); + void tgHitCallback(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_tgObjInf, dCcD_GObjInf* i_atObjInf); + void coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj); + void setMatrixWorldAxisRot(MtxP i_mtx, s16 i_rotX, s16 i_rotY, s16 i_rotZ, BOOL, cXyz const*); + int jointControll(int i_jointNo); void setUpperFront(); - void changeBlendRate(int); + void changeBlendRate(int i_jointNo); void resetRootMtx(); - bool modelCallBack(int); - int headModelCallBack(int); - int wolfModelCallBack(int); + bool modelCallBack(int i_jointNo); + int headModelCallBack(int i_jointNo); + int wolfModelCallBack(int i_jointNo); void setHatAngle(); - void calcHairAngle(s16*); + void calcHairAngle(s16* o_angle); void setHairAngle(cXyz*, f32, f32); - void setLookPosFromOut(cXyz*); + void setLookPosFromOut(cXyz* i_pos); bool checkAttentionPosAngle(cXyz*); - bool checkActorPosAngle(fopAc_ac_c*, cXyz**); + bool checkActorPosAngle(fopAc_ac_c* i_actor, cXyz** o_ppos); cXyz* getNeckAimPos(cXyz*, int*, int); s16 getNeckAimAngle(cXyz*, s16*, s16*, s16*, s16*); void setEyeMove(cXyz*, s16, s16); void setNeckAngle(); - bool commonLineCheck(cXyz*, cXyz*); - static s16 getMoveBGActorName(cBgS_PolyInfo&, int); + bool commonLineCheck(cXyz* i_startPos, cXyz* i_endPos); + static s16 getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck); fopAc_ac_c* checkGoronRide(); void setMoveSlantAngle(); int setArmMatrix(); @@ -5157,19 +5297,19 @@ public: void footBgCheck(); void handBgCheck(); JKRHeap* setItemHeap(); - void setIdxMask(u16*, u16*); - J3DAnmTransform* getAnimeResource(daPy_anmHeap_c*, u16, u32); - J3DModel* initModel(J3DModelData*, u32, u32); - J3DModel* initModel(u16, u32); - J3DModel* initModelEnv(u16, u32); - int initDemoModel(J3DModel**, char const*, u32); - static int initDemoBck(mDoExt_bckAnm**, char const*); + void setIdxMask(u16* o_arcNo, u16* o_resIdx); + J3DAnmTransform* getAnimeResource(daPy_anmHeap_c* i_anmHeap, u16 i_resIdx, u32 i_bufSize); + J3DModel* initModel(J3DModelData* i_modelData, u32 i_mdlFlags, u32 i_diffFlags); + J3DModel* initModel(u16 i_resIdx, u32 i_diffFlags); + J3DModel* initModelEnv(u16 i_resIdx, u32 i_diffFlags); + int initDemoModel(J3DModel** i_ppmodel, char const* i_resName, u32 i_diffFlags); + static int initDemoBck(mDoExt_bckAnm** i_ppbck, char const* i_resName); int createHeap(); - void setSelectEquipItem(int); + void setSelectEquipItem(BOOL); BOOL checkBoarStart(); BOOL checkCanoeStart(); void playerInit(); - BOOL checkHorseStart(u32, int); + BOOL checkHorseStart(u32 i_lastMode, int i_startMode); int setStartProcInit(); int create(); int setRoomInfo(); @@ -5186,7 +5326,7 @@ public: void setBodyPartPos(); void setAttentionPos(); void setMatrix(); - static int simpleAnmPlay(J3DAnmBase*); + static int simpleAnmPlay(J3DAnmBase* i_anm); void setSwordPos(); void setItemMatrix(int); void setWolfItemMatrix(); @@ -5204,60 +5344,67 @@ public: void setCollisionPos(); void setCollision(); void setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, - f32 i_rate, f32 i_frame); - const daAlink_BckData* getMainBckData(daAlink_c::daAlink_ANM) const; - BOOL checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const; - BOOL checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM) const; - int getUnderUpperAnime(daAlink_c::daAlink_ANM, J3DAnmTransform**, - J3DAnmTransform**, int, u32); - void setDoubleAnimeBlendRatio(f32); - void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, - J3DAnmTransform*, f32, f32, f32, int); - int setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM, daAlink_c::daAlink_ANM, - int, f32); - void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16); - void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID); - void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anmID, f32); - void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anmID, f32 speed, f32 morf); - int setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF, - f32 morf); - int setSingleAnimeParam(daAlink_c::daAlink_ANM anmID, daAlinkHIO_anm_c const*); - void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*); + f32 i_rate, f32 i_frame); + const daAlink_BckData* getMainBckData(daAlink_c::daAlink_ANM i_anmID) const; + BOOL checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM i_anmID) const; + BOOL checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM i_anmID) const; + int getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransform** i_underBck, + J3DAnmTransform** i_upperBck, int i_anmPackID, u32 i_bufSize); + void setDoubleAnimeBlendRatio(f32 i_ratio); + void commonDoubleAnime(J3DAnmTransform* i_underBck1, J3DAnmTransform* i_upperBck1, + J3DAnmTransform* i_underBck2, J3DAnmTransform* i_upperBck2, + f32 i_blendRatio, f32 i_anmSpeed1, f32 i_anmSpeed2, int); + int setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, + daAlink_c::daAlink_ANM i_anmA, daAlink_c::daAlink_ANM i_anmB, + int param_5, f32 i_morf); + void commonSingleAnime(J3DAnmTransform* i_underBck, J3DAnmTransform* i_upperBck, + f32 i_speed, f32 i_startF, s16 i_endF); + int setSingleAnimeBase(daAlink_c::daAlink_ANM i_anmID); + int setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM i_anmID, f32 i_morf); + int setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM i_anmID, f32 i_speed, f32 i_morf); + int setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_speed, f32 i_startF, s16 i_endF, + f32 i_morf); + int setSingleAnimeParam(daAlink_c::daAlink_ANM i_anmID, const daAlinkHIO_anm_c* i_anmParams); + void animePlay(J3DAnmTransform* i_anm, daPy_frameCtrl_c* i_frameCtrl); void allAnimePlay(); - void setUpperAnimeMorf(f32); - void setUpperAnimeBase(u16); - void setUpperAnimeBaseMorf(u16, f32); - void setUpperAnimeBaseSpeed(u16, f32, f32); - int setUpperAnime(u16, daAlink_c::daAlink_UPPER, f32, f32, s16, f32); - void setUpperAnimeParam(u16, daAlink_c::daAlink_UPPER, daAlinkHIO_anm_c const*); - int resetUpperAnime(daAlink_c::daAlink_UPPER, f32); - void setUnderAnimeMorf(f32); - int setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32); - int setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*); - int resetUnderAnime(daAlink_c::daAlink_UNDER, f32); + void setUpperAnimeMorf(f32 i_morf); + void setUpperAnimeBase(u16 i_anmResIdx); + void setUpperAnimeBaseMorf(u16 i_anmResIdx, f32 i_morf); + void setUpperAnimeBaseSpeed(u16 i_anmResIdx, f32 i_speed, f32 i_morf); + int setUpperAnime(u16 i_anmResIdx, daAlink_c::daAlink_UPPER i_upperIdx, f32 i_speed, + f32 i_startFrame, s16 i_endFrame, f32 i_morf); + void setUpperAnimeParam(u16 i_anmResIdx, daAlink_c::daAlink_UPPER i_upperIdx, + const daAlinkHIO_anm_c* i_anmParam); + int resetUpperAnime(daAlink_c::daAlink_UPPER i_upperIdx, f32 i_morf); + void setUnderAnimeMorf(f32 i_morf); + int setUnderAnime(u16 i_resIdx, daAlink_c::daAlink_UNDER i_underIdx, f32 i_speed, + f32 i_startF, s16 i_endF, f32 i_morf); + int setUnderAnimeParam(u16 i_resIdx, daAlink_c::daAlink_UNDER i_underIdx, + const daAlinkHIO_anm_c* i_anmParam); + int resetUnderAnime(daAlink_c::daAlink_UNDER i_underIdx, f32 i_morf); void setOldRootQuaternion(s16, s16, s16); BOOL checkAtnLeftAnime(); BOOL checkAtnRightAnime(); f32 getMoveGroundAngleSpeedRate(); - void setBlendMoveAnime(f32); - void setBlendAtnMoveAnime(f32); - void setBlendAtnBackMoveAnime(f32); - void setFaceBck(u16, int, u16); - void setFaceBtp(u16, int, u16); - void setFaceBtk(u16, int, u16); - daAlink_FTANM setFaceBasicTexture(daAlink_c::daAlink_FTANM); - void setFaceBasicAnime(daAlink_c::daAlink_ANM); - void setFacePriTexture(daAlink_c::daAlink_FTANM); - void setFacePriAnime(daAlink_c::daAlink_ANM); + void setBlendMoveAnime(f32 i_morf); + void setBlendAtnMoveAnime(f32 i_morf); + void setBlendAtnBackMoveAnime(f32 i_morf); + void setFaceBck(u16 i_resIdx, BOOL i_isPriIdx, u16 i_arcNo); + void setFaceBtp(u16 i_resIdx, BOOL i_isPriIdx, u16 i_arcNo); + void setFaceBtk(u16 i_resIdx, BOOL i_isPriIdx, u16 i_arcNo); + daAlink_FTANM setFaceBasicTexture(daAlink_c::daAlink_FTANM i_ftanm); + void setFaceBasicAnime(daAlink_c::daAlink_ANM i_anm); + void setFacePriTexture(daAlink_c::daAlink_FTANM i_ftanm); + void setFacePriAnime(daAlink_c::daAlink_ANM i_anm); void resetFacePriBck(); void resetFacePriBtp(); void resetFacePriBtk(); void resetFacePriTexture(); void resetFacePriAnime(); void playFaceTextureAnime(); - s16 getGroundAngle(cBgS_PolyInfo*, s16); - s16 getRoofAngle(cBgS_PolyInfo*, s16); - BOOL getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int); + s16 getGroundAngle(cBgS_PolyInfo* i_polyinfo, s16 i_angle); + s16 getRoofAngle(cBgS_PolyInfo* i_polyinfo, s16 i_angle); + BOOL getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz* o_outVec, int); void setFrontWallType(); BOOL checkWaterPolygonUnder(); void setWaterY(); @@ -5267,41 +5414,41 @@ public: BOOL checkNotJumpSinkLimit(); BOOL checkNotItemSinkLimit(); void setSandShapeOffset(); - bool checkLv2MiddleBossBgRide(s16); - bool getSlidePolygon(cM3dGPla*); + bool checkLv2MiddleBossBgRide(s16 i_procName); + bool getSlidePolygon(cM3dGPla* o_tripla); BOOL checkSlope() const; - BOOL itemTriggerCheck(u8); - BOOL itemButtonCheck(u8); + BOOL itemTriggerCheck(u8 i_btnFlag); + BOOL itemButtonCheck(u8 i_btnFlag); BOOL itemButton(); BOOL itemTrigger(); BOOL spActionButton(); BOOL spActionTrigger(); BOOL midnaTalkTrigger() const; BOOL swordSwingTrigger(); - void setItemActionButtonStatus(u8); + void setItemActionButtonStatus(u8 i_status); BOOL itemActionTrigger(); void setStickData(); void setAtnList(); - void setRStatus(u8); - void setRStatusEmphasys(u8); - void setDoStatus(u8); - void setDoStatusEmphasys(u8); - void setDoStatusContinuation(u8); - void setBStatus(u8); + void setRStatus(u8 i_status); + void setRStatusEmphasys(u8 i_status); + void setDoStatus(u8 i_status); + void setDoStatusEmphasys(u8 i_status); + void setDoStatusContinuation(u8 i_status); + void setBStatus(u8 i_status); BOOL checkAtnWaitAnime(); - void setTiredVoice(daPy_frameCtrl_c*); + void setTiredVoice(daPy_frameCtrl_c* i_frameCtrl); BOOL checkRestHPAnime(); - static int getDirectionFromAngle(s16 angle); + static int getDirectionFromAngle(s16 i_angle); bool checkAttentionState(); s16 getShapeAngleYAtnActor(); bool setShapeAngleToAtnActor(int); void initServiceWaitTime(); bool checkZeroSpeedF() const; - void setNormalSpeedF(f32, f32); + void setNormalSpeedF(f32 i_speed, f32 i_deceleration); f32 getStickAngleDistanceRate(); void setSpeedAndAngleNormal(); void setSpeedAndAngleAtn(); - int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*); + int checkRequestTalkActor(dAttList_c* i_attList, fopAc_ac_c* i_actor); bool checkServiceWaitMode(); void setJumpMode(); f32 getMetamorphoseNearDis() const; @@ -5362,36 +5509,36 @@ public: void setItemAction(); BOOL checkNextActionFromCrouch(int); int checkUpperReadyThrowAnime() const; - void getBodyAngleXBasePos(cXyz*); + void getBodyAngleXBasePos(cXyz* o_pos); s16 getBodyAngleXAtnActor(int); void setBodyAngleXReadyAnime(int); - void setMagicArmorBrk(int); + void setMagicArmorBrk(int i_status); BOOL checkMagicArmorHeavy() const; - BOOL checkHeavyStateOn(int, int); + BOOL checkHeavyStateOn(BOOL, BOOL); void initGravity(); - void setSpecialGravity(f32, f32, int); + void setSpecialGravity(f32 i_gravity, f32 i_speed, BOOL i_isOffFlag); void transAnimeProc(cXyz*, f32, f32); void setFootSpeed(); void posMove(); void autoGroundHit(); bool startPeepChange(); - void setLastSceneDamage(int, u32*); + void setLastSceneDamage(int i_dmgAmount, u32* o_mode); void setLastSceneMode(u32*); - int startRestartRoom(u32, int, int, int); + int startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, BOOL i_isEventRun); BOOL checkCoachGuardGame(); void checkRoofRestart(); BOOL checkRestartRoom(); s16 getSceneExitMoveAngle(); int checkSceneChange(int i_exitID); - void voiceStartLevel(u32); - void seStartSwordCut(u32); - void seStartMapInfo(u32); - void seStartMapInfoLevel(u32); - void setBasAnime(daAlink_c::daAlink_UNDER); + void voiceStartLevel(u32 i_soundID); + void seStartSwordCut(u32 i_soundID); + void seStartMapInfo(u32 i_soundID); + void seStartMapInfoLevel(u32 i_soundID); + void setBasAnime(daAlink_c::daAlink_UNDER i_underIdx); void initBasAnime(); void resetBasAnime(); - BOOL checkSightLine(f32, cXyz*); - void setMetamorphoseModel(int); + BOOL checkSightLine(f32 i_maxDist, cXyz* o_sightPos); + void setMetamorphoseModel(BOOL i_isChangeToWolf); void keepItemData(); void returnKeepItemData(); BOOL setItemModel(); @@ -5399,15 +5546,15 @@ public: void makeItemType(); BOOL checkZoraWearAbility() const; BOOL checkMagicArmorWearAbility() const; - J3DModelData* loadAramBmd(u16, u32); - void* loadAram(u16, u32); - J3DAnmTevRegKey* loadAramItemBrk(u16, J3DModel*); - J3DAnmTextureSRTKey* loadAramItemBtk(u16, J3DModel*); - J3DAnmTexPattern* loadAramItemBtp(u16, J3DModel*); - void changeItemBck(u16, f32); - int checkGroupItem(int, int) const; - int checkSetItemTrigger(int); - int checkItemSetButton(int); + J3DModelData* loadAramBmd(u16 i_resIdx, u32 i_bufSize); + void* loadAram(u16 i_resIdx, u32 i_bufSize); + J3DAnmTevRegKey* loadAramItemBrk(u16 i_resIdx, J3DModel* i_model); + J3DAnmTextureSRTKey* loadAramItemBtk(u16 i_resIdx, J3DModel* i_model); + J3DAnmTexPattern* loadAramItemBtp(u16 i_resIdx, J3DModel* i_model); + void changeItemBck(u16 i_resIdx, f32); + BOOL checkGroupItem(int i_itemNo, int i_selItem) const; + int checkSetItemTrigger(int i_itemNo); + int checkItemSetButton(int i_itemNo); static bool checkField(); static bool checkBossRoom(); static bool checkDungeon(); @@ -5420,16 +5567,16 @@ public: static bool checkNotBattleStage(); static bool checkNotHeavyBootsStage(); static bool checkNotAutoJumpStage(); - static bool checkCastleTownUseItem(u16); - int changeItemTriggerKeepProc(u8, int); - int checkNewItemChange(u8); - void deleteEquipItem(int playSound, int deleteKantera); + static bool checkCastleTownUseItem(u16 i_itemNo); + int changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType); + int checkNewItemChange(u8 i_selItemIdx); + void deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera); void setLight(); void setFrontRollCrashShock(u8); - void changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE); - void commonProcInit(daAlink_c::daAlink_PROC procID); - BOOL commonProcInitNotSameProc(daAlink_PROC procID); - int procPreActionUnequipInit(int, fopAc_ac_c*); + void changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE i_matMode); + void commonProcInit(daAlink_c::daAlink_PROC i_procID); + BOOL commonProcInitNotSameProc(daAlink_PROC i_procID); + int procPreActionUnequipInit(int i_procAfter, fopAc_ac_c*); int procPreActionUnequip(); int procServiceWaitInit(); int procServiceWait(); @@ -5449,7 +5596,7 @@ public: int procWaitTurn(); int procMoveTurnInit(int); int procMoveTurn(); - int procSideStepInit(int); + int procSideStepInit(int i_jumpDirection); int procSideStep(); int procSideStepLandInit(); int procSideStepLand(); @@ -5478,7 +5625,7 @@ public: int procDiveJump(); int procRollJumpInit(); int procRollJump(); - int procFallInit(int, f32); + int procFallInit(int, f32 i_morf); int procFall(); int procLandInit(f32); int procLand(); @@ -5494,7 +5641,7 @@ public: int procCoMetamorphoseOnly(); int procFloorDownReboundInit(); int procFloorDownRebound(); - int procGoronRideWaitInit(fopAc_ac_c*); + int procGoronRideWaitInit(fopAc_ac_c* i_goronActor); int procGoronRideWait(); int execute(); void setDrawHand(); @@ -5504,8 +5651,8 @@ public: int initShadowScaleLight(); int moveShadowScaleLight(); void shadowDraw(); - void modelCalc(J3DModel*); - void basicModelDraw(J3DModel*); + void modelCalc(J3DModel* i_model); + void basicModelDraw(J3DModel* i_model); void modelDraw(J3DModel*, int); void setWaterDropColor(J3DGXColorS10 const*); void initTevCustomColor(); @@ -5514,12 +5661,12 @@ public: bool checkNoSubjectModeCamera(); bool acceptSubjectModeChange(); int checkSubjectAction(); - s16 checkBodyAngleX(s16); + s16 checkBodyAngleX(s16 i_angle); BOOL setBodyAngleToCamera(); void setSubjectMode(); BOOL subjectCancelTrigger(); - int checkSubjectEnd(int); - void searchPeepObj(fopAc_ac_c*, void*); + BOOL checkSubjectEnd(BOOL i_isPlaySe); + void searchPeepObj(fopAc_ac_c* i_actor, void* i_data); int procCoSubjectivityInit(); int procCoSubjectivity(); int procCoSwimSubjectivityInit(); @@ -5549,23 +5696,24 @@ public: BOOL checkCutTypeNoBlur() const; bool checkCutTurnInput() const; int getCutTurnDirection() const; - void resetCombo(int); + void resetCombo(int i_resetRunCut); void checkComboCnt(); - void setCutType(u8); - void setCylAtParam(u32, dCcG_At_Spl, u8, u8, int, f32, f32); + void setCutType(u8 i_type); + void setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, + f32 i_radius, f32 i_height); void setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, - f32 param_4, f32 i_radius); - static BOOL notSwordHitVibActor(fopAc_ac_c*); - BOOL setSwordHitVibration(dCcD_GObjInf*); - BOOL checkAtShieldHit(dCcD_GObjInf&); - BOOL checkCutReverseAt(dCcD_GObjInf*); - BOOL changeCutReverseProc(daAlink_c::daAlink_ANM); + f32 param_4, f32 i_radius); + static BOOL notSwordHitVibActor(fopAc_ac_c* i_actor); + BOOL setSwordHitVibration(dCcD_GObjInf* i_gobj); + BOOL checkAtShieldHit(dCcD_GObjInf& i_gobj); + BOOL checkCutReverseAt(dCcD_GObjInf* i_gobj); + BOOL changeCutReverseProc(daAlink_c::daAlink_ANM i_anmID); void setCutDash(int, int); BOOL checkForceSwordSwing(); void setComboReserb(); BOOL checkComboReserb(); int commonCutAction(); - void setSwordVoiceSe(u32); + void setSwordVoiceSe(u32 i_seID); void setSwordChargeVoiceSe(); void setSwordComboVoice(); bool checkCutTurnInputTrigger(); @@ -5580,18 +5728,18 @@ public: void cancelCutCharge(); void initCutAtnActorSearch(); void checkCutAtnActorChange(); - void setCutJumpSpeed(int); - int procCutNormalInit(int); + void setCutJumpSpeed(BOOL i_isAirCut); + int procCutNormalInit(int i_type); int procCutNormal(); - int procCutFinishInit(int); + int procCutFinishInit(int i_type); int procCutFinish(); int procCutFinishJumpUpInit(); int procCutFinishJumpUp(); int procCutFinishJumpUpLandInit(); int procCutFinishJumpUpLand(); - int procCutReverseInit(daAlink_c::daAlink_ANM); + int procCutReverseInit(daAlink_c::daAlink_ANM i_anmID); int procCutReverse(); - int procCutJumpInit(int); + int procCutJumpInit(BOOL i_isAirCut); int procCutJump(); int procCutJumpLandInit(int); int procCutJumpLand(); @@ -5603,7 +5751,7 @@ public: int procCutTurnMove(); int procCutDownInit(); int procCutDown(); - int procCutDownLandInit(fopEn_enemy_c*); + int procCutDownLandInit(fopEn_enemy_c* i_enemy); int procCutDownLand(); int procCutHeadInit(); int procCutHead(); @@ -5625,33 +5773,33 @@ public: BOOL checkNoLandDamageSlidePolygon(); void checkCutLandDamage(); BOOL checkCaughtEscapeCutTurn(); - f32 damageMagnification(int i_checkZoraMag, int); - int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int); - void setDamagePointNormal(int); - void setLandDamagePoint(int); + f32 damageMagnification(BOOL i_checkZoraMag, int); + int setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDmgTimer, int); + int setDamagePointNormal(int i_dmgAmount); + int setLandDamagePoint(int i_dmgAmount); cXyz* getDamageVec(dCcD_GObjInf*); void setDashDamage(); static BOOL checkIcePolygonDamage(cBgS_PolyInfo*); BOOL checkMagicArmorNoDamage(); int checkPolyDamage(); - BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**); + BOOL checkElecReturnDamage(dCcD_GObjInf& i_obj, fopAc_ac_c** o_hitActor); void damageTimerCount(); - bool checkHugeAttack(int) const; - bool checkLargeAttack(int) const; + bool checkHugeAttack(int i_atSpl) const; + bool checkLargeAttack(int i_atSpl) const; BOOL checkDamageAction(); - int procDamageInit(dCcD_GObjInf*, int); + int procDamageInit(dCcD_GObjInf* i_tgObj, int); int procDamage(); - int procCoLargeDamageInit(int, int, s16, s16, dCcD_GObjInf*, int); + int procCoLargeDamageInit(int i_type, BOOL i_isLargeDmg, s16, s16, dCcD_GObjInf* i_hitObj, int); int procCoLargeDamage(); - int procLargeDamageUpInit(int, int, s16, s16); + int procLargeDamageUpInit(int i_type, BOOL i_isLargeDmg, s16, s16); int procLargeDamageUp(); - int procCoLargeDamageWallInit(int, int, s16, s16); + int procCoLargeDamageWallInit(int i_type, BOOL i_isLargeDmg, s16, s16); int procCoLargeDamageWall(); int procCoPolyDamageInit(); int procCoPolyDamage(); int procLandDamageInit(int); int procLandDamage(); - int procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int); + int procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tgHitObj, int i_atSpl); int procCoElecDamage(); int procStEscapeInit(); int procStEscape(); @@ -5662,7 +5810,7 @@ public: int procScreamWait(); int procCoSandWallHitInit(); int procCoSandWallHit(); - int procCoLavaReturnInit(int); + int procCoLavaReturnInit(BOOL i_isSandReturn); int procCoLavaReturn(); int procCoSwimFreezeReturnInit(); int procCoSwimFreezeReturn(); @@ -5680,9 +5828,9 @@ public: BOOL checkGuardAccept(); void setUpperGuardAnime(f32); void setShieldGuard(); - void setGuardSe(dCcD_GObjInf*); - void setSmallGuard(dCcD_GObjInf*); - int procGuardSlipInit(int, dCcD_GObjInf*); + void setGuardSe(dCcD_GObjInf* i_objinf); + void setSmallGuard(dCcD_GObjInf* i_objinf); + int procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf); int procGuardSlip(); int procGuardAttackInit(); int procGuardAttack(); @@ -5690,14 +5838,14 @@ public: int procGuardBreak(); int procTurnMoveInit(int); int procTurnMove(); - void getArrowFlyData(f32*, f32*, int) const; + void getArrowFlyData(f32* o_distance, f32* o_speed, BOOL i_forceCharge) const; f32 getArrowIncAtR() const; s16 getBombArrowFlyExplodeTime() const; f32 getArrowIncAtMaxStart() const; f32 getArrowIncAtMax() const; - BOOL checkBowAndSlingItem(int); + BOOL checkBowAndSlingItem(int i_itemNo); void setSlingModel(); - cXyz* checkBowCameraArrowPosP(s16*, s16*); + cXyz* checkBowCameraArrowPosP(s16* o_angleX, s16* o_angleY); BOOL checkBowReadyAnime() const; BOOL checkBowAnime() const; void makeArrow(); @@ -5780,8 +5928,8 @@ public: int procCopyRodRevive(); void concatMagneBootMtx(); void concatMagneBootInvMtx(); - void multVecMagneBootInvMtx(cXyz*); - bool commonMagneLineCheck(cXyz*, cXyz*); + void multVecMagneBootInvMtx(cXyz* o_dst); + bool commonMagneLineCheck(cXyz* i_start, cXyz* i_end); BOOL checkBootsMoveAnime(int); int setHeavyBoots(int); s16 getMagneBootsLocalAngleY(s16, int); @@ -5825,9 +5973,9 @@ public: void initGrabNextMode(); void setGrabItemThrow(); BOOL checkUpperGrabItemThrow(f32); - void putObjLineCheck(dBgS_LinChk&, cXyz*, fopAc_ac_c*); - bool grabLineCheck(cXyz*, cXyz*); - void setGrabItemActor(fopAc_ac_c*); + void putObjLineCheck(dBgS_LinChk& i_linchk, cXyz* i_endpos, fopAc_ac_c* i_objActor); + bool grabLineCheck(cXyz* i_start, cXyz* i_end); + void setGrabItemActor(fopAc_ac_c* i_actor); int procGrabReadyInit(); int procGrabReady(); int procGrabUpInit(); @@ -5843,7 +5991,7 @@ public: int procGrabRebound(); int procGrabStandInit(); int procGrabStand(); - BOOL checkInsectActorName(fopAc_ac_c*); + BOOL checkInsectActorName(fopAc_ac_c* i_insectActor); int procInsectCatchInit(); int procInsectCatch(); int procPickUpInit(); @@ -5859,15 +6007,15 @@ public: int procFmChainUp(); int procFmChainStrongPullInit(); int procFmChainStrongPull(); - void setWallGrabStatus(u8, u8); + void setWallGrabStatus(u8 i_status, u8 i_flag); int getWallGrabStatus(); BOOL wallGrabTrigger(); BOOL wallGrabButton(); - int setPushPullKeepData(dBgW_Base::PushPullLabel, int); + int setPushPullKeepData(dBgW_Base::PushPullLabel i_label, BOOL); BOOL checkPushPullTurnBlock(); BOOL checkPullBehindWall(); void offGoatStopGame(); - BOOL checkGoatCatchActor(fopAc_ac_c*); + BOOL checkGoatCatchActor(fopAc_ac_c* i_actor); f32 getGoatCatchDistance2(); int endPushPull(); f32 getPushPullAnimeSpeed(); @@ -5877,10 +6025,10 @@ public: int procCoPushMove(); int procPullMoveInit(int); int procPullMove(); - void setGoatStopGameFail(fopAc_ac_c*); + void setGoatStopGameFail(fopAc_ac_c* i_actor); int procGoatMoveInit(); int procGoatMove(); - int procGoatCatchInit(fopAc_ac_c*, f32); + int procGoatCatchInit(fopAc_ac_c* i_actor, f32); int procGoatCatch(); int procGoatStrokeInit(); int procGoatStroke(); @@ -5896,7 +6044,7 @@ public: int procSumouMove(); int procSumouSideMoveInit(); int procSumouSideMove(); - int procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int unused); + int procSumouActionInit(BOOL i_isDoTrigger, BOOL i_isPunchTrigger, int unused); int procSumouAction(); int procSumouStaggerInit(); int procSumouStagger(); @@ -5921,9 +6069,9 @@ public: BOOL checkHorseLieAnime() const; BOOL checkHorseSubjectivity() const; void setHorseSwordUpAnime(); - void setHorseTurnUpperAnime(int); + void setHorseTurnUpperAnime(BOOL i_isTurnL); BOOL checkHorseNoUpperAnime() const; - void getHorseReinHandPos(cXyz*, cXyz*); + void getHorseReinHandPos(cXyz* o_handPosA, cXyz* o_handPosB); BOOL checkHorseNotGrab() const; void setHorseStirrup(); void changeBoarRunRide(); @@ -5932,7 +6080,7 @@ public: int setSyncBoarRunPos(); BOOL setSyncRidePos(); void setHorseTurnAnime(); - void getBaseHorseAnime(daAlink_c::daAlink_ANM*); + void getBaseHorseAnime(daAlink_c::daAlink_ANM* i_anmList); int checkHorseSpecialProc(); BOOL checkHorseServiceWaitAnime(); int setSyncHorse(int); @@ -5945,7 +6093,7 @@ public: void setHorseSwordUp(int); int setRideSubjectAngle(s16); void setBodyAngleRideReadyAnime(); - BOOL checkHorseGetOffWallCheck(cXyz*, cXyz*, s16); + BOOL checkHorseGetOffWallCheck(cXyz* i_lineStartPos, cXyz* i_lineEndPos, s16); int checkHorseGetOffDirection(); void boarForceGetOff(); void horseGetOffEnd(); @@ -5973,7 +6121,7 @@ public: int procHorseCutChargeReady(); int procHorseCutTurnInit(); int procHorseCutTurn(); - int procHorseDamageInit(dCcD_GObjInf*); + int procHorseDamageInit(dCcD_GObjInf* i_hitObj); int procHorseDamage(); int procHorseBowSubjectInit(); int procHorseBowSubject(); @@ -5989,7 +6137,7 @@ public: int procHorseHookshotSubject(); int procHorseHookshotMoveInit(); int procHorseHookshotMove(); - int procHorseBottleDrinkInit(u16); + int procHorseBottleDrinkInit(u16 i_itemNo); int procHorseBottleDrink(); int procHorseKandelaarPourInit(); int procHorseKandelaarPour(); @@ -5997,7 +6145,7 @@ public: int procHorseComeback(); int procHorseRunInit(); int procHorseRun(); - int procHorseHangInit(dCcD_GObjInf*, int); + int procHorseHangInit(dCcD_GObjInf* i_hitObj, BOOL i_isPlaySE); int procHorseHang(); int procHorseGetKeyInit(); int procHorseGetKey(); @@ -6015,21 +6163,21 @@ public: BOOL checkFishingRodAndLureItem() const; void initFishingRodHand(); MtxP getCanoePaddleMatrix(); - BOOL checkFishingRodGrab(fopAc_ac_c*) const; - BOOL checkCanoePaddleGrab(fopAc_ac_c*) const; + BOOL checkFishingRodGrab(fopAc_ac_c* i_actor) const; + BOOL checkCanoePaddleGrab(fopAc_ac_c* i_actor) const; BOOL checkCanoeFishingRodGrabOrPut() const; void initCanoeRide(); BOOL checkCanoeJumpRide(); void setArmReelAnime(); void setFishingWaitAction(); void setFishGetFace(); - void setRideCanoeBasePos(fopAc_ac_c*); + void setRideCanoeBasePos(fopAc_ac_c* i_canoeActor); void setSyncCanoePos(); int canoeCommon(); int checkNextActionCanoe(); int procCanoeRideInit(); int procCanoeRide(); - int procCanoeJumpRideInit(fopAc_ac_c*); + int procCanoeJumpRideInit(fopAc_ac_c* i_canoeActor); int procCanoeJumpRide(); int procCanoeGetOffInit(); int procCanoeGetOff(); @@ -6067,7 +6215,7 @@ public: int procCanoeHookshotSubject(); int procCanoeHookshotMoveInit(); int procCanoeHookshotMove(); - int procCanoeBottleDrinkInit(u16); + int procCanoeBottleDrinkInit(u16 i_itemNo); int procCanoeBottleDrink(); int procCanoeKandelaarPourInit(); int procCanoeKandelaarPour(); @@ -6089,20 +6237,20 @@ public: BOOL checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int); void setCrawlMoveHoll(); void setCrawlMoveAngle(); - void stopHalfMoveAnime(f32); + void stopHalfMoveAnime(f32 i_frame); void setCrawlAutoMoveAimPos(); int procCrawlStartInit(); int procCrawlStart(); - int procCrawlMoveInit(s16, s16); + int procCrawlMoveInit(s16 i_angleX, s16 i_angleZ); int procCrawlMove(); int procCrawlAutoMoveInit(int, cXyz*); int procCrawlAutoMove(); - int procCrawlEndInit(int, s16, s16); + int procCrawlEndInit(int, s16 i_angleX, s16 i_angleZ); int procCrawlEnd(); f32 getHangMoveAnmSpeed(); int getHangDirectionFromAngle(); BOOL hangMoveBgCheck(s16, cXyz*); - BOOL changeHangMoveProc(int); + BOOL changeHangMoveProc(int i_direction); bool checkHangFootWall(); void setHangGroundY(); int changeHangEndProc(); @@ -6128,7 +6276,7 @@ public: int setDragonHangPos(); int setOctaIealHangPos(); int setBossBodyHangPos(); - int procBossBodyHangInit(fopAc_ac_c*); + int procBossBodyHangInit(fopAc_ac_c* i_actor); int procBossBodyHang(); int getLadderUnitCount() const; int setLadderInit(); @@ -6150,18 +6298,18 @@ public: int procLadderMove(); f32 getClimbMoveUpDownAnmSpeed(); f32 getClimbMoveSideAnmSpeed(); - BOOL checkClimbCode(cBgS_PolyInfo&); + BOOL checkClimbCode(cBgS_PolyInfo& i_polyinfo); BOOL setClimbInit(); void setClimbShapeOffset(); int getClimbDirectionFromAngle(); void changeClimbMoveProc(int); - BOOL checkClimbMoveUpDownProc(int); - BOOL checkClimbMoveSideProc(int); + BOOL checkClimbMoveUpDownProc(int i_direction); + BOOL checkClimbMoveSideProc(int i_direction); int setMoveBGClimbCorrect(); - int checkBgCorrectClimbMove(cXyz*, cXyz*); + int checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos); BOOL checkClimbRoof(f32); int checkClimbGround(cXyz*, f32); - BOOL checkBgClimbMove(int); + BOOL checkBgClimbMove(int i_direction); int setClimbStartNotGround(); int procClimbUpStartInit(int); int procClimbUpStart(); @@ -6177,7 +6325,7 @@ public: int procClimbToRoof(); f32 getRoofHangFMoveAnmSpeed() const; f32 getRoofHangSMoveAnmSpeed() const; - void setRoofHangHandOnSE(cBgS_PolyInfo*); + void setRoofHangHandOnSE(cBgS_PolyInfo* unused); int checkRoofHangMovePos(); int commonRoofHangProc(); int checkNextActionRoofHang(); @@ -6192,10 +6340,10 @@ public: int procRoofHangTurnInit(); int procRoofHangTurn(); void setRoofHangSwitch(); - int procRoofSwitchHangInit(fopAc_ac_c*); + int procRoofSwitchHangInit(fopAc_ac_c* i_actor); int procRoofSwitchHang(); BOOL checkZoraWearMaskDraw(); - BOOL checkAcceptUseItemInWater(u16) const; + BOOL checkAcceptUseItemInWater(u16 i_itemNo) const; void swimDeleteItem(); bool getZoraSwim() const; f32 getSwimFrontMaxSpeed() const; @@ -6203,7 +6351,7 @@ public: void checkOxygenTimer(); void offOxygenTimer(); BOOL checkPossibleWaterInMode() const; - void setWaterInAnmRate(daPy_frameCtrl_c*, f32); + void setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate); void swimBgCheck(f32); void setSpeedAndAngleSwim(); int checkNextActionSwim(); @@ -6231,29 +6379,29 @@ public: int procSwimHookshotSubject(); int procSwimHookshotMoveInit(); int procSwimHookshotMove(); - int procSwimDamageInit(dCcD_GObjInf*); + int procSwimDamageInit(dCcD_GObjInf* i_hitObj); int procSwimDamage(); int procOctaIealSpitInit(); int procOctaIealSpit(); bool checkSnowCode() const; - static bool checkSnowCodePolygon(cBgS_PolyInfo&); + static bool checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo); bool checkBoardRestart(); - int boardCommon(int); - void setCommonBoardAnime(int); + int boardCommon(BOOL i_canMove); + void setCommonBoardAnime(BOOL i_isRideFront); int checkNextActionBoard(); int checkBoardSwordTriggerAction(); - int commonProcBoardInit(daAlink_c::daAlink_PROC); + int commonProcBoardInit(daAlink_c::daAlink_PROC i_procID); f32 getBoardRowAnmSpeed(); void setBoardLandAnime(); int procBoardRideInit(); int procBoardRide(); - int procBoardWaitInit(fopAc_ac_c*); + int procBoardWaitInit(fopAc_ac_c* i_boardActor); int procBoardWait(); int procBoardRowInit(); int procBoardRow(); int procBoardTurnInit(); int procBoardTurn(); - int procBoardJumpInit(f32, int); + int procBoardJumpInit(f32 i_jumpSpeed, BOOL i_isNoSpeed); int procBoardJump(); int procBoardSubjectivityInit(); int procBoardSubjectivity(); @@ -6261,11 +6409,11 @@ public: int procBoardCut(); int procBoardCutTurnInit(); int procBoardCutTurn(); - void hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + void hookshotAtHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf); void resetHookshotMode(); - BOOL setEnemyBombHookshot(fopAc_ac_c*); + BOOL setEnemyBombHookshot(fopAc_ac_c* i_actor); bool checkLv7BossRoom(); - BOOL checkHookshotStickBG(cBgS_PolyInfo&); + BOOL checkHookshotStickBG(cBgS_PolyInfo& i_polyinfo); void cancelHookshotCarry(); void changeHookshotDrawModel(); BOOL checkHookshotRoofLv7Boss(); @@ -6280,7 +6428,7 @@ public: bool cancelHookshotMove(); BOOL checkHookshotReadyMaterialOffMode() const; void setHookshotReadyMaterial(); - int initHookshotUpperAnimeSpeed(int); + int initHookshotUpperAnimeSpeed(BOOL); void initHookshotReady(); void setHookshotReadyAnime(); int checkUpperItemActionHookshot(); @@ -6292,7 +6440,7 @@ public: void setHookshotRoofWaitAnime(); void setHookshotWallWaitAnime(); void hookshotRoofTurn(); - void initHookshotRoofWaitActor(fopAc_ac_c*); + void initHookshotRoofWaitActor(fopAc_ac_c* i_actor); int checkNextHookPoint(); int checkLandHookshotHang(); int commonHookshotRoofWait(); @@ -6327,21 +6475,21 @@ public: void setSpinnerSyncPos(); int procSpinnerReadyInit(); int procSpinnerReady(); - void setSpinnerStatus(u8, u8); + void setSpinnerStatus(u8 i_status, u8 i_flag); int procSpinnerWaitInit(); int procSpinnerWait(); int bottleModelCallBack(); - BOOL checkOilBottleItemNotGet(u16); - void setBottleModel(u16); - int commonBottleDrink(int); - fopAc_ac_c* makeFairy(cXyz*, u32); - int procBottleDrinkInit(u16); + BOOL checkOilBottleItemNotGet(u16 i_itemNo); + void setBottleModel(u16 i_itemNo); + int commonBottleDrink(BOOL); + fopAc_ac_c* makeFairy(cXyz* i_pos, u32 i_params); + int procBottleDrinkInit(u16 i_itemNo); int procBottleDrink(); - int procBottleOpenInit(u16); + int procBottleOpenInit(u16 i_itemNo); int procBottleOpen(); - int procBottleSwingInit(fopAc_ac_c*, int); + int procBottleSwingInit(fopAc_ac_c* i_catchActor, int); int procBottleSwing(); - int procBottleGetInit(int); + int procBottleGetInit(BOOL); int procBottleGet(); BOOL checkWaterInKandelaarOffset(f32); void checkWaterInKandelaar(f32); @@ -6358,7 +6506,7 @@ public: int procKandelaarSwing(); int procKandelaarPourInit(); int procKandelaarPour(); - void setGrassWhistleModel(int); + void setGrassWhistleModel(int i_modelType); void setHorseWhistleModel(); int procGrassWhistleGetInit(); int procGrassWhistleGet(); @@ -6395,10 +6543,10 @@ public: int procIronBallReturnInit(); int procIronBallReturn(); BOOL checkEventRun() const; - void createNpcTks(cXyz*, int, u32); + void createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters); int checkDemoAction(); - bool checkDemoMoveMode(u32) const; - void setDemoMoveData(u32*, cXyz const*); + bool checkDemoMoveMode(u32 i_mode) const; + void setDemoMoveData(u32* o_mode, cXyz const* i_goal); void setNoDrawSwordShield(int, u16); void setDemoData(); void resetDemoBck(); @@ -6407,27 +6555,28 @@ public: void endDemoMode(); fopAc_ac_c* getDemoLookActor(); BOOL checkFlyAtnWait(); - void setGetItemFace(u16); - BOOL checkGrabTalkActor(fopAc_ac_c*); + void setGetItemFace(u16 i_itemNo); + BOOL checkGrabTalkActor(fopAc_ac_c* i_actor); int setTalkStartBack(cXyz*); void setShapeAngleToTalkActor(); void setTalkAnime(); u8 setTradeItemAnime(); void setTradeItemOutHand(); - BOOL checkEndMessage(u32); + BOOL checkEndMessage(u32 i_msgIdx); u8 setDemoRightHandIndex(u16); u8 setDemoLeftHandIndex(u16); void setDemoRide(u16); - void setDemoBodyBck(dDemo_actor_c*, u16); + void setDemoBodyBck(dDemo_actor_c* i_demoActor, u16 i_resIdx); static BOOL checkFinalBattle(); - BOOL checkRestartDead(int, int); + BOOL checkRestartDead(int i_dmgAmount, BOOL i_checkZoraMag); void setDeadRideSyncPos(); BOOL checkDeadHP(); BOOL checkDeadAction(int); - void setHighModelBck(mDoExt_bckAnm*, u16); - void setHighModelFaceBtk(u16); - void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16); - f32 setStickAnmData(J3DAnmBase*, int, int, u16, int); + void setHighModelBck(mDoExt_bckAnm* i_bck, u16 i_resIdx); + void setHighModelFaceBtk(u16 i_resIdx); + void setDemoBrk(J3DAnmTevRegKey** o_ppbrk, J3DModel* i_model, u16 i_resIdx); + f32 setStickAnmData(J3DAnmBase* i_anm, int i_arg1, int i_arg2, u16 i_resIdx, + int i_stickDirection); int procDemoCommon(); int procCoToolDemoInit(); int procCoToolDemo(); @@ -6437,7 +6586,7 @@ public: int procCoOpenTreasure(); int procCoUnequipInit(); int procCoUnequip(); - void setGetSubBgm(int); + void setGetSubBgm(int i_itemNo); int procCoGetItemInit(); int procCoGetItem(); int procCoTurnBackInit(); @@ -6488,8 +6637,8 @@ public: int procLookAroundTurn(); int procTradeItemOutInit(); int procTradeItemOut(); - static BOOL checkLetterItem(int); - int procNotUseItemInit(int); + static BOOL checkLetterItem(int i_itemNo); + int procNotUseItemInit(int i_itemNo); int procNotUseItem(); int procSwordReadyInit(); int procSwordReady(); @@ -6519,13 +6668,15 @@ public: int procCoWarp(); int commonWaitTurnInit(); int commonGrabPutInit(); - int commonLargeDamageUpInit(int, int, s16, s16); + int commonLargeDamageUpInit(int i_type, BOOL i_isLargeDmg, s16, s16); int commonFallInit(int); - JPABaseEmitter* setEmitter(u32*, u16, cXyz const*, csXyz const*); - JPABaseEmitter* setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*, - csXyz const*); - JPABaseEmitter* setEmitterColor(u32*, u16, cXyz const*, csXyz const*); - void stopDrawParticle(u32); + JPABaseEmitter* setEmitter(u32* i_emitterId, u16 i_effName, cXyz const* i_pos, + csXyz const* i_rotation); + JPABaseEmitter* setEmitterPolyColor(u32* i_emitterId, u16 i_effName, cBgS_PolyInfo& i_polyinfo, cXyz const*, + csXyz const*); + JPABaseEmitter* setEmitterColor(u32* i_emitterId, u16 i_effName, cXyz const* i_pos, + csXyz const* i_rotation); + void stopDrawParticle(u32 i_emitterId); void setEffectFrontRollParam(); void setEffectSlipParam(); void setEffectRunParam(); @@ -6534,10 +6685,10 @@ public: void setEffectSumouParam(); void setFootEffectProcType(int); void setWolfFootOn(int); - void setFootMark(cXyz*, u16, int); + void setFootMark(cXyz* i_pos, u16 i_mtxNo, int); void setEffect(); void setSumouEffect(); - void setWaterfallEffect(cXyz const*, u32*); + void setWaterfallEffect(const cXyz* i_pos, u32* i_emitterId); void setWaterfallEffect(); void setMagneBootsEffect(); void setSwordChargeEffect(); @@ -6553,7 +6704,7 @@ public: void setWolfSwimEndEffect(JPABaseEmitter**, JPABaseEmitter**); void setWolfLockAttackEffect(); void setWolfJumpAttackEffect(); - void setWolfBarrierHitEffect(dBgS_LinChk&); + void setWolfBarrierHitEffect(dBgS_LinChk& i_linchk); void setCutWaterDropEffect(); void setWaterDropEffect(); void setSwordUpColorEffect(); @@ -6563,9 +6714,9 @@ public: void setRunSplash(); void resetFairyEffect(); void setBottleEffect(); - void clearFirePointDamageEffect(int); + void clearFirePointDamageEffect(int i_effNo); void initFirePointDamageEffectAll(); - void initFirePointDamageEffect(cXyz const*, dCcD_GObjInf*); + void initFirePointDamageEffect(cXyz const*, dCcD_GObjInf* i_hitObj); void setFirePointDamageEffect(); void setFreezeEffect(); void setWoodShieldBurnEffect(); @@ -6577,9 +6728,9 @@ public: void onWolfEyeUp(); void offWolfEyeUp(); BOOL wolfSenseTrigger(); - void setWolfSenceStatus(u8); + void setWolfSenceStatus(u8 i_status); BOOL wolfClawTrigger(); - void setWolfDigStatus(u8); + void setWolfDigStatus(u8 i_flag); BOOL checkWolfShapeReverse() const; BOOL checkWolfSideStep() const; void setWolfTailAngle(); @@ -6587,20 +6738,22 @@ public: void setSpeedAndAngleWolf(); void setSpeedAndAngleWolfAtn(); BOOL checkWolfAtnWait(); - BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const; + BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM i_anm) const; void setBlendWolfMoveAnime(f32); BOOL checkWolfAtnMoveBack(s16); void setWolfAtnMoveDirection(); void setBlendWolfAtnMoveAnime(f32); void setBlendWolfAtnBackMoveAnime(f32); int setDoubleAnimeWolf(f32, f32, f32, daAlink_c::daAlink_WANM, - daAlink_c::daAlink_WANM, int, f32); - void setSingleAnimeWolfBase(daAlink_c::daAlink_WANM); - void setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM, f32); - void setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM, f32, f32); - int setSingleAnimeWolf(daAlink_c::daAlink_WANM, f32, f32, s16, f32); - void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM, daAlinkHIO_anm_c const*); - int checkWolfLandAction(int); + daAlink_c::daAlink_WANM, int, f32); + void setSingleAnimeWolfBase(daAlink_c::daAlink_WANM i_anmID); + void setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM i_anmID, f32 i_morf); + void setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, f32 i_morf); + int setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, f32 i_start, + s16 i_endFrame, f32 i_morf); + void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM i_anmID, + daAlinkHIO_anm_c const* i_anmData); + int checkWolfLandAction(BOOL); BOOL checkMidnaUseAbility() const; void checkWolfUseAbility(); int checkWolfGroundSpecialMode(); @@ -6608,7 +6761,7 @@ public: BOOL wolfSideBgCheck(s16); BOOL checkWolfAttackReverse(int); int checkWolfBarrierHitReverse(); - BOOL checkWolfBarrierWallHit(cBgS_PolyInfo&); + BOOL checkWolfBarrierWallHit(cBgS_PolyInfo& i_polyinfo); void wolfBgCheck(); void changeWolfBlendRate(int); void setWolfFootMatrix(); @@ -6648,7 +6801,7 @@ public: int procWolfHowl(); int procWolfAutoJumpInit(int); int procWolfAutoJump(); - int procWolfFallInit(int, f32); + int procWolfFallInit(int, f32 i_morf); int procWolfFall(); int procWolfLandInit(); int procWolfLand(); @@ -6662,9 +6815,9 @@ public: int procWolfSlipTurn(); int procWolfSlipTurnLandInit(); int procWolfSlipTurnLand(); - int procWolfSlideReadyInit(s16, int); + int procWolfSlideReadyInit(s16 i_angle, int); int procWolfSlideReady(); - int procWolfSlideInit(s16, int); + int procWolfSlideInit(s16 i_angle, int); int procWolfSlide(); int procWolfSlideLandInit(); int procWolfSlideLand(); @@ -6675,7 +6828,7 @@ public: void setWolfHowlNotHappen(int); int procWolfHowlDemoInit(); int procWolfHowlDemo(); - fopAc_ac_c* checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const; + fopAc_ac_c* checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const*, int) const; int checkWolfRopeJumpHang(); f32 getWolfRopeMoveSpeed(); int setWolfRopePosY(); @@ -6695,9 +6848,9 @@ public: int procWolfRopeSubjectivity(); int getWolfTagJumpTime() const; const cXyz* checkMidnaLockJumpPoint() const; - int procWolfTagJumpInit(fopAc_ac_c*); + int procWolfTagJumpInit(fopAc_ac_c* i_tag); int procWolfTagJump(); - int procWolfTagJumpLandInit(fopAc_ac_c*); + int procWolfTagJumpLandInit(fopAc_ac_c* i_tag); int procWolfTagJumpLand(); int procWolfGiantPuzzleInit(); int procWolfGiantPuzzle(); @@ -6707,10 +6860,10 @@ public: int procWolfHangReady(); int procWolfHangWallCatchInit(int); int procWolfHangWallCatch(); - int procWolfHangFallStartInit(cM3dGPla*); + int procWolfHangFallStartInit(cM3dGPla* i_tripla); int procWolfHangFallStart(); void setWolfHeadDamage(); - int procWolfDamageInit(dCcD_GObjInf*); + int procWolfDamageInit(dCcD_GObjInf* i_hitObj); int procWolfDamage(); int procWolfLargeDamageUpInit(int, int, s16, s16); int procWolfLargeDamageUp(); @@ -6750,12 +6903,12 @@ public: void resetWolfBallGrab(); void checkWolfLockData(); fopAc_ac_c* getWolfLockActorEnd(); - void searchWolfLockEnemy(fopAc_ac_c*, void*); + void searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data); void checkWolfComboCnt(); BOOL checkWolfAttackAction(); - void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM, f32); - BOOL setWolfEnemyHangBitePos(fopEn_enemy_c*); - void setWolfBiteDamage(fopEn_enemy_c*); + void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM i_anmID, f32); + BOOL setWolfEnemyHangBitePos(fopEn_enemy_c* i_enemy); + void setWolfBiteDamage(fopEn_enemy_c* i_enemy); BOOL checkWolfLockAttackChargeState(); int procWolfRollAttackChargeInit(); int procWolfRollAttackCharge(); @@ -6775,7 +6928,7 @@ public: int procWolfRollAttack(); int procWolfDownAttackInit(); int procWolfDownAttack(); - int procWolfDownAtLandInit(fopEn_enemy_c*); + int procWolfDownAtLandInit(fopEn_enemy_c* i_enemy); int procWolfDownAtLand(); int procWolfDownAtMissLandInit(); int procWolfDownAtMissLand(); @@ -6814,9 +6967,9 @@ public: void setSmellSave(); int procWolfGetSmellInit(); int procWolfGetSmell(); - void setArcName(int); + void setArcName(BOOL i_isWolf); void setShieldArcName(); - void setOriginalHeap(JKRExpHeap**, u32); + void setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size); void setShieldChange(); int loadModelDVD(); void setShieldModel(); @@ -6824,7 +6977,7 @@ public: void changeModelDataDirect(int); void changeModelDataDirectWolf(int); void initStatusWindow(); - void statusWindowExecute(cXyz const*, s16); + void statusWindowExecute(const cXyz* i_pos, s16 i_angle); void statusWindowDraw(); void resetStatusWindow(); fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); } @@ -6839,21 +6992,24 @@ public: BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; } fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); } - virtual bool checkAcceptDungeonWarpAlink(int) { return checkAcceptWarp(); } + virtual bool checkAcceptDungeonWarpAlink(int unused) { + UNUSED(unused); + return checkAcceptWarp(); + } + virtual daSpinner_c* getSpinnerActor() { - daSpinner_c* spinnerActor; - if (!checkSpinnerRide()) { - spinnerActor = NULL; + if (checkSpinnerRide()) { + return (daSpinner_c*)mRideAcKeep.getActor(); } else { - spinnerActor = (daSpinner_c*)mRideAcKeep.getActor(); + return NULL; } - return (daSpinner_c*)spinnerActor; } + virtual s16 getSumouCounter() const { return mProcVar2.field_0x300c; } virtual s16 checkSumouWithstand() const { return mProcVar3.field_0x300e; } - virtual void setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { - mMidnaMsgNum = pMsgNum; - mMidnaMsg = (daTagMmsg_c*)param_0; + virtual void setMidnaMsgNum(fopAc_ac_c* i_msgTag, u16 i_msgNum) { + mMidnaMsgNum = i_msgNum; + mMidnaMsg = (daTagMmsg_c*)i_msgTag; } virtual MtxP getModelMtx() { return mpLinkModel->getBaseTRMtx(); } virtual MtxP getInvMtx() { return mInvMtx; } @@ -6963,19 +7119,19 @@ public: virtual f32 getSearchBallScale() const { return mSearchBallScale; } virtual int checkFastShotTime() { return mFastShotTime; } virtual f32 getBaseAnimeFrame() const; - virtual void setAnimeFrame(f32); + virtual void setAnimeFrame(f32 i_frame); virtual BOOL checkWolfLock(fopAc_ac_c*) const; virtual bool cancelWolfLock(fopAc_ac_c*); - virtual BOOL exchangeGrabActor(fopAc_ac_c*); - virtual BOOL setForceGrab(fopAc_ac_c*, int, int); + virtual BOOL exchangeGrabActor(fopAc_ac_c* i_actor); + virtual BOOL setForceGrab(fopAc_ac_c* i_actor, BOOL, BOOL); virtual u32 checkPlayerNoDraw(); virtual void voiceStart(u32); virtual void seStartOnlyReverb(u32); virtual void seStartOnlyReverbLevel(u32); - virtual void setOutPower(f32, short, int); - virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*); - virtual void onFrollCrashFlg(u8, int); - virtual MtxP getModelJointMtx(u16); + virtual void setOutPower(f32, s16, int); + virtual void setGrabCollisionOffset(f32 i_offsetX, f32 i_offsetZ, cBgS_PolyInfo*); + virtual void onFrollCrashFlg(u8 i_flg, BOOL); + virtual MtxP getModelJointMtx(u16 i_jointNo); virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*); virtual BOOL checkCutJumpCancelTurn() const { return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2; @@ -6986,23 +7142,23 @@ public: return mProcID == PROC_HORSE_BOW_SUBJECT && mProcVar2.field_0x300c != 0; } virtual void setClothesChange(int); - virtual void setPlayerPosAndAngle(cXyz const*, short, int); - virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); - virtual void setPlayerPosAndAngle(f32 (*)[4]); - virtual bool setThrowDamage(short, f32, f32, int, int, int); - virtual bool checkSetNpcTks(cXyz*, int, int); - virtual int setRollJump(f32, f32, short); + virtual void setPlayerPosAndAngle(const cXyz* i_pos, s16 i_angle, BOOL); + virtual void setPlayerPosAndAngle(const cXyz* i_pos, const csXyz* i_angle); + virtual void setPlayerPosAndAngle(Mtx i_mtx); + virtual bool setThrowDamage(s16, f32, f32, int, int, int); + virtual bool checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int); + virtual int setRollJump(f32 i_speedH, f32 i_speedV, s16 i_angle); virtual void cancelDungeonWarpReadyNeck() { if (mProcID != PROC_DUNGEON_WARP_READY) { return; } offModeFlg(MODE_UNK_100); } - virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*); - virtual void onSceneChangeAreaJump(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { - mExitID = exitID | 0x8000; - mExitDirection = exitDirection; - mpScnChg = (daScex_c*)scexAc; + virtual void onSceneChangeArea(u8 i_exitID, u8 i_exitDirection, fopAc_ac_c* i_scexAc); + virtual void onSceneChangeAreaJump(u8 i_exitID, u8 i_exitDirection, fopAc_ac_c* i_scexAc) { + mExitID = i_exitID | 0x8000; + mExitDirection = i_exitDirection; + mpScnChg = (daScex_c*)i_scexAc; } virtual void onSceneChangeDead(u8 param_0, int param_1) { if (mProcID != PROC_DEAD) { @@ -7026,20 +7182,20 @@ public: return 0; } virtual cXyz* getMagneBootsTopVec() { return &mMagneBootsTopVec; } - virtual void setCargoCarry(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_CARGO_CARRY; - mCargoCarryAcKeep.setData(p_actor); + virtual void setCargoCarry(fopAc_ac_c* i_actor) { + mMode = SMODE_CARGO_CARRY; + mCargoCarryAcKeep.setData(i_actor); } - virtual void setGoronSideMove(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_GORON_THROW; - mCargoCarryAcKeep.setData(p_actor); + virtual void setGoronSideMove(fopAc_ac_c* i_actor) { + mMode = SMODE_GORON_THROW; + mCargoCarryAcKeep.setData(i_actor); } - virtual void setSumouReady(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_SUMO_READY; - mCargoCarryAcKeep.setData(p_actor); - mDemo.setDemoMode(1); + virtual void setSumouReady(fopAc_ac_c* i_actor) { + mMode = SMODE_SUMO_READY; + mCargoCarryAcKeep.setData(i_actor); + mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e); } - virtual void setSumouPushBackDirection(short param_0) { + virtual void setSumouPushBackDirection(s16 param_0) { if (mProcID != PROC_SUMOU_MOVE) { return; } @@ -7049,24 +7205,24 @@ public: if (mProcID != PROC_SUMOU_WIN_LOSE) { return; } - mSpecialMode = SMODE_SUMO_LOSE; + mMode = SMODE_SUMO_LOSE; } virtual cXyz* getKandelaarFlamePos(); virtual bool checkUseKandelaar(int); - virtual void setDkCaught(fopAc_ac_c*); - virtual void onPressedDamage(cXyz const&, short); - virtual bool checkPriActorOwn(fopAc_ac_c const* p_actor) const { - return field_0x27f4 == p_actor; + virtual void setDkCaught(fopAc_ac_c* i_dkActor); + virtual void onPressedDamage(cXyz const&, s16); + virtual bool checkPriActorOwn(fopAc_ac_c const* i_actor) const { + return field_0x27f4 == i_actor; } - virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2); - virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { - return field_0x281c.getActorConst() == p_actor; + virtual bool onWolfEnemyBiteAll(fopAc_ac_c* i_enemy, daPy_py_c::daPy_FLG2 i_flag); + virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const* i_actor) const { + return field_0x281c.getActorConst() == i_actor; } - virtual void setWolfEnemyHangBiteAngle(short angle) { + virtual void setWolfEnemyHangBiteAngle(s16 i_angle) { if (mProcID != PROC_WOLF_ENEMY_HANG_BITE) { return; } - mProcVar4.field_0x3010 = angle; + mProcVar4.field_0x3010 = i_angle; } virtual void setSumouGraspCancelCount(int param_0) { if (mProcID != PROC_SUMOU_MOVE) { @@ -7076,7 +7232,7 @@ public: } virtual bool checkItemSwordEquip() const { return mEquipItem == 0x103; } virtual f32 getSinkShapeOffset() const { return mSinkShapeOffset; } - virtual BOOL checkSinkDead() const { return field_0x2fbd == 0xFF; } + virtual BOOL checkSinkDead() const { return mGndPolyAtt1 == 0xFF; } virtual BOOL checkCutJumpMode() const { return mProcID == PROC_CUT_JUMP; } virtual s16 getGiantPuzzleAimAngle() const { return mProcVar2.mPuzzleAimAngle; } virtual u8 getSwordChangeWaitTimer() const { return mSwordChangeWaitTimer; } @@ -7086,8 +7242,8 @@ public: virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; } virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; } virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; } - virtual void setKandelaarMtx(f32 (*)[4], int, int); - virtual bool getStickAngleFromPlayerShape(short*) const; + virtual void setKandelaarMtx(Mtx i_mtx, int, int); + virtual bool getStickAngleFromPlayerShape(s16* o_angle) const; virtual bool checkSpinnerPathMove(); virtual bool checkSpinnerTriggerAttack(); virtual void onSpinnerPathForceRemove(); @@ -7105,7 +7261,7 @@ public: return checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS); } virtual void skipPortalObjWarp(); - virtual BOOL checkTreasureRupeeReturn(int) const; + virtual BOOL checkTreasureRupeeReturn(int i_itemNo) const; virtual void cancelGoronThrowEvent(); virtual cXyz* getHookshotTopPos(); virtual bool checkHookshotReturnMode() const; @@ -7134,10 +7290,10 @@ public: virtual bool checkDragonHangRide() const { return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0; } - virtual void playerStartCollisionSE(u32 param_0, u32 param_1) { - mZ2Link.startCollisionSE(param_0, param_1); + virtual void playerStartCollisionSE(u32 i_hitID, u32 i_mapinfo) { + mZ2Link.startCollisionSE(i_hitID, i_mapinfo); } - virtual void changeDragonActor(fopAc_ac_c*); + virtual void changeDragonActor(fopAc_ac_c* i_actor); virtual u8 getClothesChangeWaitTimer() const { return mClothesChangeWaitTimer; } virtual u8 getShieldChangeWaitTimer() const { return mShieldChangeWaitTimer; } virtual BOOL checkBootsOrArmorHeavy() const; @@ -7145,30 +7301,24 @@ public: virtual BOOL checkHorseStart() { return checkHorseStart(getLastSceneMode(), getStartMode()); } virtual BOOL checkCopyRodTopUse(); - static BOOL checkDebugMoveInput() { - if (mDoCPd_c::isConnect(PAD_3)) { - return mDoCPd_c::getHoldB(PAD_1) && mDoCPd_c::getAnalogR(PAD_1) > 0.8f && - mDoCPd_c::getTrigA(PAD_1); - } + static BOOL checkDebugMoveInput(); - return FALSE; - } + u32 checkModeFlg(u32 i_flag) const { return mModeFlg & i_flag; } - u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } - BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); } - BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); } + BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_ATDEFS_e); } + BOOL checkFmChainGrabAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CHAIN_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WL_CHAIN_e); } BOOL checkAttentionLock() { return mAttention->Lockon(); } - bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; } - bool checkUnderAnime(u16 i_idx) const { return mUnderAnmHeap[UNDER_2].getIdx() == i_idx; } + bool checkUpperAnime(u16 i_resIdx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_resIdx; } + bool checkUnderAnime(u16 i_resIdx) const { return mUnderAnmHeap[UNDER_2].getIdx() == i_resIdx; } bool checkNoSetUpperAnime() const { return mUpperAnmHeap[UPPER_2].checkNoSetIdx(); } - bool checkSwimMoveHandAnime() const { return checkUpperAnime(0x23F); } - bool checkZoraSwimDamageAnime() const { return checkUpperAnime(0xBF); } - bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); } - bool checkHorseTurnLAnime() const { return checkUpperAnime(0x24C); } - bool checkHorseTurnRAnime() const { return checkUpperAnime(0x24D); } + bool checkSwimMoveHandAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_SWIMINGB_e); } + bool checkZoraSwimDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMSW_e); } + bool checkIronBallWaitAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_IBWAIT_e); } + bool checkHorseTurnLAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_TURNLS_e); } + bool checkHorseTurnRAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_TURNRS_e); } bool checkHorseTurnAnime() const { return checkHorseTurnLAnime() || checkHorseTurnRAnime(); } bool checkHookshotShootAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSSHOOT_e); } bool checkHookshotReadyAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSWAIT_e); } @@ -7176,99 +7326,99 @@ public: return checkHookshotReadyAnime() || checkHookshotShootAnime(); } BOOL checkBoomerangReadyAnime() const { - return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(0x54); + return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } - bool checkDkCaught2Anime() const { return checkUpperAnime(0x262); } + bool checkDkCaught2Anime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDB_e); } BOOL checkCopyRodThrowAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x53); + return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); } - BOOL checkCutDashChargeAnime() const { return checkUpperAnime(0x83); } + BOOL checkCutDashChargeAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CUTDTP_e); } BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); } - BOOL checkTwoHandItemEquipAnime() const { return checkUpperAnime(0x245); } - BOOL checkBarkAnime() const { return 0; } - bool checkWolfGrabAnimeObj() const { return checkUpperAnime(0x2DA); } - bool checkWolfGrabAnimeStick() const { return checkUpperAnime(0x2DB); } + BOOL checkTwoHandItemEquipAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_TAKE_e); } + BOOL checkBarkAnime() const { return FALSE; } + bool checkWolfGrabAnimeObj() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WL_PICKUPA_e); } + bool checkWolfGrabAnimeStick() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WL_PICKUPB_e); } BOOL checkWolfGrabAnime() const { return checkWolfGrabAnimeObj() || checkWolfGrabAnimeStick(); } - bool checkWolfSwimDashAnime() const { return checkUnderMove0BckNoArcWolf(WANM_SWIM_DASH); } + BOOL checkWolfSwimDashAnime() const { return checkUnderMove0BckNoArcWolf(WANM_SWIM_DASH); } bool checkKandelaarSwingAnime() const { return false; } - bool checkBowChargeWaitAnime() const { return checkUpperAnime(0xA); } - bool checkBowReloadAnime() const { return checkUpperAnime(0x9); } - bool checkBowShootAnime() const { return checkUpperAnime(0xC); } - bool checkBowWaitAnime() const { return checkUpperAnime(0xD); } - BOOL checkGrabUpThrowAnime() const { return checkUpperAnime(0x170); } + bool checkBowChargeWaitAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_ARELORDTAME_e); } + bool checkBowReloadAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_ARELORD_e); } + bool checkBowShootAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_ASHOOT_e); } + bool checkBowWaitAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_ASHOOTWAIT_e); } + BOOL checkGrabUpThrowAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_GRABTHROW_e); } BOOL checkGrabSideThrowAnime() const { - return checkUpperAnime(0x51) || mUpperAnmHeap[0].getIdx() == 0x51; + return checkUpperAnime(dRes_ID_ALANM_BCK_BOMBTHROW_e) || mUpperAnmHeap[0].getIdx() == dRes_ID_ALANM_BCK_BOMBTHROW_e; } - BOOL checkGrabHeavyThrowAnime() const { return checkUpperAnime(0x17B); } - BOOL checkGrabAnimeUp() const { return checkUpperAnime(0x16C); } - BOOL checkGrabAnimeSide() const { return checkUpperAnime(0x50); } - BOOL checkGrabAnimeCarry() const { return checkUpperAnime(0x60); } - bool checkHorseUnderDashStartAnime() const { return checkUnderAnime(0xDD); } - bool checkHorseUnderLashAnime() const { return checkUnderAnime(0x1B3); } - bool checkUpperHorseLieAnime() const { return checkUpperAnime(0x265); } - bool checkHorseTiredAnime() const { return checkUpperAnime(0x263); } - bool checkHorseSwordUpAnime() const { return checkUpperAnime(0xCC); } - bool checkHorseUnderItemAnime() const { return checkUnderAnime(0x19); } + BOOL checkGrabHeavyThrowAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HEAVYTHROW_e); } + BOOL checkGrabAnimeUp() const { return checkUpperAnime(dRes_ID_ALANM_BCK_GRABD_e); } + BOOL checkGrabAnimeSide() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOMBD_e); } + BOOL checkGrabAnimeCarry() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CARRYD_e); } + bool checkHorseUnderDashStartAnime() const { return checkUnderAnime(dRes_ID_ALANM_BCK_DSTARTHS_e); } + bool checkHorseUnderLashAnime() const { return checkUnderAnime(dRes_ID_ALANM_BCK_LASHS_e); } + bool checkUpperHorseLieAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHLIE_e); } + bool checkHorseTiredAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDS_e); } + bool checkHorseSwordUpAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DASHHBSUP_e); } + bool checkHorseUnderItemAnime() const { return checkUnderAnime(dRes_ID_ALANM_BCK_ATH_e); } BOOL checkHorseWalkStartAnm() const { return checkUnderMove0BckNoArc(ANM_WSTARTH); } - bool checkIronBallPreSwingAnime() const { return checkUpperAnime(0x19A); } - bool checkIronBallSwingAnime() const { return checkUpperAnime(0x19B); } - bool checkDashDamageAnime() const { return checkUpperAnime(0xAD); } - bool checkBoomerangCatchAnime() const { return checkUpperAnime(0x52); } + bool checkIronBallPreSwingAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_IBTHROW_e); } + bool checkIronBallSwingAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_IBTURN_e); } + bool checkDashDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMD_e); } + bool checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOOMCATCH_e); } BOOL checkCopyRodReadyAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x54); + return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } BOOL checkCanoeFishingWaitAnime() const { - return checkUpperAnime(0x5D) || checkUpperAnime(0x260); + return checkUpperAnime(dRes_ID_ALANM_BCK_CANOEREELINGR_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WAITFISHR_e); } - BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); } - BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); } - BOOL checkExchangeRodAnime() const { return checkUpperAnime(0x68); } - BOOL checkReelAnime() const { return checkUpperAnime(0x1FB); } + BOOL checkCopyRodControllAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_RODD_e); } + BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WL_DAM_e); } + BOOL checkExchangeRodAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CHANGEROD_e); } + BOOL checkReelAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_REELINGARM_e); } int checkWolfEyeUp() const { return mWolfEyeUp; } void onModeFlg(u32 flag) { mModeFlg |= flag; } void offModeFlg(u32 flag) { mModeFlg &= ~flag; } - bool swordButton() { return itemButtonCheck(8); } + BOOL swordButton() { return itemButtonCheck(BTN_B); } daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangAcKeep; } int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } bool checkFisingRodLure() const { return mEquipItem == 0x105; } BOOL doTrigger() const { return mItemTrigger & BTN_A; } - bool swordTrigger() { return itemTriggerCheck(BTN_B); } + BOOL swordTrigger() { return itemTriggerCheck(BTN_B); } BOOL grassCancelTrigger() { return itemTriggerCheck(BTN_B); } BOOL arrowChangeTrigger() { return itemActionTrigger(); } - bool peepSubjectCancelTrigger() { return itemTriggerCheck(0x8); } + BOOL peepSubjectCancelTrigger() { return itemTriggerCheck(BTN_B); } int getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; } - bool checkInputOnR() const { return field_0x33ac > 0.05f; } - static int getSightBti() { return 0x5B; } + bool checkInputOnR() const { return mMoveValue > 0.05f; } + static u16 getSightBti() { return 0x5B; } bool checkBoomerangChargeEndWait() const { return mEquipItem != 0x102 && checkBoomerangAnime(); } J3DAnmTransform* getNowAnmPackUpper(daAlink_UPPER param_0) { return mNowAnmPackUpper[param_0].getAnmTransform(); } - void setFacePriBck(u16 param_0) { setFaceBck(param_0, 1, 0xFFFF); } - void setFacePriBtp(u16 param_0) { setFaceBtp(param_0, 1, 0xFFFF); } - void setFacePriBtk(u16 param_0) { setFaceBtk(param_0, 1, 0xFFFF); } - void setFaceBasicBck(u16 param_0) { setFaceBck(param_0, 0, 0xFFFF); } - void setFaceBasicBtp(u16 param_0) { setFaceBtp(param_0, 0, 0xFFFF); } - void setFaceBasicBtk(u16 param_0) { setFaceBtk(param_0, 0, 0xFFFF); } - void setFaceDemoBck(u16 param_0) { setFaceBck(param_0, 0, 0); } - void setFaceDemoBtp(u16 param_0) { setFaceBtp(param_0, 0, 0); } - void setFaceDemoBtk(u16 param_0) { setFaceBtk(param_0, 0, 0); } - - void setGrabStatus(u8 i_status, u8 param_1) { setWallGrabStatus(i_status, param_1); } - void setChainGrabStatus(u8 i_status) { setGrabStatus(i_status, 2); } + void setFacePriBck(u16 i_resIdx) { setFaceBck(i_resIdx, TRUE, 0xFFFF); } + void setFacePriBtp(u16 i_resIdx) { setFaceBtp(i_resIdx, TRUE, 0xFFFF); } + void setFacePriBtk(u16 i_resIdx) { setFaceBtk(i_resIdx, TRUE, 0xFFFF); } + void setFaceBasicBck(u16 i_resIdx) { setFaceBck(i_resIdx, FALSE, 0xFFFF); } + void setFaceBasicBtp(u16 i_resIdx) { setFaceBtp(i_resIdx, FALSE, 0xFFFF); } + void setFaceBasicBtk(u16 i_resIdx) { setFaceBtk(i_resIdx, FALSE, 0xFFFF); } + void setFaceDemoBck(u16 i_resIdx) { setFaceBck(i_resIdx, FALSE, 0); } + void setFaceDemoBtp(u16 i_resIdx) { setFaceBtp(i_resIdx, FALSE, 0); } + void setFaceDemoBtk(u16 i_resIdx) { setFaceBtk(i_resIdx, FALSE, 0); } + + void setGrabStatus(u8 i_status, u8 i_flag) { setWallGrabStatus(i_status, i_flag); } + void setChainGrabStatus(u8 i_status) { setGrabStatus(i_status, BUTTON_STATUS_FLAG_EMPHASIS); } void cancelFmChainGrabFromOut() { field_0x2fa3 = 0; field_0x2844.clearData(); } - int checkPlayerDemoMode() const { return mDemo.getDemoType(); } + BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != 0; } BOOL checkSpecialDemoMode() const { return mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e; } - static bool checkMidnaChargeAttack() { return dComIfGs_isEventBit(0x501); } + static BOOL checkMidnaChargeAttack() { return dComIfGs_isEventBit(0x501); } u16 getMidnaMsgNum() const { return mMidnaMsgNum; } u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; } BOOL checkClimbFall() { return checkLadderFall(); } @@ -7322,7 +7472,7 @@ public: s16 getCameraAngleY() const { return field_0x310c; } cXyz* getSubjectEyePos() { return &field_0x3768; } - u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } + u32 checkReinRide() const { return mRideStatus == RIDETYPE_HORSE || mRideStatus == RIDETYPE_BOAR; } int getGrassHowlEventActor() const { return field_0x3198; } MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); } MtxP getMagneBootsMtx() { return mMagneBootMtx; } @@ -7331,7 +7481,7 @@ public: BOOL checkFishingCastMode() const { return (mProcID == PROC_FISHING_CAST && !(mItemAcKeep.getActor() != NULL && mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt())) || - (mProcID != PROC_FISHING_CAST && checkNoResetFlg2(FLG2_UNK_20000000) != 0); + (mProcID != PROC_FISHING_CAST && checkNoResetFlg2(FLG2_FISHING_CAST_WAIT) != 0); } BOOL setCanoeCast() { @@ -7351,11 +7501,11 @@ public: void setFishingArm1Angle(const csXyz& i_angle) { mFishingArm1Angle = i_angle; } void setFishingArm2Angle(const csXyz& i_angle) { field_0x3160 = i_angle; } - void endFishingCastWait() { offNoResetFlg2(FLG2_UNK_20000000); } + void endFishingCastWait() { offNoResetFlg2(FLG2_FISHING_CAST_WAIT); } void startFishingCastWait() { if (checkFishingRodItem(mEquipItem)) { - onNoResetFlg2(FLG2_UNK_20000000); + onNoResetFlg2(FLG2_FISHING_CAST_WAIT); } } @@ -7374,12 +7524,12 @@ public: } bool checkFisingRodJewl() const { - return (mEquipItem == 0x5C || mEquipItem == 0x5F) || mEquipItem == 0x5E; + return (mEquipItem == fpcNm_ITEM_JEWEL_ROD || mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD) || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD; } - bool checkFisingRodWorm() const { return mItemMode == 0x74; } + bool checkFisingRodWorm() const { return mItemMode == fpcNm_ITEM_WORM; } - bool checkFisingRodBee() const { return mItemMode == 0x76; } + bool checkFisingRodBee() const { return mItemMode == fpcNm_ITEM_BEE_CHILD; } void fishingCastWaitAnimeStart() { if (mProcID == PROC_FISHING_CAST) { @@ -7405,28 +7555,26 @@ public: f32 getCopyRodBallDisFlyMax() const { return mSearchBallScale; } void clearIronBallActor() { field_0x173c.SetActor(this); } - BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const { - return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0; + BOOL checkCanoeRideOwn(const fopAc_ac_c* i_actor) const { + return checkCanoeRide() && mRideAcKeep.getActorConst() == i_actor; } - BOOL checkBoarRideOwn(const fopAc_ac_c* i_actorP) const { - return checkBoarRide() && mRideAcKeep.getActorConst() == i_actorP; + BOOL checkBoarRideOwn(const fopAc_ac_c* i_actor) const { + return checkBoarRide() && mRideAcKeep.getActorConst() == i_actor; } - bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } + u32 checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; } - BOOL checkPowerGloveGet() { return false; } - - J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) { - return initModel(p_modelData, 0x80000, param_1); + J3DModel* initModel(J3DModelData* i_modelData, u32 i_diffFlags) { + return initModel(i_modelData, 0x80000, i_diffFlags); } - J3DModel* initModelEnv(J3DModelData* p_modelData, u32 param_1) { - return initModel(p_modelData, 0, param_1); + J3DModel* initModelEnv(J3DModelData* i_modelData, u32 i_diffFlags) { + return initModel(i_modelData, 0, i_diffFlags); } bool checkResetRootMtx(int param_0) const { return field_0x2f90 != 0 && param_0 == 1; } - bool checkGrabGlide() { return checkGrabRooster(); } + BOOL checkGrabGlide() { return checkGrabRooster(); } bool checkCopyRodRevive() const { return mProcID == PROC_COPY_ROD_REVIVE; } bool checkHorseGetOffMode() const { return mProcID == PROC_HORSE_GETOFF; } @@ -7453,29 +7601,29 @@ public: BOOL checkRideOn() const { return mRideStatus != 0; } - bool checkSwimDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } + BOOL checkSwimDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } - bool talkTrigger() const { return mItemTrigger & BTN_A; } + BOOL talkTrigger() const { return mItemTrigger & BTN_A; } J3DAnmTransform* getNowAnmPackUnder(daAlink_UNDER i_idx) { return mNowAnmPackUnder[i_idx].getAnmTransform(); } BOOL doButton() const { return mItemButton & BTN_A; } - void setGrassCancelStatus(u8 param_0) { setBStatus(param_0); } + void setGrassCancelStatus(u8 i_status) { setBStatus(i_status); } - void seStartSystem(u32 i_seID) { mDoAud_seStart(i_seID, NULL, 0, 0); } + void seStartSystem(u32 i_soundID) { mDoAud_seStart(i_soundID, NULL, 0, 0); } bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; } BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); } f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const { - return param_0 + (field_0x33a8 * (param_1 - param_0)); + return param_0 + (mStickValue * (param_1 - param_0)); } - bool escapeTrigger() { - field_0x2fae |= 8; + BOOL escapeTrigger() { + mUseButtonFlags |= (u8)BTN_B; return mItemTrigger & (BTN_A | BTN_B); } - void clearComboReserb() { offNoResetFlg2(FLG2_UNK_2); } + void clearComboReserb() { offNoResetFlg2(FLG2_COMBO_RESERB); } void setDamageColorTime() { mDamageColorTime = 32 - (mDamageTimer % 16); } @@ -7495,12 +7643,12 @@ public: // Gets the cardinal direction of the Left Stick relative to player facing angle int getDirectionFromShapeAngle() const { - return getDirectionFromAngle(field_0x2fe2 - shape_angle.y); + return getDirectionFromAngle(mMoveAngle - shape_angle.y); } // Gets the cardinal direction of the Left Stick relative to player angle int getDirectionFromCurrentAngle() const { - return getDirectionFromAngle(field_0x2fe2 - current.angle.y); + return getDirectionFromAngle(mMoveAngle - current.angle.y); } bool checkAnmEnd(daPy_frameCtrl_c* i_frameCtrl) { return i_frameCtrl->checkAnmEnd(); } @@ -7522,11 +7670,11 @@ public: static u16 getBallBtkIdx() { return 0x49; } static u16 getBallBrkIdx() { return 0x41; } - bool checkRootTransClearMode() { return field_0x2f99 & 7; } - bool checkRootTransZClearMode() { return field_0x2f99 & 4; } - bool checkRootTransXClearMode() { return field_0x2f99 & 1; } - bool checkRootTransYClearMode() { return field_0x2f99 & 2; } - bool checkRootTransClearContinueMode() { return field_0x2f99 & 8; } + BOOL checkRootTransClearMode() { return field_0x2f99 & 7; } + BOOL checkRootTransZClearMode() { return field_0x2f99 & 4; } + BOOL checkRootTransXClearMode() { return field_0x2f99 & 1; } + BOOL checkRootTransYClearMode() { return field_0x2f99 & 2; } + BOOL checkRootTransClearContinueMode() { return field_0x2f99 & 8; } s16 checkWindStoneHowl() { return mProcVar4.field_0x3010; } u8 getCorrectCurveID() { return mZ2WolfHowlMgr.getCorrectCurveID(); } u8 getCorrectLineNum() { return mZ2WolfHowlMgr.getCorrectLineNum(); } @@ -7538,19 +7686,19 @@ public: cXyz* getIronBallChainPos() const { return mIronBallChainPos; } csXyz* getIronBallChainAngle() const { return mIronBallChainAngle; } - int getIronBallHandChainNum() const { return mItemMode; } + s16 getIronBallHandChainNum() const { return mItemMode; } const cXyz& getIronBallChainHandRootPos() const { return mHookshotTopPos; } fopAc_ac_c* getAtnActor() { return mTargetedActor; } - void itemHitSE(u32 param_1, u32 param_2, Z2SoundObjBase* param_3) { - mZ2Link.startHitItemSE(param_1, param_2, param_3, -1.0f); + void itemHitSE(u32 i_soundID, u32 i_mapinfo, Z2SoundObjBase* i_other) { + mZ2Link.startHitItemSE(i_soundID, i_mapinfo, i_other, -1.0f); } BOOL checkStartFall() { return getStartMode() == 3; } u8 getBStatus() { return dComIfGp_getAStatus(); } - void setRStatus(u8 param_0, u8 param_1) { dComIfGp_setRStatus(param_0, param_1); } + void setRStatus(u8 i_status, u8 i_flag) { dComIfGp_setRStatus(i_status, i_flag); } BOOL checkWindSpeedMoveXZ() const { return mWindSpeed.abs2XZ() > 1.0f; } @@ -7570,6 +7718,8 @@ public: BOOL boomerangLockTrigger() { return itemActionTrigger(); } + bool checkBoomerangChargeNow() { return FALSE; } + BOOL checkBoomerangLockTrigger() { return boomerangLockTrigger(); } BOOL checkDemoSpinnerKeep() const { @@ -7580,8 +7730,8 @@ public: return mDemo.getDemoMode() == 14 && mDemo.getParam0() == 2; } - bool checkSpinnerRideOwn(const fopAc_ac_c* param_0) { - return checkSpinnerRide() && mRideAcKeep.getActorConst() == param_0; + bool checkSpinnerRideOwn(const fopAc_ac_c* i_actor) { + return checkSpinnerRide() && mRideAcKeep.getActorConst() == i_actor; } BOOL checkSpinnerReady() const { return mProcID == PROC_SPINNER_READY; } @@ -7601,8 +7751,8 @@ public: static daAlink_BckData const m_mainBckShield[20]; static daAlink_BckData const m_mainBckSword[5]; static daAlink_BckData const m_mainBckFishing[28]; - static daAlink_AnmData const m_anmDataTable[414]; - static daAlink_WlAnmData const m_wlAnmDataTable[147]; + static daAlink_AnmData const m_anmDataTable[ANM_MAX]; + static daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX]; static daAlink_FaceTexData const m_faceTexDataTable[]; static Vec const m_handLeftOutSidePos; static Vec const m_handRightOutSidePos; @@ -7698,10 +7848,10 @@ public: /* 0x007BC */ mDoExt_bckAnm* m_sWindowBck; /* 0x007C0 */ void* mpWarpTexData; /* 0x007C4 */ daPy_actorKeep_c mWolfLockAcKeep[10]; - /* 0x00814 */ dCcD_Stts field_0x814; - /* 0x00850 */ dCcD_Cyl field_0x850[3]; - /* 0x00C04 */ dCcD_Cyl field_0xC04[3]; - /* 0x00FB8 */ dCcD_Sph field_0xFB8; + /* 0x00814 */ dCcD_Stts mCcStts; + /* 0x00850 */ dCcD_Cyl mTgCyls[3]; + /* 0x00C04 */ dCcD_Cyl mWindTgCyls[3]; + /* 0x00FB8 */ dCcD_Sph mAtSph; /* 0x010F0 */ dCcD_Cyl mAtCyl; /* 0x0122C */ dCcD_Cps mAtCps[3]; /* 0x015F8 */ dCcD_Cps mGuardAtCps; @@ -7740,11 +7890,11 @@ public: /* 0x02118 */ daPy_anmHeap_c mFaceBtpHeap; /* 0x0212C */ daPy_anmHeap_c mFaceBtkHeap; /* 0x02140 */ daPy_anmHeap_c mFaceBckHeap; - /* 0x02154 */ J3DAnmTexPattern* field_0x2154; + /* 0x02154 */ J3DAnmTexPattern* mpFaceBtp; /* 0x02158 */ J3DAnmTextureSRTKey* mpFaceBtk; /* 0x0215C */ daPy_frameCtrl_c* field_0x215c; - /* 0x02160 */ u16* field_0x2160; - /* 0x02164 */ mDoExt_bckAnm field_0x2164; + /* 0x02160 */ const s8* field_0x2160; + /* 0x02164 */ mDoExt_bckAnm mFaceBck; /* 0x02180 */ daAlink_matAnm_c* field_0x2180[2]; /* 0x02188 */ dEyeHL_c mEyeHL1; /* 0x0219C */ dEyeHL_c mEyeHL2; @@ -7781,7 +7931,7 @@ public: /* 0x028F4 */ fpc_ProcID mAtnActorID; /* 0x028F8 */ fpc_ProcID field_0x28f8; /* 0x028FC */ fpc_ProcID field_0x28fc; - /* 0x02900 */ fpc_ProcID field_0x2900; + /* 0x02900 */ fpc_ProcID mRideActorID; /* 0x02904 */ daAlink_footData_c mFootData1[2]; /* 0x02A4C */ daAlink_footData_c mFootData2[2]; /* 0x02B94 */ f32 field_0x2b94; @@ -7809,7 +7959,7 @@ public: /* 0x02F50 */ const Vec* field_0x2f50; /* 0x02F54 */ const Vec* field_0x2f54; /* 0x02F58 */ dPath* field_0x2f58; - /* 0x02F5C */ LIGHT_INFLUENCE field_0x2f5c; + /* 0x02F5C */ LIGHT_INFLUENCE mMagneBootsPlight; /* 0x02F7C */ u8 field_0x2f7c[16]; /* 0x02F8C */ u8 field_0x2f8c; /* 0x02F8D */ u8 mItemTrigger; @@ -7817,8 +7967,8 @@ public: /* 0x02F8F */ u8 field_0x2f8f; /* 0x02F90 */ u8 field_0x2f90; /* 0x02F91 */ u8 field_0x2f91; - /* 0x02F92 */ u8 field_0x2f92; - /* 0x02F93 */ u8 field_0x2f93; + /* 0x02F92 */ u8 mLeftHandIndex; + /* 0x02F93 */ u8 mRightHandIndex; /* 0x02F94 */ u8 field_0x2f94; /* 0x02F95 */ u8 field_0x2f95; /* 0x02F96 */ u8 field_0x2f96; @@ -7845,7 +7995,7 @@ public: /* 0x02FAB */ u8 field_0x2fab; /* 0x02FAC */ u8 mExitDirection; /* 0x02FAD */ u8 mPeepExitID; - /* 0x02FAE */ u8 field_0x2fae; + /* 0x02FAE */ u8 mUseButtonFlags; /* 0x02FAF */ u8 field_0x2faf; /* 0x02FB0 */ u8 field_0x2fb0; /* 0x02FB1 */ u8 mWolfLockNum; @@ -7858,9 +8008,9 @@ public: /* 0x02FB8 */ u8 field_0x2fb8; /* 0x02FB9 */ u8 field_0x2fb9; /* 0x02FBA */ u8 mHotspringRecoverTimer; - /* 0x02FBB */ u8 field_0x2fbb; + /* 0x02FBB */ u8 mGndPolyAtt0; /* 0x02FBC */ u8 field_0x2fbc; - /* 0x02FBD */ u8 field_0x2fbd; + /* 0x02FBD */ u8 mGndPolyAtt1; /* 0x02FBE */ u8 field_0x2fbe; /* 0x02FBF */ u8 mClothesChangeWaitTimer; /* 0x02FC0 */ u8 field_0x2fc0; @@ -7892,9 +8042,9 @@ public: /* 0x02FDC */ u16 mEquipItem; /* 0x02FDE */ u16 field_0x2fde; /* 0x02FE0 */ s16 mStickAngle; - /* 0x02FE2 */ s16 field_0x2fe2; // related to current stick angle + /* 0x02FE2 */ s16 mMoveAngle; // related to current stick angle /* 0x02FE4 */ s16 field_0x2fe4; - /* 0x02FE6 */ s16 field_0x2fe6; + /* 0x02FE6 */ s16 mPrevAngleY; /* 0x02FE8 */ u16 mProcID; /* 0x02FEA */ u16 field_0x2fea; /* 0x02FEC */ s16 field_0x2fec; @@ -7938,6 +8088,7 @@ public: } /* 0x03010 */ mProcVar4; union { s16 field_0x3012; + s16 mCutTurnChargeCheckTimer; } /* 0x03012 */ mProcVar5; /* 0x03014 */ s16 mFallVoiceInit; /* 0x03016 */ u8 field_0x3016[2]; @@ -7996,12 +8147,12 @@ public: /* 0x030B2 */ s16 field_0x30b2; /* 0x030B4 */ u16 field_0x30b4; /* 0x030B6 */ u16 field_0x30b6; - /* 0x030B8 */ u16 field_0x30b8; - /* 0x030BA */ u16 field_0x30ba; + /* 0x030B8 */ u16 mLeftHandJntNo; + /* 0x030BA */ u16 mRightHandJntNo; /* 0x030BC */ u16 field_0x30bc; /* 0x030BE */ u16 field_0x30be; - /* 0x030C0 */ u16 field_0x30c0; - /* 0x030C2 */ u16 field_0x30c2; + /* 0x030C0 */ u16 mLeftItemJntNo; + /* 0x030C2 */ u16 mRightItemJntNo; /* 0x030C4 */ u16 field_0x30c4; /* 0x030C6 */ u16 field_0x30c6; /* 0x030C8 */ s16 field_0x30c8; @@ -8014,7 +8165,7 @@ public: /* 0x030D6 */ s16 field_0x30d6; /* 0x030D8 */ u8 field_0x30d8[0x14]; /* 0x030EC */ s16 field_0x30ec; - /* 0x030EE */ s16 field_0x30ee; + /* 0x030EE */ s16 mRollJumpAngle; /* 0x030F0 */ u16 field_0x30f0; /* 0x030F2 */ u8 field_0x30f2[2]; /* 0x030F4 */ s16 mSwordFlourishTimer; @@ -8041,9 +8192,7 @@ public: /* 0x0311E */ s16 field_0x311e; /* 0x03120 */ u16 mMidnaMsgNum; /* 0x03122 */ s16 field_0x3122; - /* 0x03124 */ s16 field_0x3124; - /* 0x03126 */ s16 field_0x3126; - /* 0x03128 */ s16 field_0x3128; + /* 0x03124 */ csXyz field_0x3124; /* 0x0312A */ csXyz field_0x312a[2]; /* 0x03136 */ csXyz field_0x3136[2]; /* 0x03142 */ csXyz field_0x3142[4]; @@ -8052,12 +8201,12 @@ public: /* 0x03166 */ csXyz field_0x3166; /* 0x0316C */ csXyz field_0x316c; /* 0x03172 */ u8 field_0x3172[2]; - /* 0x03174 */ int field_0x3174; + /* 0x03174 */ int mGroundCode; /* 0x03178 */ int field_0x3178; /* 0x0317C */ int field_0x317c; /* 0x03180 */ int field_0x3180; /* 0x03184 */ int mAlinkStaffId; - /* 0x03188 */ int field_0x3188; + /* 0x03188 */ int mStartEventID; /* 0x0318C */ int field_0x318c; /* 0x03190 */ int field_0x3190; /* 0x03194 */ int field_0x3194; @@ -8110,8 +8259,8 @@ public: /* 0x0339C */ f32 mSpeedModifier; /* 0x033A0 */ f32 field_0x33a0; /* 0x033A4 */ f32 field_0x33a4; - /* 0x033A8 */ f32 field_0x33a8; - /* 0x033AC */ f32 field_0x33ac; + /* 0x033A8 */ f32 mStickValue; + /* 0x033AC */ f32 mMoveValue; /* 0x033B0 */ f32 field_0x33b0; /* 0x033B4 */ f32 mWaterY; /* 0x033B8 */ f32 field_0x33b8; @@ -8136,8 +8285,8 @@ public: /* 0x03404 */ f32 field_0x3404; /* 0x03408 */ f32 field_0x3408; /* 0x0340C */ f32 field_0x340c; - /* 0x03410 */ f32 field_0x3410; - /* 0x03414 */ f32 field_0x3414; + /* 0x03410 */ f32 mRollJumpSpeedH; + /* 0x03414 */ f32 mRollJumpSpeedV; /* 0x03418 */ f32 field_0x3418; /* 0x0341C */ f32 field_0x341c; /* 0x03420 */ f32 field_0x3420; @@ -8239,13 +8388,13 @@ public: /* 0x03850 */ daAlink_procFunc mpProcFunc; }; // Size: 0x385C -static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor); -static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor); -static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1); +static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor); +static bool daAlink_checkLightBallB(fopAc_ac_c* i_actor); +static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void* param_1); struct daAlink_cutParamTbl { /* 0x0 */ daAlink_c::daAlink_ANM m_anmID; - /* 0x4 */ int field_0x4; + /* 0x4 */ daAlink_c::daAlink_ANM m_recoilAnmID; /* 0x8 */ u8 m_cutType; /* 0x9 */ u8 m_atSe; /* 0xA */ u8 field_0xa; @@ -8265,10 +8414,10 @@ struct daAlink_cutHorseParamTbl { inline BOOL dComIfGs_isTransformLV(int i_no); inline BOOL dComIfGs_isEventBit(const u16); -static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1); -static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1); -static void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1); -static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1); +static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data); +static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data); +static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data); +static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* i_actor, void* i_data); inline daAlink_c* daAlink_getAlinkActorClass() { return (daAlink_c*)dComIfGp_getLinkPlayer(); diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h index 506af4f576..e15a6e7ca5 100644 --- a/include/d/actor/d_a_b_dr.h +++ b/include/d/actor/d_a_b_dr.h @@ -79,8 +79,8 @@ public: MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); } - void onTarget() { mTarget = true; } - bool isBack() { return arg0; } + u8 onTarget() { return mTarget = true; } + u8 isBack() { return arg0; } private: /* 0x05AC */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index d4a1335fd7..6dcff6ef9f 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -116,7 +116,7 @@ public: void offStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 &= ~flag; } u32 getReturnFlg() const { return checkStateFlg0(FLG0_1); } void onWindCatch() { onStateFlg0(WIND_CATCH); } - bool checkForceDelete() const { return m_forceDelete; } + u8 checkForceDelete() const { return m_forceDelete; } void onForceDelete() { m_forceDelete = true; } bool checkCharge() const { return true; } void setThrow() { fopAcM_SetParam(this, 1); } diff --git a/include/d/actor/d_a_canoe.h b/include/d/actor/d_a_canoe.h index 4051a039ab..bf34a5eee7 100644 --- a/include/d/actor/d_a_canoe.h +++ b/include/d/actor/d_a_canoe.h @@ -34,7 +34,7 @@ public: J3DModel* getModel() { return mpModel; } MtxP getModelMtx() { return mpModel->getBaseTRMtx(); } bool checkTandem() { return fopAcM_GetParam(this) == 2; } - bool checkJumpRideFlg() { return mJumpRideFlg; } + u8 checkJumpRideFlg() const { return mJumpRideFlg; } void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; } void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; } void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; } diff --git a/include/d/actor/d_a_cow.h b/include/d/actor/d_a_cow.h index e7d0f4547c..403dc2aef6 100644 --- a/include/d/actor/d_a_cow.h +++ b/include/d/actor/d_a_cow.h @@ -194,16 +194,16 @@ public: daCow_c* getCowP() { return mCowP; } // cLib_onBit<u16>(mFlags, (mask)) - void setCrazyBeforeCatch() { mFlags |= Flag_CrazyBeforeCatch; } - void setCrazyCatch() { mFlags |= Flag_CrazyCatch; } - void setCrazyDash() { mFlags |= Flag_CrazyDash; } - void setCrazyThrowLeft() { mFlags |= Flag_CrazyThrowLeft; } - void setCrazyThrowRight() { mFlags |= Flag_CrazyThrowRight; } - void setCrazyReady() { mFlags |= Flag_CrazyReady; } - void setCrazyGo() { mFlags |= Flag_CrazyGo; } - void setNaderu() { mFlags |= Flag_Naderu; } - void setNaderuFinish() { mFlags |= Flag_NaderuFinish; } - void setCrazyReadyDrawOn() { mFlags |= Flag_CrazyReadyDrawOn; } + void setCrazyBeforeCatch() { mFlags |= (u16)Flag_CrazyBeforeCatch; } + void setCrazyCatch() { mFlags |= (u16)Flag_CrazyCatch; } + void setCrazyDash() { mFlags |= (u16)Flag_CrazyDash; } + void setCrazyThrowLeft() { mFlags |= (u16)Flag_CrazyThrowLeft; } + void setCrazyThrowRight() { mFlags |= (u16)Flag_CrazyThrowRight; } + void setCrazyReady() { mFlags |= (u16)Flag_CrazyReady; } + void setCrazyGo() { mFlags |= (u16)Flag_CrazyGo; } + void setNaderu() { mFlags |= (u16)Flag_Naderu; } + void setNaderuFinish() { mFlags |= (u16)Flag_NaderuFinish; } + void setCrazyReadyDrawOn() { mFlags |= (u16)Flag_CrazyReadyDrawOn; } u8 getCowIn() { return mCowIn; } u8 getNoNearCheckTimer() { return mNoNearCheckTimer; } diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index 391c038457..9a1b460ae4 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -152,8 +152,7 @@ public: BOOL speakTo() { if (mType == 4) { if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(mpEvtData[5].eventName) != 0) { - u32 len = strlen(mpArcNames[mpEvtData[5].num]); - if (len != 0) { + if (strlen(mpArcNames[mpEvtData[5].num]) != 0) { eventInfo.setArchiveName(mpArcNames[mpEvtData[5].num]); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); } diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index 38061ff17c..fe30a4769f 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -217,6 +217,8 @@ public: s8 getActionMode() { return mActionMode; } void setTalkFlag(u8 i_flag) { field_0x15bd = i_flag; } + + bool checkBattleMode() { return true; } int create(); int CreateHeap(); diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index a314088bd0..a96d77648a 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -146,8 +146,7 @@ public: } if (strlen(mpEvtData[var_r29].eventName) != 0) { - u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]); - if (len != 0) { + if (strlen(mpArcNames[mpEvtData[var_r29].num]) != 0) { eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); } diff --git a/include/d/actor/d_a_obj_gra2.h b/include/d/actor/d_a_obj_gra2.h index 2cbe9e700c..cac3b992e2 100644 --- a/include/d/actor/d_a_obj_gra2.h +++ b/include/d/actor/d_a_obj_gra2.h @@ -228,11 +228,11 @@ public: cXyz getAttentionPos(fopAc_ac_c*); int standWaitJump(void*); - bool checkNpcObjGra() { return mMode == 1; } - void setCrazyDash() { field_0xa48 |= 4; } - void setCrazyCatch() { field_0xa48 |= 2; } - void setCrazyThrowLeft() { field_0xa48 |= 8; } - void setCrazyThrowRight() { field_0xa48 |= 0x10; } + u8 checkNpcObjGra() { return mMode == 1; } + void setCrazyDash() { field_0xa48 |= (u16)4; } + void setCrazyCatch() { field_0xa48 |= (u16)2; } + void setCrazyThrowLeft() { field_0xa48 |= (u16)8; } + void setCrazyThrowRight() { field_0xa48 |= (u16)0x10; } static MotionFunc mBaseMotionList[22]; static MotionFunc mFaceMotionList[14]; diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h index 3e3307c468..8f01206e88 100644 --- a/include/d/actor/d_a_obj_sekizoa.h +++ b/include/d/actor/d_a_obj_sekizoa.h @@ -229,45 +229,34 @@ public: } u8 getType() { - int prm = fopAcM_GetParam(this) >> 0x1C; + int prm = (fopAcM_GetParam(this) & 0xF0000000) >> 28; - u8 type; switch (argument) { case 0: switch (prm) { case 1: - type = 2; - break; + return 2; case 2: - type = 4; - break; + return 4; case 3: - type = 6; - break; + return 6; default: - type = 0; - break; + return 0; } break; case 1: switch (prm) { case 1: - type = 3; - break; + return 3; case 2: - type = 5; - break; + return 5; default: - type = 1; - break; + return 1; } break; default: - type = 0; - break; + return 0; } - - return type; } u8 getBitSW() { return fopAcM_GetParam(this) & 0xff; } @@ -304,11 +293,11 @@ public: /* 0x1124 */ daNpcT_Path_c mPath; /* 0x114C */ cXyz mCXyzJump; /* 0x1158 */ int mLatencyTime; - /* 0x115C */ float mJumpHeight; - /* 0x1160 */ float mJumpSpeed; - /* 0x1164 */ float mColsetBlend; - /* 0x1168 */ float mGoalStatueTurnSpeed; - /* 0x116C */ float mGoalStatueAngle; + /* 0x115C */ f32 mJumpHeight; + /* 0x1160 */ f32 mJumpSpeed; + /* 0x1164 */ f32 mColsetBlend; + /* 0x1168 */ f32 mGoalStatueTurnSpeed; + /* 0x116C */ f32 mGoalStatueAngle; /* 0x1170 */ s16 mPlayerDirection; /* 0x1172 */ u8 mReset; /* 0x1173 */ u8 mSetWolfHowling; diff --git a/include/d/actor/d_a_obj_swhang.h b/include/d/actor/d_a_obj_swhang.h index f7efea85cd..097da890b3 100644 --- a/include/d/actor/d_a_obj_swhang.h +++ b/include/d/actor/d_a_obj_swhang.h @@ -65,7 +65,7 @@ public: cXyz getHangPos() { return mHangPos; } void setHangPlayer() { mHangPlayer = 1; } - u8 getType() { return mType; } + int getType() { return mType; } u8 getType_private() { return fopAcM_GetParamBit(this, 28, 4); } u8 checkType() { return fopAcM_GetParamBit(this, 25, 1); } u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } @@ -76,6 +76,7 @@ public: void clrFlag() { mFlags = 0; } void onFlag(u16 flag) { mFlags |= flag; } u16 checkFlag(u16 flag) { return mFlags & flag; } + s16 getAngleY() { return shape_angle.y; } private: /* 0x5B0 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_wchain.h b/include/d/actor/d_a_obj_wchain.h index 94df105e88..98300869ab 100644 --- a/include/d/actor/d_a_obj_wchain.h +++ b/include/d/actor/d_a_obj_wchain.h @@ -37,21 +37,25 @@ public: cXyz& getJumpAimPos() { return eyePos; } cXyz& getTopPos() { return mTopPos; } cXyz& getRoofPos() { return mRoofPos; } - f32 getPullLength() { return mPullLength; } + f32 getPullLength() const { return mPullLength; } void setPullLength(f32 i_length) { mPullLength = i_length; } - f32 getInitOutLength() { return mInitOutLength; } + f32 getInitOutLength() const { return mInitOutLength; } f32 getRealRoofY() { return mRealRoofY; } f32 getMoveDisRate() { return mPullLength * 0.01f; } - f32 getLastOffset() { return 6.0f; } - f32 getDownOffset() { return 100.0f; } - f32 getSwitchOffset() { return 94.0f; } + static f32 getLastOffset() { return 6.0f; } + static f32 getDownOffset() { return 100.0f; } + static f32 getSwitchOffset() { return 94.0f; } u8 getSwitchNum() { return mSw; } void onRide() { mRide = true; } void offRide() { mRide = false; } bool checkRideFlg() { return mRide; } void onEndFlg() { mEnd = true; } bool getEndFlg() { return mEnd; } - void onNowSwitchFlg() { mDown = mNowSwitch = true; } + + void onNowSwitchFlg() { + mNowSwitch = true; + mDown = true; + } private: /* 0x568 */ request_of_phase_process_class mPhaseReq; diff --git a/include/d/actor/d_a_obj_wind_stone.h b/include/d/actor/d_a_obj_wind_stone.h index e1f3dac603..f5e52dfc94 100644 --- a/include/d/actor/d_a_obj_wind_stone.h +++ b/include/d/actor/d_a_obj_wind_stone.h @@ -31,7 +31,7 @@ public: u8 getGoldWolfIdx(); s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); } - int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); } + s8 getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); } u32 getSwBit1() { return home.angle.x & 0xff; } u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); } diff --git a/include/d/actor/d_a_obj_yobikusa.h b/include/d/actor/d_a_obj_yobikusa.h index 5cea7a9029..e74b649006 100644 --- a/include/d/actor/d_a_obj_yobikusa.h +++ b/include/d/actor/d_a_obj_yobikusa.h @@ -82,7 +82,10 @@ public: const attributes* attr() const { return &M_attr; } int getType() { return argument & 0x7F; } u8 getPathID() { return fopAcM_GetParam(this); } - bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; } + bool isPlayerCorrect() { + s8 var_r31 = (fopAcM_GetParam(this) >> 8) & 0xFF; + return var_r31 > 0; + } private: /* 0x568 */ J3DModel* mpActiveModel; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 7dc2cacc4c..9131286505 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -14,28 +14,27 @@ public: virtual ~daPy_sightPacket_c() {} void setSight(); - void setSightImage(ResTIMG*); + void setSightImage(ResTIMG* i_img); - bool getDrawFlg() { return mDrawFlag; } + u8 getDrawFlg() { return mDrawFlag; } void onDrawFlg() { mDrawFlag = true; } void offDrawFlg() { mDrawFlag = false; } void setPos(const cXyz* i_pos) { mPos = *i_pos; } cXyz* getPosP() { return &mPos; } - /* 0x04 */ bool mDrawFlag; - /* 0x05 */ u8 field_0x5[3]; + /* 0x04 */ u8 mDrawFlag; /* 0x08 */ cXyz mPos; - /* 0x14 */ Mtx field_0x14; + /* 0x14 */ Mtx mProjMtx; /* 0x44 */ ResTIMG* mpImg; /* 0x48 */ u8* mpData; }; class daPy_boomerangMove_c { public: - void initOffset(cXyz const*); - void initOffset(cXyz const* xyz, dCcD_GObjInf const*) { initOffset(xyz); } - int posMove(cXyz*, s16*, fopAc_ac_c*, s16); - void bgCheckAfterOffset(cXyz const*); + void initOffset(const cXyz* i_pos); + void initOffset(const cXyz* i_pos, const dCcD_GObjInf*) { initOffset(i_pos); } + int posMove(cXyz* o_pos, s16* o_rotY, fopAc_ac_c* i_objActor, s16 i_rotStep); + void bgCheckAfterOffset(const cXyz* i_pos); static void initDropAngleY() { m_dropAngleY = 0x4000; } static void offEventKeepFlg() { m_eventKeepFlg = 0; } @@ -47,8 +46,8 @@ public: private: /* 0x0 */ u8 field_0x0; /* 0x2 */ s16 field_0x2; - /* 0x4 */ f32 field_0x4; - /* 0x8 */ f32 field_0x8; + /* 0x4 */ f32 m_offsetY; + /* 0x8 */ f32 m_offsetXZ; }; // Size: 0xC class daPy_anmHeap_c { @@ -61,24 +60,24 @@ public: HEAP_TYPE_5, }; - daPy_anmHeap_c(u32 param_0 = 0); + daPy_anmHeap_c(u32 i_bufferSize = 0); ~daPy_anmHeap_c(); void initData(); void* mallocBuffer(); - void createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE); - void* loadData(u16); - void* loadDataIdx(u16); - void* loadDataPriIdx(u16); - void* loadDataDemoRID(u16, u16); + void createHeap(daAlinkHEAP_TYPE i_heapType); + void* loadData(u16 i_resId); + void* loadDataIdx(u16 i_resId); + void* loadDataPriIdx(u16 i_resId); + void* loadDataDemoRID(u16 i_resID, u16 i_arcNo); JKRHeap* setAnimeHeap(); u16 getIdx() const { return mIdx; } - void resetIdx() { mIdx = 0xffff; } - void resetPriIdx() { mPriIdx = 0xffff; } - void resetArcNo() { mArcNo = 0xffff; } + void resetIdx() { mIdx = 0xFFFF; } + void resetPriIdx() { mPriIdx = 0xFFFF; } + void resetArcNo() { mArcNo = 0xFFFF; } bool checkNoSetArcNo() const { return mArcNo == 0xFFFF; } - void setBufferSize(u32 size) { mBufferSize = size; } - void setBuffer(u8* buf) { mBuffer = buf; } + void setBufferSize(u32 i_size) { mBufferSize = i_size; } + void setBuffer(u8* i_buffer) { mBuffer = i_buffer; } u32 getBufferSize() { return mBufferSize; } u8* getBuffer() { return mBuffer; } bool checkNoSetIdx() const { return mIdx == 0xFFFF; } @@ -86,11 +85,9 @@ public: u16 getArcNo() const { return mArcNo; } void setIdx(u16 i_idx) { mIdx = i_idx; } -private: /* 0x00 */ u16 mIdx; /* 0x02 */ u16 mPriIdx; /* 0x04 */ u16 mArcNo; - /* 0x06 */ u16 field_0x06; /* 0x08 */ u32 mBufferSize; /* 0x0C */ u8* mBuffer; /* 0x10 */ JKRSolidHeap* mAnimeHeap; @@ -101,11 +98,11 @@ public: daPy_actorKeep_c() { clearData(); } void setActor(); - void setData(fopAc_ac_c*); + void setData(fopAc_ac_c* i_actor); void clearData(); fpc_ProcID getID() const { return mID; } - void setID(fpc_ProcID id) { mID = id; } + void setID(fpc_ProcID i_id) { mID = i_id; } fopAc_ac_c* getActor() const { return mActor; } fopAc_ac_c* getActorConst() const { return mActor; } @@ -120,10 +117,10 @@ public: daPy_frameCtrl_c() {} bool checkAnmEnd(); void updateFrame(); - void setFrameCtrl(u8, short, short, f32, f32); + void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame); - u16 getEndFlg() { return mEndFlg; } - u16 getNowSetFlg() { return mNowSetFlg; } + u16 getEndFlg() const { return mEndFlg; } + u16 getNowSetFlg() const { return mNowSetFlg; } void onEndFlg() { mEndFlg = 1; } void onNowSetFlg() { mNowSetFlg = 1; } void offNowSetFlg() { mNowSetFlg = 0; } @@ -300,8 +297,7 @@ class daPy_py_c : public fopAc_ac_c { public: /* 0x0568 */ u8 mCutType; /* 0x0569 */ u8 mComboCutCount; - /* 0x056A */ u8 mSpecialMode; // maybe needs better name - /* 0x056B */ u8 field_0x56b; + /* 0x056A */ u8 mMode; /* 0x056C */ s16 mDamageTimer; /* 0x056E */ u16 mSwordUpTimer; /* 0x0570 */ u32 mNoResetFlg0; @@ -313,8 +309,8 @@ public: /* 0x0588 */ u32 mEndResetFlg0; /* 0x058C */ u32 mEndResetFlg1; /* 0x0590 */ u32 mEndResetFlg2; - /* 0x0594 */ f32 field_0x594; - /* 0x0598 */ f32 field_0x598; + /* 0x0594 */ f32 mMaxSpeed; + /* 0x0598 */ f32 mHeight; /* 0x059C */ csXyz mBodyAngle; /* 0x05A4 */ cXyz mHeadTopPos; /* 0x05B0 */ cXyz mItemPos; @@ -323,23 +319,23 @@ public: /* 0x05D4 */ cXyz mRightHandPos; /* 0x05E0 */ cXyz mLeftFootPos; /* 0x05EC */ cXyz mRightFootPos; - /* 0x05F8 */ cXyz field_0x5f8; + /* 0x05F8 */ cXyz mViewerCurrentPos; /* 0x0604 */ daPy_demo_c mDemo; public: enum daPy_FLG0 { - FLG0_UNK_40000000 = 0x40000000, + FLG0_HEAVY_STATE = 0x40000000, FLG0_EQUIP_HVY_BOOTS = 0x2000000, FLG0_PLAYER_NO_DRAW = 0x8000000, FLG0_UNK_10000000 = 0x10000000, FLG0_UNK_1000000 = 0x1000000, - FLG0_UNDERWATER = 0x800000, + FLG0_WATER_IN_MOVE = 0x800000, FLG0_UNK_400000 = 0x400000, - FLG0_UNK_200000 = 0x200000, + FLG0_GORON_UP_STOP_CANCEL = 0x200000, FLG0_UNK_100000 = 0x100000, - FLG0_UNK_80000 = 0x80000, + FLG0_FAST_SWORD_CUT = 0x80000, FLG0_UNK_40000 = 0x40000, - FLG0_DK_CAUGHT = 0x20000, + FLG0_DK_CAUGHT2 = 0x20000, FLG0_UNK_10000 = 0x10000, FLG0_UNK_8000 = 0x8000, FLG0_UNK_4000 = 0x4000, @@ -349,24 +345,20 @@ public: FLG0_UNK_400 = 0x400, FLG0_SWIM_UP = 0x100, FLG0_UNK_80 = 0x80, - FLG0_UNK_40 = 0x40, + FLG0_CUT_AT_FLG = 0x40, FLG0_UNK_20 = 0x20, FLG0_UNK_10 = 0x10, FLG0_UNK_8 = 0x8, FLG0_MIDNA_RIDE = 4, FLG0_UNK_2 = 2, - - FLG0_HVY_STATE = FLG0_UNK_40000000 | FLG0_EQUIP_HVY_BOOTS | FLG0_DK_CAUGHT, - FLG0_UNK_14000 = 0x14000, - FLG0_UNK_10400 = 0x10400, - FLG0_UNK_18 = FLG0_UNK_10 | FLG0_UNK_8, }; enum daPy_FLG1 { FLG1_UNK_80000000 = 0x80000000, - FLG1_ICE_FREEZE = 0x40000000, + FLG1_FREEZE_DAMAGE = 0x40000000, FLG1_UNK_20000000 = 0x20000000, FLG1_UNK_10000000 = 0x10000000, + FLG1_UNK_8000000 = 0x8000000, FLG1_UNK_4000000 = 0x4000000, FLG1_IS_WOLF = 0x2000000, FLG1_UNK_1000000 = 0x1000000, @@ -378,7 +370,7 @@ public: FLG1_UNK_40000 = 0x40000, FLG1_UNK_20000 = 0x20000, FLG1_UNK_10000 = 0x10000, - FLG1_UNK_8000 = 0x8000, + FLG1_FISHING_ROD_CASTING_END = 0x8000, FLG1_THROW_DAMAGE = 0x4000, FLG1_UNK_2000 = 0x2000, FLG1_UNK_1000 = 0x1000, @@ -393,22 +385,19 @@ public: FLG1_UNK_4 = 4, FLG1_UNK_2 = 2, FLG1_DK_CAUGHT = 1, - - FLG1_UNK_1800 = 0x1800, - FLG1_UNK_10100000 = FLG1_UNK_10000000 | FLG1_UNK_100000, }; enum daPy_FLG2 { FLG2_HORSE_ZELDA = 0x40000000, - FLG2_UNK_20000000 = 0x20000000, - FLG2_UNK_10000000 = 0x10000000, + FLG2_FISHING_CAST_WAIT = 0x20000000, + FLG2_KANDELAAR_LIGHT_OFF = 0x10000000, FLG2_UNK_4080000 = 0x4080000, FLG2_UNK_4000000 = 0x4000000, FLG2_UNK_2080000 = 0x2080000, FLG2_UNK_2000000 = 0x2000000, FLG2_UNK_8000000 = 0x8000000, - FLG2_UNK_1000000 = 0x1000000, - FLG2_BOAR_SINGLE_BATTLE = 0x800000, + FLG2_BOAR_SINGLE_BATTLE_2ND = 0x1000000, + FLG2_BOAR_SINGLE_BATTLE_1ST = 0x800000, FLG2_STATUS_WINDOW_DRAW = 0x400000, FLG2_UNK_280000 = 0x280000, FLG2_UNK_200000 = 0x200000, @@ -417,12 +406,12 @@ public: FLG2_FORCE_GAMEOVER = 0x40000, FLG2_UNK_20000 = 0x20000, FLG2_WOLF_DASH_AUTO_JUMP = 0x10000, - FLG2_SCN_CHG_START = 0x8000, - FLG2_UNK_4000 = 0x4000, + FLG2_SCENE_CHANGE_START = 0x8000, + FLG2_FOG_FADE = 0x4000, FLG2_UNK_2000 = 0x2000, FLG2_PRESSED_DAMAGE = 0x1000, FLG2_UNK_800 = 0x800, - FLG2_PLAYER_SHADOW = 0x400, + FLG2_PLAYER_SHADOW_NO_DRAW = 0x400, FLG2_UNK_200 = 0x200, FLG2_UNK_100 = 0x100, FLG2_UNK_80 = 0x80, @@ -431,11 +420,8 @@ public: FLG2_UNK_10 = 0x10, FLG2_UNK_8 = 8, FLG2_UNK_4 = 4, - FLG2_UNK_2 = 2, + FLG2_COMBO_RESERB = 2, FLG2_UNK_1 = 1, - - FLG2_UNK_58 = FLG2_WOLF_ENEMY_HANG_BITE | FLG2_UNK_10 | FLG2_UNK_8, - FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1, }; enum daPy_FLG3 { @@ -460,13 +446,13 @@ public: FLG3_UNK_1000 = 0x1000, FLG3_UNK_800 = 0x800, FLG3_UNK_400 = 0x400, - FLG3_UNK_200 = 0x200, - FLG3_UNK_100 = 0x100, - FLG3_UNK_80 = 0x80, - FLG3_UNK_40 = 0x40, - FL3_TRANING_CUT_BACK = 0x20, - FLG3_UNK_10 = 0x10, - FLG3_UNK_8 = 8, + FLG3_TRANING_CUT_LARGE_JUMP = 0x200, + FLG3_TRANING_CUT_LARGE_TURN = 0x100, + FLG3_TRANING_CUT_FAST = 0x80, + FLG3_TRANING_CUT_HEAD = 0x40, + FLG3_TRANING_CUT_BACK = 0x20, + FLG3_TRANING_CUT_DOWN = 0x10, + FLG3_TRANING_SHIELD_ATTACK = 8, FLG3_UNK_4 = 4, FLG3_UNK_1 = 1, }; @@ -477,21 +463,21 @@ public: ERFLG0_UNK_20000000 = 0x20000000, ERFLG0_WOLF_FCHAIN_PULL = 0x10000000, ERFLG0_UNK_8000000 = 0x8000000, - ERFLG0_UNK_4000000 = 0x4000000, + ERFLG0_FISHING_RELEASE = 0x4000000, ERFLG0_BOSS_ROOM_WAIT = 0x2000000, ERFLG0_ENEMY_DEAD = 0x1000000, ERFLG0_UNK_800000 = 0x800000, ERFLG0_BEE_FOLLOW = 0x400000, - ERFLG0_UNK_200000 = 0x200000, + ERFLG0_LEAF_SE = 0x200000, ERFLG0_UNK_100000 = 0x100000, ERFLG0_SINGLE_BOAR_AVOID = 0x80000, ERFLG0_FISHING_ROD_GET_FISH = 0x40000, - ERFLG0_UNK_20000 = 0x20000, - ERFLG0_UNK_10000 = 0x10000, + ERFLG0_FISHING_ROD_REEL_END = 0x20000, + ERFLG0_FISHING_HIT = 0x10000, ERFLG0_UNK_4000 = 0x4000, ERFLG0_UNK_2000 = 0x2000, ERFLG0_UNK_1000 = 0x1000, - ERFLG0_UNK_400 = 0x400, + ERFLG0_NECK_SEARCH_WIDE = 0x400, ERFLG0_FORCE_AUTO_JUMP = 0x200, ERFLG0_UNK_100 = 0x100, ERFLG0_UNK_80 = 0x80, @@ -500,31 +486,31 @@ public: ERFLG0_NOT_HANG = 0x10, ERFLG0_UNK_8 = 8, ERFLG0_UNK_4 = 4, - ERFLG0_UNK_2 = 2, + ERFLG0_FORCE_WOLF_CHANGE = 2, ERFLG0_UNK_1 = 1, }; enum daPy_ERFLG1 { - ERFLG1_GANON_FINISH = 0x80000000, - ERFLG1_UNK_40000000 = 0x40000000, - ERFLG1_UNK_20000000 = 0x20000000, - ERFLG1_UNK_10000000 = 0x10000000, + ERFLG1_SHIELD_BACKBONE = 0x80000000, + ERFLG1_SWORD_TRIGGER_NON = 0x40000000, + ERFLG1_CANOE_ITEM_CANCEL = 0x20000000, + ERFLG1_DO_PUT_EMPHASYS = 0x10000000, ERFLG1_LARGE_DAMAGE_UP_STOP = 0x8000000, - ERFLG1_UNK_4000000 = 0x4000000, - ERFLG1_UNK_2000000 = 0x2000000, - ERFLG1_UNK_1000000 = 0x1000000, + ERFLG1_DO_EXCHANGE_PUT_IN = 0x4000000, + ERFLG1_CHAIN_PULL_END = 0x2000000, + ERFLG1_CHAIN_FORCE_PULL = 0x1000000, ERFLG1_UNK_400000 = 0x400000, ERFLG1_UNK_200000 = 0x200000, ERFLG1_UNK_100000 = 0x100000, ERFLG1_UNK_80000 = 0x80000, ERFLG1_UNK_40000 = 0x40000, - ERFLG1_UNK_20000 = 0x20000, + ERFLG1_WATER_DROP = 0x20000, ERFLG1_UNK_10000 = 0x10000, ERFLG1_UNK_8000 = 0x8000, ERFLG1_UNK_4000 = 0x4000, ERFLG1_UNK_2000 = 0x2000, ERFLG1_UNK_1000 = 0x1000, - ERFLG1_UNK_800 = 0x800, + ERFLG1_WATERFALL_FRONT_HIT = 0x800, ERFLG1_UNK_400 = 0x400, ERFLG1_WOLF_EYE_KEEP = 0x200, ERFLG1_UNK_100 = 0x100, @@ -535,7 +521,7 @@ public: ERFLG1_UNK_8 = 8, ERFLG1_UNK_4 = 4, ERFLG1_UNK_2 = 2, - ERFLG1_UNK_1 = 1, + ERFLG1_NS_SCREAM = 1, }; enum daPy_ERFLG2 { @@ -543,10 +529,10 @@ public: ERFLG2_PORTAL_WARP_MIDNA_ATN_KEEP = 0x80, ERFLG2_UNK_40 = 0x40, ERFLG2_UNK_20 = 0x20, - ERFLG2_UNK_10 = 0x10, - ERFLG2_UNK_8 = 8, - ERFLG2_UNK_2 = 2, - ERFLG2_UNK_1 = 1, + ERFLG2_LIGHT_SWORD_GET_EFFECT = 0x10, + ERFLG2_FORCE_GRAB_REBOUND = 8, + ERFLG2_FORCE_HORSE_GETOFF = 2, + ERFLG2_FISHING_KEEP = 1, }; enum daPy_RFLG0 { @@ -556,20 +542,20 @@ public: RFLG0_UNK_10000000 = 0x10000000, RFLG0_UNK_8000000 = 0x8000000, RFLG0_UNK_4000000 = 0x4000000, - RFLG0_UNK_2000000 = 0x2000000, + RFLG0_ITEM_SIGHT_BG_HIT = 0x2000000, RFLG0_GRAB_PUT_START = 0x400000, RFLG0_WOLF_GROWL = 0x200000, RFLG0_UNK_80000 = 0x80000, - RFLG0_UNK_40000 = 0x40000, - RFLG0_UNK_20000 = 0x20000, - RFLG0_UNK_10000 = 0x10000, - RFLG0_UNK_8000 = 0x8000, + RFLG0_CLIMB_END_HANG = 0x40000, + RFLG0_WOLF_TAG_LOCK_JUMP_READY = 0x20000, + RFLG0_ATTENTION_LOCK = 0x10000, + RFLG0_GRAB_UP_START = 0x8000, RFLG0_UNK_4000 = 0x4000, RFLG0_FRONT_ROLL_CRASH = 0x2000, RFLG0_ENEMY_ATTN_LOCK = 0x1000, RFLG0_UNK_400 = 0x400, RFLG0_COW_GAME_LEASH = 0x200, - RFLG0_UNK_100 = 0x100, + RFLG0_AUTO_JUMP_START = 0x100, RFLG0_UNK_80 = 0x80, RFLG0_UNK_40 = 0x40, RFLG0_GRAB_UP_END = 0x20, @@ -577,15 +563,15 @@ public: RFLG0_UNK_8 = 0x8, RFLG0_GRAB_THROW = 0x4, RFLG0_UNK_2 = 0x2, - RFLG0_UNK_1 = 0x1, + RFLG0_STICK_ARROW_RESET = 0x1, }; enum daPy_RFLG1 { RFLG1_DAMAGE_IMPACT = 0x400, - RFLG1_UNK_200 = 0x200, - RFLG1_UNK_100 = 0x100, - RFLG1_UNK_80 = 0x80, - RFLG1_UNK_40 = 0x40, + RFLG0_FISHINGROD_USE_ACCEPT = 0x200, + RFLG1_INSECT_RELEASE = 0x100, + RFLG0_FISHINGROD_USE_START = 0x80, + RFLG1_BOARD_NO_FOOT_ANGLE = 0x40, RFLG1_UNK_30 = 0x30, RFLG1_UNK_20 = 0x20, RFLG1_UNK_10 = 0x10, @@ -593,11 +579,9 @@ public: RFLG1_UNK_4 = 0x4, RFLG1_UNK_2 = 0x2, RFLG1_WOLF_ATTACK_REVERSE = 0x1, - - RFLG1_UNK_C = 0xC, }; - enum { + enum daPy_MODE { /* 0x01 */ SMODE_SUMO_READY = 1, /* 0x25 */ SMODE_SUMO_LOSE = 37, /* 0x27 */ SMODE_WOLF_PUZZLE = 39, @@ -606,7 +590,7 @@ public: /* 0x2C */ SMODE_CARGO_CARRY, }; - enum CutType { + enum daPy_CUT_TYPE { /* 0x00 */ CUT_TYPE_NONE, /* 0x01 */ CUT_TYPE_NM_VERTICAL, /* 0x02 */ CUT_TYPE_NM_STAB, @@ -618,13 +602,13 @@ public: /* 0x08 */ CUT_TYPE_TURN_RIGHT, /* 0x09 */ CUT_TYPE_UNK_9, /* 0x0A */ CUT_TYPE_JUMP, - /* 0x0B */ CUT_TYPE_DASH_UNK_B, - /* 0x0C */ CUT_TYPE_DASH_UNK_C, - /* 0x0D */ CUT_TYPE_DASH_UNK_D, + /* 0x0B */ CUT_TYPE_DASH_LEFT_BOARD, + /* 0x0C */ CUT_TYPE_DASH_RIGHT_BOARD, + /* 0x0D */ CUT_TYPE_DASH_CHARGE_BOARD, /* 0x0E */ CUT_TYPE_UNK_E, /* 0x0F */ CUT_TYPE_UNK_F, - /* 0x10 */ CUT_TYPE_AIR, - /* 0x11 */ CUT_TYPE_DASH_UNK_11, + /* 0x10 */ CUT_TYPE_DASH_LEFT_SIDESTEP, + /* 0x11 */ CUT_TYPE_DASH_RIGHT_SIDESTEP, /* 0x12 */ CUT_TYPE_LARGE_JUMP_INIT, /* 0x13 */ CUT_TYPE_LARGE_JUMP, /* 0x14 */ CUT_TYPE_LARGE_JUMP_FINISH, @@ -641,15 +625,15 @@ public: /* 0x1F */ CUT_TYPE_MORTAL_DRAW_B, /* 0x20 */ CUT_TYPE_FINISH_STAB, /* 0x21 */ CUT_TYPE_COMBO_STAB, - /* 0x22 */ CUT_TYPE_HORSE_UNK_22, - /* 0x23 */ CUT_TYPE_HORSE_UNK_23, + /* 0x22 */ CUT_TYPE_HORSE_LEFT_A, + /* 0x23 */ CUT_TYPE_HORSE_LEFT_B, /* 0x24 */ CUT_TYPE_UNK_24, - /* 0x25 */ CUT_TYPE_DASH_UNK_25, - /* 0x26 */ CUT_TYPE_DASH_UNK_26, + /* 0x25 */ CUT_TYPE_DASH_LEFT, + /* 0x26 */ CUT_TYPE_DASH_RIGHT, /* 0x27 */ CUT_TYPE_DOWN, /* 0x28 */ CUT_TYPE_UNK_28, /* 0x29 */ CUT_TYPE_GUARD_ATTACK, - /* 0x2A */ CUT_TYPE_HORSE_UNK_2A, + /* 0x2A */ CUT_TYPE_HORSE_RIGHT_A, /* 0x2B */ CUT_TYPE_HORSE_TURN, /* 0x2C */ CUT_TYPE_WOLF_B_LEFT, /* 0x2D */ CUT_TYPE_WOLF_B_RIGHT, @@ -663,32 +647,32 @@ public: /* 0x35 */ CUT_TYPE_WOLF_UNK_35, /* 0x36 */ CUT_TYPE_WOLF_LOCK, /* 0x37 */ CUT_TYPE_WOLF_UNK_37, - /* 0x38 */ CUT_TYPE_DASH_UNK_38, + /* 0x38 */ CUT_TYPE_DASH_CHARGE, /* 0x39 */ CUT_TYPE_WOLF_JUMP, }; - static u32 setParamData(int, int, int, int); - static BOOL checkFishingRodItem(int); - static BOOL checkBombItem(int); - static BOOL checkBottleItem(int); - static BOOL checkDrinkBottleItem(int); - static BOOL checkOilBottleItem(int); - static BOOL checkOpenBottleItem(int); - static BOOL checkBowItem(int); - static BOOL checkHookshotItem(int); - static BOOL checkTradeItem(int); - static BOOL checkDungeonWarpItem(int); + static u32 setParamData(int i_roomNo, int i_mode, int, int); + static BOOL checkFishingRodItem(int i_itemNo); + static BOOL checkBombItem(int i_itemNo); + static BOOL checkBottleItem(int i_itemNo); + static BOOL checkDrinkBottleItem(int i_itemNo); + static BOOL checkOilBottleItem(int i_itemNo); + static BOOL checkOpenBottleItem(int i_itemNo); + static BOOL checkBowItem(int i_itemNo); + static BOOL checkHookshotItem(int i_itemNo); + static BOOL checkTradeItem(int i_itemNo); + static BOOL checkDungeonWarpItem(int i_itemNo); static BOOL checkMasterSwordEquip(); static BOOL checkWoodShieldEquip(); static f32 getAttentionOffsetY(); static int checkNowWolfEyeUp(); - static void forceRestartRoom(int, u32, int); + static void forceRestartRoom(int i_dmgAmount, u32 i_mode, int); static BOOL setFmChainPos(fopAc_ac_c*, cXyz*, int); static void cancelFmChainGrab(); - static void setLookPos(cXyz*); - static void setPlayerSe(u32); - static bool linkGrabSubjectNoDraw(fopAc_ac_c*); - static bool wolfGrabSubjectNoDraw(fopAc_ac_c*); + static void setLookPos(cXyz* i_pos); + static void setPlayerSe(u32 i_soundID); + static bool linkGrabSubjectNoDraw(fopAc_ac_c* i_actor); + static bool wolfGrabSubjectNoDraw(fopAc_ac_c* i_actor); static bool checkRoomRestartStart(); static u32 checkCarryStartLightBallA(); static u32 checkCarryStartLightBallB(); @@ -697,16 +681,18 @@ public: static bool checkBoomerangCharge(); static bool checkBoomerangChargeTime(); static daBoomerang_c* getThrowBoomerangActor(); - static void cancelBoomerangLockActor(fopAc_ac_c*); - static void setPlayerDamage(int, int); - static void setMidnaMotionNum(int); - static void setMidnaFaceNum(int); + static void cancelBoomerangLockActor(fopAc_ac_c* i_actor); + static void setPlayerDamage(int i_dmgAmount, BOOL i_setDmgTimer); + static BOOL checkAcceptDungeonWarp(); + static void setMidnaMotionNum(int i_motionNum); + static void setMidnaFaceNum(int i_faceNum); + static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; } static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; } cXyz getHeadTopPos() const { return mHeadTopPos; } u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); } - bool checkGoronSideMove() const { return mSpecialMode == 0x2B; } + bool checkGoronSideMove() const { return mMode == 0x2B; } cXyz* getRightFootPosP() { return &mRightFootPos; } cXyz* getLeftFootPosP() { return &mLeftFootPos; } cXyz getLeftFootPos() const { return mLeftFootPos; } @@ -717,7 +703,7 @@ public: const cXyz getLeftHandPos() const { return mLeftHandPos; } const cXyz getItemPos() const { return mItemPos; } BOOL getDkCaught() const { return checkNoResetFlg1(FLG1_DK_CAUGHT); } - BOOL getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT); } + BOOL getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT2); } BOOL getStCaught() const { return checkNoResetFlg1(FLG1_UNK_80000000); } /* vt 0X008 */ virtual cXyz* getMidnaAtnPos() const { return NULL; } @@ -790,7 +776,7 @@ public: /* vt 0X114 */ virtual void voiceStart(u32) {} /* vt 0X118 */ virtual void seStartOnlyReverb(u32) {} /* vt 0X11C */ virtual void seStartOnlyReverbLevel(u32) {} - /* vt 0X120 */ virtual void setOutPower(f32, short, int) {} + /* vt 0X120 */ virtual void setOutPower(f32, s16, int) {} /* vt 0X124 */ virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*) {} /* vt 0X128 */ virtual void onMagneGrab(f32, f32) {} /* vt 0X12C */ virtual void onFrollCrashFlg(u8, int) {} @@ -803,12 +789,12 @@ public: /* vt 0X148 */ virtual BOOL checkSingleBoarBattleSecondBowReady() const { return FALSE; } /* vt 0X14C */ virtual bool checkPointSubWindowMode() const { return FALSE; } /* vt 0X150 */ virtual void setClothesChange(int) {} - /* vt 0X154 */ virtual void setPlayerPosAndAngle(cXyz const*, short, int) {} + /* vt 0X154 */ virtual void setPlayerPosAndAngle(cXyz const*, s16, int) {} /* vt 0X158 */ virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*) {} /* vt 0X15C */ virtual void setPlayerPosAndAngle(f32 (*)[4]) {} - /* vt 0X160 */ virtual bool setThrowDamage(short, f32, f32, int, int, int) { return FALSE; } + /* vt 0X160 */ virtual bool setThrowDamage(s16, f32, f32, int, int, int) { return FALSE; } /* vt 0X164 */ virtual bool checkSetNpcTks(cXyz*, int, int) { return FALSE; } - /* vt 0X168 */ virtual int setRollJump(f32, f32, short) { return FALSE; } + /* vt 0X168 */ virtual int setRollJump(f32, f32, s16) { return FALSE; } /* vt 0X16C */ virtual void playerStartCollisionSE(u32, u32) {} /* vt 0X170 */ virtual void changeTextureAnime(u16, u16, int) {} /* vt 0X174 */ virtual void cancelChangeTextureAnime() {} @@ -835,13 +821,13 @@ public: /* vt 0X1C8 */ virtual cXyz* getKandelaarFlamePos() { return NULL; } /* vt 0X1CC */ virtual bool checkUseKandelaar(int) { return FALSE; } /* vt 0X1D0 */ virtual void setDkCaught(fopAc_ac_c*) {} - /* vt 0X1D4 */ virtual void onPressedDamage(cXyz const&, short) {} + /* vt 0X1D4 */ virtual void onPressedDamage(cXyz const&, s16) {} /* vt 0X1D8 */ virtual bool checkPriActorOwn(fopAc_ac_c const*) const { return FALSE; } /* vt 0X1DC */ virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2) { return FALSE; } /* vt 0X1E0 */ virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const { return FALSE; } - /* vt 0X1E4 */ virtual void setWolfEnemyHangBiteAngle(short) {} + /* vt 0X1E4 */ virtual void setWolfEnemyHangBiteAngle(s16) {} /* vt 0X1E8 */ virtual void setKandelaarMtx(f32 (*)[4], int, int) {} - /* vt 0X1EC */ virtual bool getStickAngleFromPlayerShape(short*) const { return FALSE; } + /* vt 0X1EC */ virtual bool getStickAngleFromPlayerShape(s16*) const { return FALSE; } /* vt 0X1F0 */ virtual bool checkSpinnerPathMove() { return FALSE; } /* vt 0X1F4 */ virtual bool checkSpinnerTriggerAttack() { return FALSE; } /* vt 0X1F8 */ virtual void onSpinnerPathForceRemove() {} @@ -858,7 +844,7 @@ public: /* vt 0X224 */ virtual s16 checkSumouWithstand() const { return 0; } /* vt 0X228 */ virtual void cancelGoronThrowEvent() {} /* vt 0X22C */ virtual void setSumouGraspCancelCount(int) {} - /* vt 0X230 */ virtual void setSumouPushBackDirection(short) {} + /* vt 0X230 */ virtual void setSumouPushBackDirection(s16) {} /* vt 0X234 */ virtual void setSumouLoseHeadUp() {} /* vt 0X238 */ virtual s16 getGiantPuzzleAimAngle() const { return shape_angle.y; } /* vt 0X23C */ virtual void setGoronSideMove(fopAc_ac_c*) {} @@ -894,7 +880,7 @@ public: bool getSumouCameraMode() const { bool sumouCameraMode = false; - if (mSpecialMode != 0 && mSpecialMode < 0x26) { + if (mMode != 0 && mMode < 0x26) { sumouCameraMode = true; } return sumouCameraMode; @@ -903,7 +889,7 @@ public: bool getSumouMode() const { return getSumouCameraMode(); } void cancelOriginalDemo() { mDemo.setSystemDemoType(); - mDemo.setDemoMode(1); + mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e); } u32 getDemoMode() const { return mDemo.getDemoMode(); } @@ -911,80 +897,80 @@ public: u8 getCutCount() const { return mComboCutCount; } BOOL checkStatusWindowDraw() const { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); } - bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; } - BOOL getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); } + bool checkCargoCarry() const { return mMode == SMODE_CARGO_CARRY; } + BOOL getHeavyStateAndBoots() { return checkNoResetFlg0(daPy_FLG0(FLG0_HEAVY_STATE | FLG0_EQUIP_HVY_BOOTS | FLG0_DK_CAUGHT2)); } BOOL checkEnemyAttentionLock() const { return checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); } - BOOL getGrabUpStart() const { return checkResetFlg0(RFLG0_UNK_8000); } - bool checkCanoeSlider() const { return mSpecialMode == 0x2D; } - bool checkGoatStopGame() const { return mSpecialMode == 0x2A; } - void onGoatStopGame() { mSpecialMode = 0x2A; } + BOOL getGrabUpStart() const { return checkResetFlg0(RFLG0_GRAB_UP_START); } + bool checkCanoeSlider() const { return mMode == 0x2D; } + bool checkGoatStopGame() const { return mMode == 0x2A; } + void onGoatStopGame() { mMode = 0x2A; } u8 getCutType() const { return mCutType; } u16 getSwordAtUpTime() const { return mSwordUpTimer; } s16 getDamageWaitTimer() const { return mDamageTimer; } - BOOL checkWaterInMove() const { return checkNoResetFlg0(FLG0_UNDERWATER); } - BOOL checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); } + BOOL checkWaterInMove() const { return checkNoResetFlg0(FLG0_WATER_IN_MOVE); } + BOOL checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCENE_CHANGE_START); } BOOL checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } BOOL checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); } - BOOL checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); } - BOOL checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); } + BOOL checkFreezeDamage() const { return checkNoResetFlg1(FLG1_FREEZE_DAMAGE); } + BOOL checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_WOLF_TAG_LOCK_JUMP_READY); } BOOL checkDamageImpact() const { return checkResetFlg1(RFLG1_DAMAGE_IMPACT); } BOOL getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); } BOOL getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); } BOOL checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); } BOOL checkHorseZelda() const { return checkNoResetFlg2(FLG2_HORSE_ZELDA); } - BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); } - BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_UNK_40); } + BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_BOAR_SINGLE_BATTLE_2ND | FLG2_BOAR_SINGLE_BATTLE_1ST)); } + BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_BOARD_NO_FOOT_ANGLE); } BOOL checkGrabThrow() const { return checkResetFlg0(RFLG0_GRAB_THROW); } BOOL checkMidnaAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_ATN_POS); } BOOL checkMidnaHairAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_HAIR_ATN_POS); } - BOOL checkAttentionLock() const { return checkResetFlg0(RFLG0_UNK_10000); } - BOOL checkFishingRodUseStart() const { return checkResetFlg1(RFLG1_UNK_80); } - BOOL checkFishingRodUseAccept() const { return checkResetFlg1(RFLG1_UNK_200); } + BOOL checkAttentionLock() const { return checkResetFlg0(RFLG0_ATTENTION_LOCK); } + BOOL checkFishingRodUseStart() const { return checkResetFlg1(RFLG0_FISHINGROD_USE_START); } + BOOL checkFishingRodUseAccept() const { return checkResetFlg1(RFLG0_FISHINGROD_USE_ACCEPT); } void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); } void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); } void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); } - void onLeafSe() { onEndResetFlg0(ERFLG0_UNK_200000); } + void onLeafSe() { onEndResetFlg0(ERFLG0_LEAF_SE); } void onWolfFchainPull() { onEndResetFlg0(ERFLG0_WOLF_FCHAIN_PULL); } void onFishingRodGetFish() { onEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH); } void onSingleBoarAvoid() { onEndResetFlg0(ERFLG0_SINGLE_BOAR_AVOID); } - void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); } + void onShieldBackBone() { onEndResetFlg1(ERFLG1_SHIELD_BACKBONE); } void onWolfEyeKeep() { onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); } void onPortalWarpMidnaAtnKeep() { onEndResetFlg2(ERFLG2_PORTAL_WARP_MIDNA_ATN_KEEP); } - void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); } - void onDkCaught2() { onNoResetFlg0(FLG0_DK_CAUGHT); } - void onFishingRodCastingEnd() { onNoResetFlg1(FLG1_UNK_8000); } - void onFishingRodReelEnd() { onEndResetFlg0(ERFLG0_UNK_20000); } - void onFishingHit() { onEndResetFlg0(ERFLG0_UNK_10000); } - void onFishingKeep() { onEndResetFlg2(ERFLG2_UNK_1); } - void onTraningCutHead() { onNoResetFlg3(FLG3_UNK_40); } - void onTraningCutFast() { onNoResetFlg3(FLG3_UNK_80); } - void onTraningCutLargeJump() { onNoResetFlg3(FLG3_UNK_200); } - void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_UNK_100); } - void onTraningCutDown() { onNoResetFlg3(FLG3_UNK_10); } - void onTraningShieldAttack() { onNoResetFlg3(FLG3_UNK_8); } - - BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); } - BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); } - BOOL checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } - BOOL checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_UNK_1000000); } + void onFogFade() { onNoResetFlg2(FLG2_FOG_FADE); } + void onDkCaught2() { onNoResetFlg0(FLG0_DK_CAUGHT2); } + void onFishingRodCastingEnd() { onNoResetFlg1(FLG1_FISHING_ROD_CASTING_END); } + void onFishingRodReelEnd() { onEndResetFlg0(ERFLG0_FISHING_ROD_REEL_END); } + void onFishingHit() { onEndResetFlg0(ERFLG0_FISHING_HIT); } + void onFishingKeep() { onEndResetFlg2(ERFLG2_FISHING_KEEP); } + void onTraningCutHead() { onNoResetFlg3(FLG3_TRANING_CUT_HEAD); } + void onTraningCutFast() { onNoResetFlg3(FLG3_TRANING_CUT_FAST); } + void onTraningCutLargeJump() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_JUMP); } + void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_TURN); } + void onTraningCutDown() { onNoResetFlg3(FLG3_TRANING_CUT_DOWN); } + void onTraningShieldAttack() { onNoResetFlg3(FLG3_TRANING_SHIELD_ATTACK); } + + BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_STICK_ARROW_RESET); } + BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_CUT_AT_FLG); } + BOOL checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE_1ST); } + BOOL checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE_2ND); } BOOL getFootOnGround() const { return checkResetFlg1(daPy_RFLG1(RFLG1_UNK_10 | RFLG1_UNK_20)); } void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); } - bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); } + bool onWolfEnemyHangBite(fopAc_ac_c* i_enemy) { return onWolfEnemyBiteAll(i_enemy, FLG2_WOLF_ENEMY_HANG_BITE); } void offHorseZelda() { offNoResetFlg2(FLG2_HORSE_ZELDA); } void onHorseZelda() { onNoResetFlg2(FLG2_HORSE_ZELDA); } - BOOL checkItemSightBgHit() const { return checkResetFlg0(RFLG0_UNK_2000000); } + BOOL checkItemSightBgHit() const { return checkResetFlg0(RFLG0_ITEM_SIGHT_BG_HIT); } - void setCanoeSlider() { mSpecialMode = 0x2D; } + void setCanoeSlider() { mMode = 0x2D; } void offCanoeSlider() { if (checkCanoeSlider()) { - mSpecialMode = 0; + mMode = 0; } } void onMidnaTalkPolySpeed() { onNoResetFlg3(FLG3_MIDNA_TALK_POLY_SPEED); } @@ -992,28 +978,28 @@ public: void offCargoCarry() { if (checkCargoCarry()) { - mSpecialMode = 0; + mMode = 0; } } - bool onWolfEnemyCatch(fopAc_ac_c* i_actor) { return onWolfEnemyBiteAll(i_actor, FLG2_UNK_8); } + bool onWolfEnemyCatch(fopAc_ac_c* i_enemy) { return onWolfEnemyBiteAll(i_enemy, FLG2_UNK_8); } void offGoronSideMove() { if (checkGoronSideMove()) { - mSpecialMode = 0; + mMode = 0; } } void offGoronUpStopCancel() { - offNoResetFlg0(FLG0_UNK_200000); + offNoResetFlg0(FLG0_GORON_UP_STOP_CANCEL); } s16 getBodyAngleX() const { return mBodyAngle.x; } s16 getBodyAngleY() const { return mBodyAngle.y; } - f32 getHeight() const { return field_0x598; } + f32 getHeight() const { return mHeight; } - BOOL checkMidnaWarp() const { return 0; } + BOOL checkMidnaWarp() const { return FALSE; } u32 checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; } u32 checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; } @@ -1030,10 +1016,10 @@ public: void offNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 &= ~i_flag; } void offNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 &= ~i_flag; } - void offResetFlg0(daPy_RFLG0 flag) { mResetFlg0 &= ~flag; } - void offResetFlg1(daPy_RFLG1 flag) { mResetFlg1 &= ~flag; } - void onResetFlg0(daPy_RFLG0 flag) { mResetFlg0 |= flag; } - void onResetFlg1(daPy_RFLG1 flag) { mResetFlg1 |= flag; } + void offResetFlg0(daPy_RFLG0 i_flag) { mResetFlg0 &= ~i_flag; } + void offResetFlg1(daPy_RFLG1 i_flag) { mResetFlg1 &= ~i_flag; } + void onResetFlg0(daPy_RFLG0 i_flag) { mResetFlg0 |= i_flag; } + void onResetFlg1(daPy_RFLG1 i_flag) { mResetFlg1 |= i_flag; } void onEndResetFlg0(daPy_ERFLG0 i_flag) { mEndResetFlg0 |= i_flag; } void onEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 |= i_flag; } @@ -1057,7 +1043,7 @@ public: u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); } u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); } u32 checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); } - BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); } + BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_FAST_SWORD_CUT); } u32 checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); } BOOL checkWolfGrowl() const { return checkResetFlg0(RFLG0_WOLF_GROWL); } BOOL checkWolfThreat() const { return checkWolfGrowl(); } @@ -1072,28 +1058,28 @@ public: void onMidnaRide() { onNoResetFlg0(FLG0_MIDNA_RIDE); } void offMidnaRide() { offNoResetFlg0(FLG0_MIDNA_RIDE); } void onMidnaRideShock() { onEndResetFlg1(ERFLG1_MIDNA_RIDE_SHOCK); } - void onPlayerShadowNoDraw() { onNoResetFlg2(FLG2_PLAYER_SHADOW); } - void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW); } - void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); } + void onPlayerShadowNoDraw() { onNoResetFlg2(FLG2_PLAYER_SHADOW_NO_DRAW); } + void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW_NO_DRAW); } + void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_LIGHT_SWORD_GET_EFFECT); } void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); } - void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); } - void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_UNK_10000000); } - void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_UNK_4000000); } - void onNsScream() { onEndResetFlg1(ERFLG1_UNK_1); } - void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_UNK_1 | ERFLG1_UNK_2)); } + void onForceWolfChange() { onEndResetFlg0(ERFLG0_FORCE_WOLF_CHANGE); } + void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_DO_PUT_EMPHASYS); } + void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_DO_EXCHANGE_PUT_IN); } + void onNsScream() { onEndResetFlg1(ERFLG1_NS_SCREAM); } + void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_NS_SCREAM | ERFLG1_UNK_2)); } void onLargeDamageUpStop() { onEndResetFlg1(ERFLG1_LARGE_DAMAGE_UP_STOP); } - void onTraningCutBack() { onNoResetFlg3(FL3_TRANING_CUT_BACK); } - void onNeckSearchWide() { onEndResetFlg0(ERFLG0_UNK_400); } + void onTraningCutBack() { onNoResetFlg3(FLG3_TRANING_CUT_BACK); } + void onNeckSearchWide() { onEndResetFlg0(ERFLG0_NECK_SEARCH_WIDE); } void offPressedDamage() { offNoResetFlg2(FLG2_PRESSED_DAMAGE); } void onForceSubjectCancel() { onEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL); } void onEnemyDead() { onEndResetFlg0(ERFLG0_ENEMY_DEAD); } void offDkCaught() { offNoResetFlg1(FLG1_DK_CAUGHT); } - void offDkCaught2() { offNoResetFlg0(FLG0_DK_CAUGHT); } - void onWaterFallFrontHit() { onEndResetFlg1(ERFLG1_UNK_800); } - void onCanoeItemCancel() { onEndResetFlg1(ERFLG1_UNK_20000000); } - void onSwordTriggerNon() { onEndResetFlg1(ERFLG1_UNK_40000000); } + void offDkCaught2() { offNoResetFlg0(FLG0_DK_CAUGHT2); } + void onWaterFallFrontHit() { onEndResetFlg1(ERFLG1_WATERFALL_FRONT_HIT); } + void onCanoeItemCancel() { onEndResetFlg1(ERFLG1_CANOE_ITEM_CANCEL); } + void onSwordTriggerNon() { onEndResetFlg1(ERFLG1_SWORD_TRIGGER_NON); } - u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); } + u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_BOAR_SINGLE_BATTLE_2ND | FLG2_BOAR_SINGLE_BATTLE_1ST)); } u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); } void changeOriginalDemo() { @@ -1108,8 +1094,8 @@ public: mDemo.setParam2(i_param2); } - void changeDemoParam0(int i_param1) { - mDemo.setParam0(i_param1); + void changeDemoParam0(int i_param0) { + mDemo.setParam0(i_param0); } void changeDemoParam1(int i_param1) { @@ -1126,7 +1112,7 @@ public: void setItemPos(cXyz* i_itemPos) { mItemPos = *i_itemPos; } - cXyz* getViewerCurrentPosP() { return &field_0x5f8; } + cXyz* getViewerCurrentPosP() { return &mViewerCurrentPos; } static bool checkPeepEndSceneChange() { return getLastSceneMode() == 7; } @@ -1163,8 +1149,17 @@ public: return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR; } - /* dSv_event_flag_c::M_067 - Main Event - Midna riding / not riding (ON == riding) */ - static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); } + static bool checkCarvingWoodShieldEquip() { + return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD; + } + + static bool checkShopWoodShieldEquip() { + return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD; + } + + static BOOL checkPowerGloveGet() { return false; } + + static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(dSv_event_flag_c::M_067); } static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); } static daMidna_c* getMidnaActor() { return m_midnaActor; } @@ -1180,10 +1175,10 @@ public: } BOOL checkCowGameLash() const { return checkResetFlg0(RFLG0_COW_GAME_LEASH); } - BOOL checkClimbEndHang() { return checkResetFlg0(RFLG0_UNK_40000); } + BOOL checkClimbEndHang() { return checkResetFlg0(RFLG0_CLIMB_END_HANG); } void onForceHorseGetOff() { - onEndResetFlg2(ERFLG2_UNK_2); + onEndResetFlg2(ERFLG2_FORCE_HORSE_GETOFF); } s16 getFishingRodAngleY() const { @@ -1191,71 +1186,72 @@ public: } void onFishingRelease() { - onEndResetFlg0(ERFLG0_UNK_4000000); + onEndResetFlg0(ERFLG0_FISHING_RELEASE); } static daMidna_c* m_midnaActor; - void setGiantPuzzle() { mSpecialMode = SMODE_WOLF_PUZZLE; } - void setGiantPuzzleEnd() { mSpecialMode = 0; } + void setGiantPuzzle() { mMode = SMODE_WOLF_PUZZLE; } + void setGiantPuzzleEnd() { mMode = 0; } - BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_UNK_100); } + BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_AUTO_JUMP_START); } void onForceGrabRebound() { - onEndResetFlg2(ERFLG2_UNK_8); + onEndResetFlg2(ERFLG2_FORCE_GRAB_REBOUND); } - void setSumouReadyAcceptButton() { mSpecialMode = 2; } - void setSumouForceStand() { mSpecialMode = 3; } - void setSumouPushFrontStop() { mSpecialMode = 9; } - void setSumouPunchWinEnd() { mSpecialMode = 0xB; } - void setSumouPunchLoseEnd() { mSpecialMode = 0xC; } - void setSumouMoveWinEnd() { mSpecialMode = 0xD; } - void setSumouMoveLoseEnd() { mSpecialMode = 0xE; } + void setSumouReadyAcceptButton() { mMode = 2; } + void setSumouForceStand() { mMode = 3; } + void setSumouPushFrontStop() { mMode = 9; } + void setSumouPunchWinEnd() { mMode = 0xB; } + void setSumouPunchLoseEnd() { mMode = 0xC; } + void setSumouMoveWinEnd() { mMode = 0xD; } + void setSumouMoveLoseEnd() { mMode = 0xE; } void setSumouForcePunch() { - if (mSpecialMode == 0x1F) { - mSpecialMode = 0x21; + if (mMode == 0x1F) { + mMode = 0x21; } else { - mSpecialMode = 0x1C; + mMode = 0x1C; } } - void setSumouForceTackle() { mSpecialMode = 0x1B; } - void setSumouForceGraspCancel() { mSpecialMode = 0x24; } - - bool checkSumouPushFront() const { return mSpecialMode == 7; } - bool checkSumouPushBack() const { return mSpecialMode == 8; } - bool checkSumouTackleSuccess() const { return mSpecialMode == 0xF; } - bool checkSumouTackleSuccessPunch() const { return mSpecialMode == 0x10; } - bool checkSumouTackleMiss() const { return mSpecialMode == 0x11; } - bool checkSumouTackleDraw() const { return mSpecialMode == 0x12; } - bool checkSumouPunchSuccess() const { return mSpecialMode == 0x13; } - bool checkSumouPunchMiss() const { return mSpecialMode == 0x14; } - bool checkSumouPunchDraw() const { return mSpecialMode == 0x15; } - bool checkSumouWait() const { return mSpecialMode == 0x16; } - bool checkSumouLeftMove() const { return mSpecialMode == 0x17; } - bool checkSumouRightMove() const { return mSpecialMode == 0x18; } - bool checkSumouSlideLeft() const { return mSpecialMode == 0x19; } - bool checkSumouSlideRight() const { return mSpecialMode == 0x1A; } - bool checkSumouPunchStagger() const { return mSpecialMode == 0x1F; } - bool checkSumouTackleStagger() const { return mSpecialMode == 0x20; } - bool checkSumouGraspRelease() const { return mSpecialMode == 0x23; } - - void onHeavyState() { onNoResetFlg0(FLG0_UNK_40000000); } + void setSumouForceTackle() { mMode = 0x1B; } + void setSumouForceGraspCancel() { mMode = 0x24; } + + bool checkSumouPushFront() const { return mMode == 7; } + bool checkSumouPushBack() const { return mMode == 8; } + bool checkSumouTackleSuccess() const { return mMode == 0xF; } + bool checkSumouTackleSuccessPunch() const { return mMode == 0x10; } + bool checkSumouTackleMiss() const { return mMode == 0x11; } + bool checkSumouTackleDraw() const { return mMode == 0x12; } + bool checkSumouPunchSuccess() const { return mMode == 0x13; } + bool checkSumouPunchMiss() const { return mMode == 0x14; } + bool checkSumouPunchDraw() const { return mMode == 0x15; } + bool checkSumouWait() const { return mMode == 0x16; } + bool checkSumouLeftMove() const { return mMode == 0x17; } + bool checkSumouRightMove() const { return mMode == 0x18; } + bool checkSumouSlideLeft() const { return mMode == 0x19; } + bool checkSumouSlideRight() const { return mMode == 0x1A; } + bool checkSumouPunchStagger() const { return mMode == 0x1F; } + bool checkSumouTackleStagger() const { return mMode == 0x20; } + bool checkSumouGraspRelease() const { return mMode == 0x23; } + + void onHeavyState() { onNoResetFlg0(FLG0_HEAVY_STATE); } void onHeavyStateMidnaPanic() { onHeavyState(); onEndResetFlg1(ERFLG1_UNK_40000); } - BOOL checkInsectRelease() { return checkResetFlg1(RFLG1_UNK_100); } + BOOL checkInsectRelease() { return checkResetFlg1(RFLG1_INSECT_RELEASE); } - void onChainForcePull() { onEndResetFlg1(ERFLG1_UNK_1000000); } - void onChainPullEnd() { onEndResetFlg1(ERFLG1_UNK_2000000); } + void onChainForcePull() { onEndResetFlg1(ERFLG1_CHAIN_FORCE_PULL); } + void onChainPullEnd() { onEndResetFlg1(ERFLG1_CHAIN_PULL_END); } - void onWaterDrop() { onEndResetFlg1(ERFLG1_UNK_20000); } - void forceKandelaarLightOff() { onNoResetFlg2(FLG2_UNK_10000000); } + void onWaterDrop() { onEndResetFlg1(ERFLG1_WATER_DROP); } + void forceKandelaarLightOff() { onNoResetFlg2(FLG2_KANDELAAR_LIGHT_OFF); } }; -int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4); +void daPy_aramBufferCheck(void* i_buffer, u32 i_size); +int daPy_addCalcShort(s16* i_value, s16 i_target, s16 i_scale, s16 i_maxStep, s16 i_minStep); inline daPy_py_c* daPy_getPlayerActorClass() { return (daPy_py_c*)dComIfGp_getPlayer(0); diff --git a/include/d/actor/d_a_spinner.h b/include/d/actor/d_a_spinner.h index 0d4d82fedc..dd5b098e57 100644 --- a/include/d/actor/d_a_spinner.h +++ b/include/d/actor/d_a_spinner.h @@ -48,6 +48,7 @@ public: dPath* checkPathMoveNow() { return mpPathMove; } static u32 getWaitArg() { return 0; } + static int getWaterSinkLimit() { return 50; } BOOL getDeleteFlg() const { return mDeleteFlg; } diff --git a/include/d/actor/d_a_tag_kmsg.h b/include/d/actor/d_a_tag_kmsg.h index 7fe9c21a92..cbd12b4077 100644 --- a/include/d/actor/d_a_tag_kmsg.h +++ b/include/d/actor/d_a_tag_kmsg.h @@ -45,9 +45,9 @@ public: } int getType() { - int param = fopAcM_GetParam(this) >> 0x18; - int type; + u32 param = (fopAcM_GetParam(this) & 0xFF000000) >> 0x18; + int type; if (param == 0xFF) { type = 0; } else { diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 5b7f46ea5e..1a9db62f86 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -1092,8 +1092,8 @@ public: i_info->field_0x1e = param_1; } - void EventFlag(int i_flag) { - mEventData.field_0x24 = i_flag; + int EventFlag(int i_flag) { + return mEventData.field_0x24 = i_flag; } void Att() { diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 7511fda358..7c6b438a4d 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -146,7 +146,7 @@ public: u32 GetRPrm() const { return mRPrm; } u32 MskSPrm(u32 mask) const { return mGFlag & mask; } u32 MskRPrm(u32 mask) const { return mRPrm & mask; } - bool ChkSPrm(u32 mask) const { return MskSPrm(mask); } + bool ChkSPrm(u32 mask) { return MskSPrm(mask); } void OnSPrm(u32 flag) { mGFlag |= flag; } void OnRPrm(u32 flag) { mRPrm |= flag; } void OffSPrm(u32 flag) { mGFlag &= ~flag; } @@ -169,7 +169,7 @@ public: void SetHitMark(u8 mark) { mHitMark = mark; } void SetSe(u8 se) { mSe = se; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } - void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; } + void SetSpl(dCcG_At_Spl spl) { mSpl = spl; } u8 GetSe() { return mSe; } dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; } u8 GetMtrl() { return mMtrl; } @@ -311,7 +311,7 @@ public: void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); } void SetTgVec(cXyz& vec) { mGObjTg.SetVec(vec); } - bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); } + bool ChkAtNoMass() { return mGObjAt.ChkSPrm(8); } void OnAtNoHitMark() { mGObjAt.OnSPrm(2); } void OffAtNoHitMark() { mGObjAt.OffSPrm(2); } void OnTgNoHitMark() { mGObjTg.OnSPrm(4); } @@ -331,7 +331,7 @@ public: bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); } cXyz* GetAtVecP() { return mGObjAt.GetVecP(); } cXyz* GetTgVecP() { return mGObjTg.GetVecP(); } - void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); } + void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetSpl(spl); } void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); } void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); } void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); } @@ -415,7 +415,7 @@ public: void SetTgHitPos(cXyz& pos) { mGObjTg.SetHitPos(pos); } void SetAtHitPos(cXyz& pos) { mGObjAt.SetHitPos(pos); } u8 GetTgSe() { return mGObjTg.GetSe(); } - u32 GetTgHitObjHitSeID(int i_soundID) { return getHitSeID(GetTgHitObjSe(),i_soundID); } + u32 GetTgHitObjHitSeID(BOOL i_isRebound) { return getHitSeID(GetTgHitObjSe(), i_isRebound); } cXyz* GetAtHitPosP() { return mGObjAt.GetHitPosP(); } cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); } cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index bf1523042c..72f5c490c1 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -16,6 +16,169 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +enum dComIfG_ButtonStatus { + /* 0x00 */ BUTTON_STATUS_NONE, + /* 0x01 */ BUTTON_STATUS_LET_GO, + /* 0x02 */ BUTTON_STATUS_PEEK, + /* 0x03 */ BUTTON_STATUS_ATTACK, + /* 0x04 */ BUTTON_STATUS_PUT_AWAY, + /* 0x05 */ BUTTON_STATUS_HOWL, + /* 0x06 */ BUTTON_STATUS_OPEN, + /* 0x07 */ BUTTON_STATUS_ENTER, + /* 0x08 */ BUTTON_STATUS_CHECK, + /* 0x09 */ BUTTON_STATUS_DASH, + /* 0x0A */ BUTTON_STATUS_CROUCH, + /* 0x0B */ BUTTON_STATUS_DEFEND, + /* 0x0C */ BUTTON_STATUS_PICK_UP, + /* 0x0D */ BUTTON_STATUS_DIG, + /* 0x0E */ BUTTON_STATUS_EAT, + /* 0x0F */ BUTTON_STATUS_SELECT, + /* 0x10 */ BUTTON_STATUS_LOCK, + /* 0x11 */ BUTTON_STATUS_SWITCH, + /* 0x12 */ BUTTON_STATUS_BACK, + /* 0x13 */ BUTTON_STATUS_THROW, + /* 0x14 */ BUTTON_STATUS_PLACE, + /* 0x15 */ BUTTON_STATUS_GRAB, + /* 0x16 */ BUTTON_STATUS_GET_OFF, + /* 0x17 */ BUTTON_STATUS_GET_ON, + /* 0x18 */ BUTTON_STATUS_PADDLE, + /* 0x19 */ BUTTON_STATUS_JUMP, + /* 0x1A */ BUTTON_STATUS_READ, + /* 0x1B */ BUTTON_STATUS_LOOK, + /* 0x1C */ BUTTON_STATUS_SPEAK, + /* 0x1D */ BUTTON_STATUS_LIFT, + /* 0x1E */ BUTTON_STATUS_SWING, + /* 0x1F */ BUTTON_STATUS_UNK_31, + /* 0x20 */ BUTTON_STATUS_UNK_32, + /* 0x21 */ BUTTON_STATUS_UNK_33, + /* 0x22 */ BUTTON_STATUS_CONFIRM, + /* 0x23 */ BUTTON_STATUS_NEXT, + /* 0x24 */ BUTTON_STATUS_INFO, + /* 0x25 */ BUTTON_STATUS_UNK_37, + /* 0x26 */ BUTTON_STATUS_UNK_38, + /* 0x27 */ BUTTON_STATUS_UNK_39, + /* 0x28 */ BUTTON_STATUS_WHOOP, + /* 0x29 */ BUTTON_STATUS_ZOOM, + /* 0x2A */ BUTTON_STATUS_QUIT, + /* 0x2B */ BUTTON_STATUS_PICK, + /* 0x2C */ BUTTON_STATUS_BLOW, + /* 0x2D */ BUTTON_STATUS_DODGE, + /* 0x2E */ BUTTON_STATUS_CUT, + /* 0x2F */ BUTTON_STATUS_HINT, + /* 0x30 */ BUTTON_STATUS_FINISH, + /* 0x31 */ BUTTON_STATUS_SET_FREE, + /* 0x32 */ BUTTON_STATUS_DISMOUNT, + /* 0x33 */ BUTTON_STATUS_DROP_DOWN, + /* 0x34 */ BUTTON_STATUS_UNK_52, + /* 0x35 */ BUTTON_STATUS_TAKE, + /* 0x36 */ BUTTON_STATUS_HURRY, + /* 0x37 */ BUTTON_STATUS_PULL_DOWN, + /* 0x38 */ BUTTON_STATUS_PET, + /* 0x39 */ BUTTON_STATUS_UNK_57, + /* 0x3A */ BUTTON_STATUS_SHIELD_ATTACK, + /* 0x3B */ BUTTON_STATUS_LISTEN, + /* 0x3C */ BUTTON_STATUS_DRINK, + /* 0x3D */ BUTTON_STATUS_UNK_61, + /* 0x3E */ BUTTON_STATUS_COVER, + /* 0x3F */ BUTTON_STATUS_PUSH, + /* 0x40 */ BUTTON_STATUS_RESIST, + /* 0x41 */ BUTTON_STATUS_DIVE, + /* 0x42 */ BUTTON_STATUS_PUT_TOGETHER, + /* 0x43 */ BUTTON_STATUS_SKIP, + /* 0x44 */ BUTTON_STATUS_SLAP, + /* 0x45 */ BUTTON_STATUS_SNIFF, + /* 0x46 */ BUTTON_STATUS_BITE, + /* 0x47 */ BUTTON_STATUS_ROLL, + /* 0x48 */ BUTTON_STATUS_FASTEN, + /* 0x49 */ BUTTON_STATUS_GET_DOWN, + /* 0x4A */ BUTTON_STATUS_HAWKEYE_OFF, + /* 0x4B */ BUTTON_STATUS_UNK_75, + /* 0x4C */ BUTTON_STATUS_SWIM, + /* 0x4D */ BUTTON_STATUS_CANT_SKIP, + /* 0x4E */ BUTTON_STATUS_SENSE, + /* 0x4F */ BUTTON_STATUS_UNK_79, + /* 0x50 */ BUTTON_STATUS_UNK_80, + /* 0x51 */ BUTTON_STATUS_LAND, + /* 0x52 */ BUTTON_STATUS_HOOK, + /* 0x53 */ BUTTON_STATUS_CHANGE_LOCKS, + /* 0x54 */ BUTTON_STATUS_EQUIP, + /* 0x55 */ BUTTON_STATUS_PULL, + /* 0x56 */ BUTTON_STATUS_REEL, + /* 0x57 */ BUTTON_STATUS_EXTRACT, + /* 0x58 */ BUTTON_STATUS_SPIN, + /* 0x59 */ BUTTON_STATUS_UNK_89, + /* 0x5A */ BUTTON_STATUS_SPIN_ATTACK, + /* 0x5B */ BUTTON_STATUS_REEL_FAST, + /* 0x5C */ BUTTON_STATUS_RAISE, + /* 0x5D */ BUTTON_STATUS_RELEASE, + /* 0x5E */ BUTTON_STATUS_UNK_94, + /* 0x5F */ BUTTON_STATUS_MAP, + /* 0x60 */ BUTTON_STATUS_ITEMS, + /* 0x61 */ BUTTON_STATUS_INSERT, + /* 0x62 */ BUTTON_STATUS_DRAW, + /* 0x63 */ BUTTON_STATUS_STRIKE, + /* 0x64 */ BUTTON_STATUS_BLANK, + /* 0x65 */ BUTTON_STATUS_UNK_101, + /* 0x66 */ BUTTON_STATUS_POINT_WII_REMOTE, + /* 0x67 */ BUTTON_STATUS_FLIP, + /* 0x68 */ BUTTON_STATUS_CHANGE_VIEW, + /* 0x69 */ BUTTON_STATUS_UNK_105, + /* 0x6A */ BUTTON_STATUS_UNK_106, + /* 0x6B */ BUTTON_STATUS_CHANCE, + /* 0x6C */ BUTTON_STATUS_SCOOP, + /* 0x6D */ BUTTON_STATUS_SURVEY, + /* 0x6E */ BUTTON_STATUS_CANCEL, + /* 0x6F */ BUTTON_STATUS_SEIZE, + /* 0x70 */ BUTTON_STATUS_COLLECTION, + /* 0x71 */ BUTTON_STATUS_AREA_MAP, + /* 0x72 */ BUTTON_STATUS_ACTION, + /* 0x73 */ BUTTON_STATUS_SET_HOOK, + /* 0x74 */ BUTTON_STATUS_TILT, + /* 0x75 */ BUTTON_STATUS_THRUST, + /* 0x76 */ BUTTON_STATUS_ROTATE, + /* 0x77 */ BUTTON_STATUS_HELM_SPLITTER, + /* 0x78 */ BUTTON_STATUS_MOVE, + /* 0x79 */ BUTTON_STATUS_UNK_121, + /* 0x7A */ BUTTON_STATUS_HOLD_ON, + /* 0x7B */ BUTTON_STATUS_UNK_123, + /* 0x7C */ BUTTON_STATUS_HELP, + /* 0x7D */ BUTTON_STATUS_ZOOM_IN, + /* 0x7E */ BUTTON_STATUS_ZOOM_OUT, + /* 0x7F */ BUTTON_STATUS_MOVE_CLOSER_TV, + /* 0x80 */ BUTTON_STATUS_UNK_128, + /* 0x81 */ BUTTON_STATUS_UNK_129, + /* 0x82 */ BUTTON_STATUS_UNK_130, + /* 0x83 */ BUTTON_STATUS_UNK_131, + /* 0x84 */ BUTTON_STATUS_UNK_132, + /* 0x85 */ BUTTON_STATUS_UNK_133, + /* 0x86 */ BUTTON_STATUS_UNK_134, + /* 0x87 */ BUTTON_STATUS_UNK_135, + /* 0x88 */ BUTTON_STATUS_UNK_136, + /* 0x89 */ BUTTON_STATUS_UNK_137, + /* 0x8A */ BUTTON_STATUS_UNK_138, + /* 0x8B */ BUTTON_STATUS_UNK_139, + /* 0x8C */ BUTTON_STATUS_UNK_140, + /* 0x8D */ BUTTON_STATUS_UNK_141, + /* 0x8E */ BUTTON_STATUS_UNK_142, + /* 0x8F */ BUTTON_STATUS_UNK_143, + /* 0x90 */ BUTTON_STATUS_UNK_144, + /* 0x91 */ BUTTON_STATUS_UNK_145, + /* 0x92 */ BUTTON_STATUS_UNK_146, + /* 0x93 */ BUTTON_STATUS_UNK_147, + /* 0x94 */ BUTTON_STATUS_UNK_148, + /* 0x95 */ BUTTON_STATUS_UNK_149, + /* 0x96 */ BUTTON_STATUS_UNK_150, + /* 0x97 */ BUTTON_STATUS_UNK_151, + /* 0x98 */ BUTTON_STATUS_UNK_152, + /* 0x99 */ BUTTON_STATUS_UNK_153, +}; + +enum dComIfG_ButtonStatusFlag { + /* 0x0 */ BUTTON_STATUS_FLAG_NONE, + /* 0x2 */ BUTTON_STATUS_FLAG_EMPHASIS = 2, + /* 0x4 */ BUTTON_STATUS_FLAG_CONTINUATION = 4, +}; + class JKRAramArchive; class dSmplMdl_draw_c; class dTimer_c; diff --git a/include/d/d_demo.h b/include/d/d_demo.h index a65f8c60b2..bbcb5d72b6 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -84,7 +84,7 @@ public: fopAc_ac_c* getActor(); void setActor(fopAc_ac_c*); f32 getPrm_Morf(); - int getDemoIDData(int*, int*, int*, u16*, u8*); + int getDemoIDData(int* o_arg0, int* o_arg1, int* o_arg2, u16* o_resID, u8*); virtual ~dDemo_actor_c(); virtual void JSGSetData(u32, void const*, u32); @@ -381,13 +381,17 @@ public: static s16 getBranchNum() { return m_branchNum; } static jmessage_tControl* getMesgControl() { return m_mesgControl; } + static void setBranchNum(u16 num) { + m_branchNum = num; + } + static dDemo_camera_c* getCamera() { JUT_ASSERT(0, m_object != NULL); return m_object->getActiveCamera(); } static s16 m_branchId; - static s16 m_branchNum; + static u16 m_branchNum; static dDemo_system_c* m_system; static JStudio::TControl* m_control; static JStudio_JStage::TCreateObject* m_stage; diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 46a78f2030..f8107f9440 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -26,7 +26,7 @@ public: int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); - bool checkPassNum(int bit) { return field_0xc & (1 << bit); } + BOOL checkPassNum(int bit) { return field_0xc & (1 << bit); } void onPassNum(int num) { field_0xc |= (1 << num); } void offPassNum(int num) { field_0xc &= ~(1 << num); } bool checkShieldType(int i) { return getType(i) == 3; } diff --git a/include/d/d_meter2_draw.h b/include/d/d_meter2_draw.h index 9a8a15ca48..c11bd680bb 100644 --- a/include/d/d_meter2_draw.h +++ b/include/d/d_meter2_draw.h @@ -10,144 +10,6 @@ class J2DAnmTransformKey; class JKRExpHeap; class JKRHeap; -enum dMeter2Draw_actionFlag { - /* 0x0 */ ACTION_FLG_DEFAULT, - /* 0x2 */ ACTION_FLG_EMPHASIS = 2, - /* 0x4 */ ACTION_FLG_CONTINUATION = 4, -}; - -enum dMeter2Draw_actionID { - /* 0x00 */ ACTION_STR_NONE, - /* 0x01 */ ACTION_STR_LET_GO, - /* 0x02 */ ACTION_STR_PEEK, - /* 0x03 */ ACTION_STR_ATTACK, - /* 0x04 */ ACTION_STR_PUT_AWAY, - /* 0x05 */ ACTION_STR_HOWL, - /* 0x06 */ ACTION_STR_OPEN, - /* 0x07 */ ACTION_STR_ENTER, - /* 0x08 */ ACTION_STR_CHECK, - /* 0x09 */ ACTION_STR_DASH, - /* 0x0A */ ACTION_STR_CROUCH, - /* 0x0B */ ACTION_STR_DEFEND, - /* 0x0C */ ACTION_STR_PICK_UP, - /* 0x0D */ ACTION_STR_DIG, - /* 0x0E */ ACTION_STR_EAT, - /* 0x0F */ ACTION_STR_SELECT, - /* 0x10 */ ACTION_STR_LOCK, - /* 0x11 */ ACTION_STR_SWITCH, - /* 0x12 */ ACTION_STR_BACK, - /* 0x13 */ ACTION_STR_THROW, - /* 0x14 */ ACTION_STR_PLACE, - /* 0x15 */ ACTION_STR_GRAB, - /* 0x16 */ ACTION_STR_GET_OFF, - /* 0x17 */ ACTION_STR_GET_ON, - /* 0x18 */ ACTION_STR_PADDLE, - /* 0x19 */ ACTION_STR_JUMP, - /* 0x1A */ ACTION_STR_READ, - /* 0x1B */ ACTION_STR_LOOK, - /* 0x1C */ ACTION_STR_SPEAK, - /* 0x1D */ ACTION_STR_LIFT, - /* 0x1E */ ACTION_STR_SWING, - /* 0x1F */ ACTION_STR_PICK_UP2, - /* 0x20 */ ACTION_STR_GET_ON2, - /* 0x21 */ ACTION_STR_GET_OFF2, - /* 0x22 */ ACTION_STR_CONFIRM, - /* 0x23 */ ACTION_STR_NEXT, - /* 0x24 */ ACTION_STR_INFO, - /* 0x25 */ ACTION_STR_NONE2, - /* 0x26 */ ACTION_STR_NONE3, - /* 0x27 */ ACTION_STR_NONE4, - /* 0x28 */ ACTION_STR_WHOOP, - /* 0x29 */ ACTION_STR_ZOOM, - /* 0x2A */ ACTION_STR_QUIT, - /* 0x2B */ ACTION_STR_PICK, - /* 0x2C */ ACTION_STR_BLOW, - /* 0x2D */ ACTION_STR_DODGE, - /* 0x2E */ ACTION_STR_CUT, - /* 0x2F */ ACTION_STR_HINT, - /* 0x30 */ ACTION_STR_FINISH, - /* 0x31 */ ACTION_STR_SET_FREE, - /* 0x32 */ ACTION_STR_DISMOUNT, - /* 0x33 */ ACTION_STR_DROP_DOWN, - /* 0x34 */ ACTION_STR_PICK_UP3, - /* 0x35 */ ACTION_STR_TAKE, - /* 0x36 */ ACTION_STR_HURRY, - /* 0x37 */ ACTION_STR_PULL_DOWN, - /* 0x38 */ ACTION_STR_PET, - /* 0x39 */ ACTION_STR_PICK_UP4, - /* 0x3A */ ACTION_STR_SHIELD_ATTACK, - /* 0x3B */ ACTION_STR_LISTEN, - /* 0x3C */ ACTION_STR_DRINK, - /* 0x3D */ ACTION_STR_ZOOM2, - /* 0x3E */ ACTION_STR_COVER, - /* 0x3F */ ACTION_STR_PUSH, - /* 0x40 */ ACTION_STR_RESIST, - /* 0x41 */ ACTION_STR_DIVE, - /* 0x42 */ ACTION_STR_PUT_TOGETHER, - /* 0x43 */ ACTION_STR_SKIP, - /* 0x44 */ ACTION_STR_SLAP, - /* 0x45 */ ACTION_STR_SNIFF, - /* 0x46 */ ACTION_STR_BITE, - /* 0x47 */ ACTION_STR_ROLL, - /* 0x48 */ ACTION_STR_FASTEN, - /* 0x49 */ ACTION_STR_GET_DOWN, - /* 0x4A */ ACTION_STR_HAWKEYE_OFF, - /* 0x4B */ ACTION_STR_DASH2, - /* 0x4C */ ACTION_STR_SWIM, - /* 0x4D */ ACTION_STR_CANT_SKIP, - /* 0x4E */ ACTION_STR_SENSE, - /* 0x4F */ ACTION_STR_NONE5, - /* 0x50 */ ACTION_STR_THROW2, - /* 0x51 */ ACTION_STR_LAND, - /* 0x52 */ ACTION_STR_HOOK, - /* 0x53 */ ACTION_STR_CHANGE_LOCKS, - /* 0x54 */ ACTION_STR_EQUIP, - /* 0x55 */ ACTION_STR_PULL, - /* 0x56 */ ACTION_STR_REEL, - /* 0x57 */ ACTION_STR_EXTRACT, - /* 0x58 */ ACTION_STR_SPIN, - /* 0x59 */ ACTION_STR_SWITCH2, - /* 0x5A */ ACTION_STR_SPIN_ATTACK, - /* 0x5B */ ACTION_STR_REEL_FAST, - /* 0x5C */ ACTION_STR_RAISE, - /* 0x5D */ ACTION_STR_RELEASE, - /* 0x5E */ ACTION_STR_CHECK2, - /* 0x5F */ ACTION_STR_MAP, - /* 0x60 */ ACTION_STR_ITEMS, - /* 0x61 */ ACTION_STR_INSERT, - /* 0x62 */ ACTION_STR_DRAW, - /* 0x63 */ ACTION_STR_STRIKE, - /* 0x64 */ ACTION_STR_BLANK, - /* 0x65 */ ACTION_STR_JUMP2, - /* 0x66 */ ACTION_STR_POINT_WII_REMOTE, - /* 0x67 */ ACTION_STR_FLIP, - /* 0x68 */ ACTION_STR_CHANGE_VIEW, - /* 0x69 */ ACTION_STR_ZOOM3, - /* 0x6A */ ACTION_STR_BACK2, - /* 0x6B */ ACTION_STR_CHANCE, - /* 0x6C */ ACTION_STR_SCOOP, - /* 0x6D */ ACTION_STR_SURVEY, - /* 0x6E */ ACTION_STR_CANCEL, - /* 0x6F */ ACTION_STR_SEIZE, - /* 0x70 */ ACTION_STR_COLLECTION, - /* 0x71 */ ACTION_STR_AREA_MAP, - /* 0x72 */ ACTION_STR_ACTION, - /* 0x73 */ ACTION_STR_SET_HOOK, - /* 0x74 */ ACTION_STR_TILT, - /* 0x75 */ ACTION_STR_THRUST, - /* 0x76 */ ACTION_STR_ROTATE, - /* 0x77 */ ACTION_STR_HELM_SPLITTER, - /* 0x78 */ ACTION_STR_MOVE, - /* 0x79 */ ACTION_STR_ROLL2, - /* 0x7A */ ACTION_STR_HOLD_ON, - /* 0x7B */ ACTION_STR_BITE2, - /* 0x7C */ ACTION_STR_HELP, - /* 0x7D */ ACTION_STR_ZOOM_IN, - /* 0x7E */ ACTION_STR_ZOOM_OUT, - /* 0x7F */ ACTION_STR_MOVE_CLOSER_TV, - /* 0x80 */ ACTION_STR_CHECK3, -}; - class dKantera_icon_c; class dMeter2Draw_c : public dDlst_base_c { diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index bd88b02a6f..dd7d204c0e 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -33,6 +33,18 @@ enum dMeter2Info_warpStatus { /* 0x3 */ WARP_STATUS_DECIDED_e = 3, }; +enum dMeter2Info_UseButton { + METER2_USEBUTTON_A = 0x1, + METER2_USEBUTTON_B = 0x2, + METER2_USEBUTTON_X = 0x4, + METER2_USEBUTTON_Y = 0x8, + METER2_USEBUTTON_C = 0x10, + + METER2_USEBUTTON_R = 0x40, + + METER2_USEBUTTON_Z = 0x800, +}; + class dMeter2Info_c { public: class WarpInfo_c { @@ -169,7 +181,7 @@ public: void resetDirectUseItem() { mDirectUseItem = 0; } u16 getFloatingFlowID() { return mFloatingFlowID; } bool isFloatingMessageWakuVisible() { return mFloatingMessageWakuVisible; } - void onBlinkButton(int i_flag) { mBlinkButton |= i_flag; } + void onBlinkButton(int i_flag) { mBlinkButton |= (u16)i_flag; } bool isBlinkButton(int i_flag) { return (mBlinkButton & (u16)i_flag) != 0 ? true : false; } void resetBlinkButton() { mBlinkButton = 0; } s16 getFloatingMessageTimer() { return mFloatingMessageTimer; } @@ -193,7 +205,7 @@ public: void set2DHeight(f32 i_height) { m2DHeight = i_height; } void set2DPosH(f32 i_posH) { m2DPosH = i_posH; } void set2DPosV(f32 i_posV) { m2DPosV = i_posV; } - void onUseButton(int i_button) { mUseButton |= i_button; } + void onUseButton(int i_button) { mUseButton |= (u16)i_button; } f32 get2DWidth() { return m2DWidth; } f32 get2DHeight() { return m2DHeight; } u8 getTableMapRegionNo() { return mTableMapRegionNo; } diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h index 8d91d20b29..2ddb5c410e 100644 --- a/include/d/d_msg_object.h +++ b/include/d/d_msg_object.h @@ -356,7 +356,7 @@ inline void dMsgObject_demoMessageGroup() { } inline bool dMsgObject_isTalkNowCheck() { - return dMsgObject_getMsgObjectClass()->getStatus() != 1 ? true : false; + return dMsgObject_getMsgObjectClass()->getStatus() == 1 ? false : true; } inline bool dMsgObject_isKillMessageFlag() { @@ -449,7 +449,7 @@ inline void dMsgObject_endFlowGroup() { } inline void dMsgObject_setSmellType(u8 type) { - dMsgObject_c::setSmellType(type); + dMsgObject_getMsgObjectClass()->setSmellType(type); } inline u8 dMsgObject_getSelectCursorPos() { @@ -485,7 +485,7 @@ inline void dMsgObject_setEquipBombInfo() { } inline bool dMsgObject_isHowlHearingMode() { - return dMsgObject_c::isHowlHearingMode(); + return dMsgObject_getMsgObjectClass()->isHowlHearingMode(); } inline void dMsgObject_onMsgSend() { diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 501376909c..00e46bb3ad 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1266,6 +1266,33 @@ struct FuncTable { dStage_Func function; }; +enum dStage_SaveTbl { + dStage_SaveTbl_ORDON, + dStage_SaveTbl_PRISON, + dStage_SaveTbl_FARON, + dStage_SaveTbl_ELDIN, + dStage_SaveTbl_LANAYRU, + dStage_SaveTbl_FIELD = 6, + dStage_SaveTbl_GROVE, + dStage_SaveTbl_SNOWPEAK, + dStage_SaveTbl_CASTLE_TOWN, + dStage_SaveTbl_DESERT, + dStage_SaveTbl_FISHING_POND, + + dStage_SaveTbl_LV1 = 16, + dStage_SaveTbl_LV2, + dStage_SaveTbl_LV3, + dStage_SaveTbl_LV4, + dStage_SaveTbl_LV5, + dStage_SaveTbl_LV6, + dStage_SaveTbl_LV7, + dStage_SaveTbl_LV8, + dStage_SaveTbl_LV9, + dStage_SaveTbl_CAVE1, + dStage_SaveTbl_CAVE2, + dStage_SaveTbl_GROTTO, +}; + const char* dStage_getName2(s16, s8); dStage_objectNameInf* dStage_searchName(const char*); static int dStage_stageKeepTresureInit(dStage_dt_c*, void*, int, void*); @@ -1417,7 +1444,7 @@ inline u32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* pstag) { return pstag->field_0x09 & 1; } -inline u8 dStage_stagInfo_GetWolfDashType(stage_stag_info_class* pstag) { +inline int dStage_stagInfo_GetWolfDashType(stage_stag_info_class* pstag) { return (pstag->field_0x09 >> 6) & 3; } diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index a2f5c5c796..d743c143f2 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -164,6 +164,7 @@ enum dEvt_Condition_e { dEvtCnd_CANDEMO_e = 0x0002, dEvtCnd_CANDOOR_e = 0x0004, dEvtCnd_CANGETITEM_e = 0x0008, + dEvtCnd_10_e = 0x0010, dEvtCnd_CANTALKITEM_e = 0x0020, dEvtCnd_40_e = 0x0040, dEvtCnd_DUMMY = 0x8000, @@ -337,10 +338,10 @@ public: cXyz& getDownPos() { return mDownPos; } cXyz& getHeadLockPos() { return mHeadLockPos; } - void onCutDownHitFlg() { mFlags |= fopEn_flag_CutDownHit; } - void onWolfBiteDamage() { mFlags |= fopEn_flag_WolfBiteDamage; } - void onWolfDownStartFlg() { mFlags |= (fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart); } - void onWolfDownPullEndFlg() { mFlags |= fopEn_flag_WolfDownPullEnd; } + void onCutDownHitFlg() { mFlags |= (u16)fopEn_flag_CutDownHit; } + void onWolfBiteDamage() { mFlags |= (u16)fopEn_flag_WolfBiteDamage; } + void onWolfDownStartFlg() { mFlags |= (u16)(fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart); } + void onWolfDownPullEndFlg() { mFlags |= (u16)fopEn_flag_WolfDownPullEnd; } void onWolfNoLock() { mFlags |= (u16)fopEn_flag_WolfNoLock; } void onDownFlg() { mFlags |= (u16)fopEn_flag_Down; } void onHeadLockFlg() { mFlags |= (u16)fopEn_flag_HeadLock; } @@ -365,10 +366,10 @@ public: void setMidnaBindMode(u8 i_bindMode) { mMidnaBindMode = i_bindMode; } void setMidnaBindID(u8 i_idx, u32 i_bindID) { mMidnaBindID[i_idx] = i_bindID; } - void setThrowModeCatch() { mThrowMode |= fopEn_throwMode_Catch; } - void setThrowModeDash() { mThrowMode |= fopEn_throwMode_Dash; } - void setThrowModeThrowRight() { mThrowMode |= fopEn_throwMode_ThrowRight; } - void setThrowModeThrowLeft() { mThrowMode |= fopEn_throwMode_ThrowLeft; } + void setThrowModeCatch() { mThrowMode |= (u8)fopEn_throwMode_Catch; } + void setThrowModeDash() { mThrowMode |= (u8)fopEn_throwMode_Dash; } + void setThrowModeThrowRight() { mThrowMode |= (u8)fopEn_throwMode_ThrowRight; } + void setThrowModeThrowLeft() { mThrowMode |= (u8)fopEn_throwMode_ThrowLeft; } void setDownPos(const cXyz* i_pos) { mDownPos = *i_pos; } void setHeadLockPos(const cXyz* i_pos) { mHeadLockPos = *i_pos; } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index e03eb6e1ca..ac45c8f443 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -297,6 +297,8 @@ struct mDoExt_MtxCalcAnmBlendTbl mDoExt_MtxCalcAnmBlendTbl(int num, mDoExt_AnmRatioPack* anmRatio) { mNum = num; mAnmRatio = anmRatio; + + f32 var_f31 = 0.0f; for (int i = 0; i < mNum; i++) { if (!mAnmRatio[i].getAnmTransform()) { mAnmRatio[i].setRatio(0.0f); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 01085fb9a0..aa8e3c7eca 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -91,7 +91,7 @@ inline void cMtx_multVec(const Mtx mtx, const Vec* src, Vec* dst) { mDoMtx_multVec(mtx, src, dst); } -inline void cMtx_multVecSR(Mtx mtx, const Vec* src, Vec* dst) { +inline void cMtx_multVecSR(const Mtx mtx, const Vec* src, Vec* dst) { mDoMtx_multVecSR(mtx, src, dst); } |