alink data cleanup (#2397)

This commit is contained in:
TakaRikka
2025-04-16 13:03:00 -07:00
committed by GitHub
parent fe2b2ee0e8
commit f08e883783
31 changed files with 7029 additions and 10021 deletions
+200 -104
View File
@@ -131,9 +131,6 @@ private:
class daAlink_footData_c {
public:
/* 800CFCB8 */ ~daAlink_footData_c();
/* 800CFCF4 */ daAlink_footData_c();
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ s16 field_0x2;
@@ -150,9 +147,11 @@ public:
daAlink_matAnm_c() { init(); }
/* 8009D8E4 */ void init();
/* 800D0180 */ void offSetFlg();
/* 800D0180 */ void offSetFlg() {
mSetFlag = FALSE;
}
/* 800D0B8C */ virtual ~daAlink_matAnm_c();
/* 800D0B8C */ virtual ~daAlink_matAnm_c() {}
/* 8009D90C */ virtual void calc(J3DMaterial*) const;
static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); }
@@ -1303,8 +1302,6 @@ public:
class firePointEff_c {
public:
/* 800CFC3C */ ~firePointEff_c();
/* 800CFC78 */ firePointEff_c();
/* 0x00 */ u8 field_0x0;
/* 0x02 */ u16 field_0x2;
/* 0x04 */ u32 field_0x4;
@@ -1318,7 +1315,7 @@ public:
public:
hsChainShape_c() {}
/* 80107900 */ virtual void draw();
/* 800D0CDC */ virtual ~hsChainShape_c();
/* 800D0CDC */ virtual ~hsChainShape_c() {}
}; // Size: 0x10
/* 8009D87C */ static BOOL getE3Zhint();
@@ -3031,67 +3028,87 @@ public:
/* 80182888 */ BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
/* 8018289C */ fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); }
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
virtual MtxP getModelMtx();
virtual MtxP getInvMtx();
virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
virtual void setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) {
mMidnaMsgNum = pMsgNum;
mMidnaMsg = (daTagMmsg_c*)param_0;
}
virtual MtxP getModelMtx() { return mpLinkModel->getBaseTRMtx(); }
virtual MtxP getInvMtx() { return mInvMtx; }
virtual cXyz* getShadowTalkAtnPos() { return &field_0x375c; }
virtual f32 getGroundY();
virtual f32 getGroundY() { return mLinkAcch.GetGroundH(); }
virtual MtxP getLeftItemMatrix();
virtual MtxP getRightItemMatrix();
virtual MtxP getLeftHandMatrix();
virtual MtxP getRightHandMatrix();
virtual MtxP getLinkBackBone1Matrix();
virtual MtxP getWolfMouthMatrix();
virtual MtxP getWolfBackbone2Matrix();
virtual MtxP getBottleMtx();
virtual MtxP getLinkBackBone1Matrix() { return mpLinkModel->getAnmMtx(1); }
virtual MtxP getWolfMouthMatrix() { return mpLinkModel->getAnmMtx(13); }
virtual MtxP getWolfBackbone2Matrix() { return mpLinkModel->getAnmMtx(2); }
virtual MtxP getBottleMtx() {
if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) {
return mHeldItemModel->getBaseTRMtx();
}
return NULL;
}
virtual BOOL checkPlayerGuard() const;
virtual u32 checkPlayerFly() const;
virtual BOOL checkFrontRoll() const;
virtual BOOL checkWolfDash() const;
virtual BOOL checkAutoJump() const;
virtual bool checkSideStep() const;
virtual bool checkWolfTriggerJump() const;
virtual BOOL checkGuardBreakMode() const;
virtual bool checkLv3Slide() const;
virtual bool checkWolfHowlDemoMode() const;
virtual u32 checkPlayerFly() const {
return checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP);
}
virtual BOOL checkFrontRoll() const { return mProcID == PROC_FRONT_ROLL; }
virtual BOOL checkWolfDash() const { return mProcID == PROC_WOLF_DASH; }
virtual BOOL checkAutoJump() const { return mProcID == PROC_AUTO_JUMP || mProcID == PROC_WOLF_AUTO_JUMP; }
virtual bool checkSideStep() const { return (mProcID == PROC_SIDESTEP || mProcID == PROC_WOLF_SIDESTEP) && mProcVar1.field_0x300a != 0; }
virtual bool checkWolfTriggerJump() const { return mProcID == PROC_WOLF_SIDESTEP || mProcID == PROC_WOLF_JUMP_ATTACK; }
virtual BOOL checkGuardBreakMode() const { return mProcID == PROC_GUARD_BREAK; }
virtual bool checkLv3Slide() const { return mProcID == PROC_SLIDE && mProcVar3.field_0x300e != 0; }
virtual bool checkWolfHowlDemoMode() const { return mProcID == PROC_WOLF_HOWL_DEMO; }
virtual bool checkChainBlockPushPull();
virtual BOOL checkElecDamage() const;
virtual BOOL checkEmptyBottleSwing() const;
virtual BOOL checkBottleSwingMode() const;
virtual BOOL checkHawkWait() const;
virtual BOOL checkGoatThrow() const;
virtual BOOL checkGoatThrowAfter() const;
virtual BOOL checkWolfTagLockJump() const;
virtual BOOL checkWolfTagLockJumpLand() const;
virtual BOOL checkElecDamage() const { return mProcID == PROC_ELEC_DAMAGE; }
virtual BOOL checkEmptyBottleSwing() const { return mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; }
virtual BOOL checkBottleSwingMode() const { return mProcID == PROC_BOTTLE_SWING; }
virtual BOOL checkHawkWait() const { return mProcID == PROC_HAWK_SUBJECT; }
virtual BOOL checkGoatThrow() const { return mProcID == PROC_GOAT_CATCH && mProcVar2.field_0x300c != 0; }
virtual BOOL checkGoatThrowAfter() const { return mProcID == PROC_GOAT_CATCH && field_0x3478 > 0.0f; }
virtual BOOL checkWolfTagLockJump() const { return mProcID == PROC_WOLF_TAG_JUMP && field_0x3198 == 0; }
virtual BOOL checkWolfTagLockJumpLand() const { return mProcID == PROC_WOLF_TAG_JUMP_LAND; }
virtual BOOL checkWolfRope();
virtual BOOL checkWolfRopeHang() const;
virtual BOOL checkRollJump() const;
virtual BOOL checkGoronRideWait() const;
virtual BOOL checkWolfChain() const;
virtual BOOL checkWolfWait() const;
virtual BOOL checkWolfJumpAttack() const;
virtual BOOL checkWolfRSit() const;
virtual BOOL checkBottleDrinkEnd() const;
virtual BOOL checkWolfDig() const;
virtual BOOL checkCutCharge() const;
virtual BOOL checkCutTurnCharge() const;
virtual BOOL checkCutLargeJumpCharge() const;
virtual BOOL checkComboCutTurn() const;
virtual BOOL checkClimbMove() const;
virtual BOOL checkGrassWhistle() const;
virtual BOOL checkBoarRun() const;
virtual f32 getBaseAnimeFrameRate() const;
virtual BOOL checkWolfRopeHang() const { return mProcID == PROC_WOLF_ROPE_HANG; }
virtual BOOL checkRollJump() const { return mProcID == PROC_ROLL_JUMP; }
virtual BOOL checkGoronRideWait() const { return mProcID == PROC_GORON_RIDE_WAIT; }
virtual BOOL checkWolfChain() const { return mProcID == PROC_WOLF_CHAIN_WAIT; }
virtual BOOL checkWolfWait() const { return mProcID == PROC_WOLF_WAIT; }
virtual BOOL checkWolfJumpAttack() const { return mProcID == PROC_WOLF_JUMP_ATTACK; }
virtual BOOL checkWolfRSit() const { return mProcID == PROC_WOLF_SIT; }
virtual BOOL checkBottleDrinkEnd() const { return mProcID == PROC_BOTTLE_DRINK && mProcVar3.field_0x300e != 0; }
virtual BOOL checkWolfDig() const { return mProcID == PROC_WOLF_DIG; }
virtual BOOL checkCutCharge() const { return mProcID == PROC_CUT_TURN_MOVE; }
virtual BOOL checkCutTurnCharge() const { return mProcID == PROC_CUT_TURN_MOVE && mProcVar2.field_0x300c == 0; }
virtual BOOL checkCutLargeJumpCharge() const { return mProcID == PROC_CUT_TURN_MOVE && mProcVar2.field_0x300c != 0; }
virtual BOOL checkComboCutTurn() const { return mProcID == PROC_CUT_TURN && mComboCutCount != 0; }
virtual BOOL checkClimbMove() const { return mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_LADDER_MOVE || mProcID == PROC_CLIMB_MOVE_SIDE; }
virtual BOOL checkGrassWhistle() const { return mProcID == PROC_GRASS_WHISTLE_WAIT; }
virtual BOOL checkBoarRun() const { return mProcID == PROC_BOAR_RUN; }
virtual f32 getBaseAnimeFrameRate() const { return mUnderFrameCtrl[0].getRate(); }
virtual f32 getBaseAnimeFrame() const;
virtual void setAnimeFrame(f32);
virtual BOOL checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const;
virtual s32 getItemID() const;
virtual u32 getGrabActorID() const;
virtual s32 getAtnActorID() const { return mAtnActorID; }
virtual s32 getItemID() const { return mItemAcKeep.getID(); }
virtual u32 getGrabActorID() const {
if (mEquipItem == 0x102) {
return mItemAcKeep.getID();
} else {
return mGrabItemAcKeep.getID();
}
}
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
virtual void setForcePutPos(cXyz const& pPutPos) {
mForcePutPos = pPutPos;
onEndResetFlg1(ERFLG1_UNK_2000);
}
virtual u32 checkPlayerNoDraw();
virtual void voiceStart(u32);
virtual void seStartOnlyReverb(u32);
@@ -3100,12 +3117,14 @@ public:
virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*);
virtual void onFrollCrashFlg(u8, int);
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual MtxP getHeadMtx() {
return mpLinkModel->getAnmMtx(field_0x30b4);;
}
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const;
virtual BOOL checkCutJumpCancelTurn() const { return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2; }
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
virtual BOOL checkSingleBoarBattleSecondBowReady() const;
virtual BOOL checkSingleBoarBattleSecondBowReady() const { 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*);
@@ -3113,33 +3132,66 @@ public:
virtual bool setThrowDamage(short, f32, f32, int, int, int);
virtual bool checkSetNpcTks(cXyz*, int, int);
virtual int setRollJump(f32, f32, short);
virtual void playerStartCollisionSE(u32, u32);
virtual void cancelDungeonWarpReadyNeck();
virtual void playerStartCollisionSE(u32 param_0, u32 param_1) { mZ2Link.startCollisionSE(param_0, param_1); }
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, u8, fopAc_ac_c*);
virtual void onSceneChangeDead(u8, int);
virtual void onSceneChangeAreaJump(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) {
mExitID = exitID | 0x8000;
mExitDirection = exitDirection;
mpScnChg = (daScex_c*)scexAc;
}
virtual void onSceneChangeDead(u8 param_0, int param_1) {
if (mProcID != PROC_DEAD) {
return;
}
mProcVar5.field_0x3012 = param_0;
field_0x3198 = param_1;
}
virtual u32 checkHorseRide() const;
virtual u32 checkBoarRide() const;
virtual u32 checkCanoeRide() const;
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
virtual daSpinner_c* getSpinnerActor();
virtual BOOL checkHorseRideNotReady() const;
virtual daSpinner_c* getSpinnerActor() {
daSpinner_c* spinnerActor;
if (!checkSpinnerRide()) {
spinnerActor = NULL;
} else {
spinnerActor = (daSpinner_c*)mRideAcKeep.getActor();
}
return (daSpinner_c*)spinnerActor;
}
virtual BOOL checkHorseRideNotReady() const { return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF; }
virtual bool checkArrowChargeEnd() const;
virtual f32 getSearchBallScale() const;
virtual int checkFastShotTime();
virtual bool checkNoEquipItem() const;
virtual f32 getSearchBallScale() const { return mSearchBallScale; }
virtual int checkFastShotTime() { return mFastShotTime; }
virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; }
virtual bool checkKandelaarSwing(int) const;
virtual s16 getBoardCutTurnOffsetAngleY() const;
virtual cXyz* getMagneBootsTopVec();
virtual s16 getBoardCutTurnOffsetAngleY() const {
if (mProcID == PROC_BOARD_CUT_TURN) {
return mProcVar5.field_0x3012;
}
return 0;
}
virtual cXyz* getMagneBootsTopVec() { return &mMagneBootsTopVec; }
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*) const;
virtual bool checkPriActorOwn(fopAc_ac_c const* p_actor) const { return field_0x27f4 == p_actor; }
virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2);
virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const;
virtual void setWolfEnemyHangBiteAngle(short);
virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { return field_0x281c.getActorConst() == p_actor; }
virtual void setWolfEnemyHangBiteAngle(short angle) {
if (mProcID != PROC_WOLF_ENEMY_HANG_BITE) {
return;
}
mProcVar4.field_0x3010 = angle;
}
virtual void setKandelaarMtx(f32 (*)[4], int, int);
virtual bool getStickAngleFromPlayerShape(short*) const;
virtual bool checkSpinnerPathMove();
@@ -3147,47 +3199,87 @@ public:
virtual void onSpinnerPathForceRemove();
virtual int getIronBallBgHit() const;
virtual cXyz* getIronBallCenterPos();
virtual bool checkCanoeFishingGetLeft() const;
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
virtual bool checkCanoeFishingGetLeft() const { return mProcID == PROC_CANOE_FISHING_GET && mProcVar3.field_0x300e == 0; }
virtual bool checkCanoeFishingGetRight() const { return mProcID == PROC_CANOE_FISHING_GET && mProcVar3.field_0x300e == 1; }
virtual u8 checkBeeChildDrink() const { return field_0x2fd3; }
virtual void skipPortalObjWarp();
virtual BOOL checkTreasureRupeeReturn(int) const;
virtual void setSumouReady(fopAc_ac_c*);
virtual bool checkAcceptDungeonWarpAlink(int);
virtual s16 getSumouCounter() const;
virtual s16 checkSumouWithstand() const;
virtual void setSumouReady(fopAc_ac_c* p_actor) {
mSpecialMode = SMODE_SUMO_READY;
mCargoCarryAcKeep.setData(p_actor);
mDemo.setDemoMode(1);
}
virtual bool checkAcceptDungeonWarpAlink(int) { return checkAcceptWarp(); }
virtual s16 getSumouCounter() const { return mProcVar2.field_0x300c; }
virtual s16 checkSumouWithstand() const { return mProcVar3.field_0x300e; }
virtual void cancelGoronThrowEvent();
virtual void setSumouGraspCancelCount(int);
virtual void setSumouPushBackDirection(short);
virtual void setSumouLoseHeadUp();
virtual s16 getGiantPuzzleAimAngle() const;
virtual void setGoronSideMove(fopAc_ac_c*);
virtual void setCargoCarry(fopAc_ac_c*);
virtual void setSumouGraspCancelCount(int param_0) {
if (mProcID != PROC_SUMOU_MOVE) {
return;
}
mProcVar2.field_0x300c = param_0;
}
virtual void setSumouPushBackDirection(short param_0) {
if (mProcID != PROC_SUMOU_MOVE) {
return;
}
mProcVar4.field_0x3010 = param_0;
}
virtual void setSumouLoseHeadUp() {
if (mProcID != PROC_SUMOU_WIN_LOSE) {
return;
}
mSpecialMode = SMODE_SUMO_LOSE;
}
virtual s16 getGiantPuzzleAimAngle() const { return mProcVar2.mPuzzleAimAngle; }
virtual void setGoronSideMove(fopAc_ac_c* p_actor) {
mSpecialMode = SMODE_GORON_THROW;
mCargoCarryAcKeep.setData(p_actor);
}
virtual void setCargoCarry(fopAc_ac_c* p_actor) {
mSpecialMode = SMODE_CARGO_CARRY;
mCargoCarryAcKeep.setData(p_actor);
}
virtual cXyz* getHookshotTopPos();
virtual bool checkHookshotReturnMode() const;
virtual bool checkHookshotShootReturnMode() const;
virtual bool checkOctaIealHang() const;
virtual void cancelOctaIealHang();
virtual void cancelDragonHangBackJump();
virtual void setOctaIealWildHang();
virtual bool checkDragonHangRide() const;
virtual bool checkOctaIealHang() const { return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc == 0; }
virtual void cancelOctaIealHang() {
if (mProcID != PROC_BOSS_BODY_HANG) {
return;
}
mProcVar3.field_0x300e = 1;
}
virtual void cancelDragonHangBackJump() {
if (mProcID != PROC_BOSS_BODY_HANG) {
return;
}
mProcVar3.field_0x300e = -1;
}
virtual void setOctaIealWildHang() {
if (mProcID != PROC_BOSS_BODY_HANG) {
return;
}
mProcVar0.field_0x3008 = 1;
}
virtual bool checkDragonHangRide() const { return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0; }
virtual void changeDragonActor(fopAc_ac_c*);
virtual u8 getClothesChangeWaitTimer() const;
virtual u8 getShieldChangeWaitTimer() const;
virtual u8 getSwordChangeWaitTimer() const;
virtual BOOL checkMetamorphose() const;
virtual BOOL checkWolfDownAttackPullOut() const;
virtual u8 getClothesChangeWaitTimer() const { return mClothesChangeWaitTimer; }
virtual u8 getShieldChangeWaitTimer() const { return mShieldChangeWaitTimer; }
virtual u8 getSwordChangeWaitTimer() const { return mSwordChangeWaitTimer; }
virtual BOOL checkMetamorphose() const { return mProcID == PROC_METAMORPHOSE && mProcVar1.field_0x300a == 0; }
virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; }
virtual BOOL checkBootsOrArmorHeavy() const;
virtual s32 getBottleOpenAppearItem() const;
virtual bool checkItemSwordEquip() const;
virtual f32 getSinkShapeOffset() const;
virtual BOOL checkSinkDead() const;
virtual BOOL checkHorseStart();
virtual bool checkItemSwordEquip() const { return mEquipItem == 0x103; }
virtual f32 getSinkShapeOffset() const { return mSinkShapeOffset; }
virtual BOOL checkSinkDead() const { return field_0x2fbd == 0xFF; }
virtual BOOL checkHorseStart() { return checkHorseStart(getLastSceneMode(), getStartMode()); }
virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
virtual BOOL checkWolfHowlSuccessAnime() const;
virtual BOOL checkWolfHowlSuccessAnime() const { return checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS); }
virtual BOOL checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
virtual BOOL checkCutJumpMode() const;
virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
virtual BOOL checkCutJumpMode() const { return mProcID == PROC_CUT_JUMP; }
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
@@ -3598,9 +3690,13 @@ public:
f32 getSlideLimit() const { return field_0x3470; }
inline bool checkWindSpeedOnXZ() const;
bool checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > 1.0f; }
inline void startRestartRoomFromOut(int, u32, int);
inline u16 getReadyItem();
u16 getReadyItem() {
return dComIfGp_getSelectItem(mSelectItemId);
}
static daAlink_BckData const m_mainBckShield[20];
static daAlink_BckData const m_mainBckSword[5];
+5 -1
View File
@@ -15,7 +15,11 @@
*/
class daCrod_c : public fopAc_ac_c {
public:
/* 80141A94 */ void setControllActorData();
/* 80141A94 */ void setControllActorData() {
mControllActorKeep.setActor();
mCameraActorKeep.setActor();
}
/* 804A2E38 */ int createHeap();
/* 804A2F18 */ int create();
/* 804A3304 */ ~daCrod_c();
+3 -3
View File
@@ -213,9 +213,9 @@ public:
};
void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
void onNoServiceWait();
u32 checkForceNormalColor() const { return checkStateFlg1(FLG1_FORCE_NORMAL_COL); }
u32 checkForceTiredColor() const { return checkStateFlg1(FLG1_FORCE_TIRED_COL); }
void onNoServiceWait() { onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); }
/* 804BC3E0 */ int modelCallBack(int);
/* 804BC5C4 */ int changeUpperBck();
+182 -165
View File
@@ -691,7 +691,7 @@ public:
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; }
inline static BOOL checkSwordGet();
static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; }
cXyz getHeadTopPos() const { return mHeadTopPos; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -704,175 +704,175 @@ public:
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
virtual MtxP getModelMtx();
virtual MtxP getInvMtx();
virtual cXyz* getShadowTalkAtnPos();
virtual f32 getGroundY();
virtual MtxP getLeftItemMatrix();
virtual MtxP getRightItemMatrix();
virtual MtxP getLeftHandMatrix();
virtual MtxP getRightHandMatrix();
virtual MtxP getLinkBackBone1Matrix();
virtual MtxP getWolfMouthMatrix();
virtual MtxP getWolfBackbone2Matrix();
virtual MtxP getBottleMtx();
virtual BOOL checkPlayerGuard() const;
virtual cXyz* getMidnaAtnPos() const { return NULL; }
virtual void setMidnaMsgNum(fopAc_ac_c*, u16) {}
virtual MtxP getModelMtx() { return cullMtx; }
virtual MtxP getInvMtx() { return cullMtx; }
virtual cXyz* getShadowTalkAtnPos() { return &current.pos; }
virtual f32 getGroundY() = 0;
virtual MtxP getLeftItemMatrix() { return cullMtx; }
virtual MtxP getRightItemMatrix() { return cullMtx; }
virtual MtxP getLeftHandMatrix() { return cullMtx; }
virtual MtxP getRightHandMatrix() { return cullMtx; }
virtual MtxP getLinkBackBone1Matrix() { return cullMtx; }
virtual MtxP getWolfMouthMatrix() { return cullMtx; }
virtual MtxP getWolfBackbone2Matrix() { return cullMtx; }
virtual MtxP getBottleMtx() { return NULL; }
virtual BOOL checkPlayerGuard() const { return FALSE; }
virtual u32 checkPlayerFly() const { return 0; }
virtual BOOL checkFrontRoll() const { return FALSE; }
virtual BOOL checkWolfDash() const { return FALSE; }
virtual BOOL checkAutoJump() const;
virtual bool checkSideStep() const;
virtual bool checkWolfTriggerJump() const;
virtual BOOL checkGuardBreakMode() const;
virtual bool checkLv3Slide() const;
virtual bool checkWolfHowlDemoMode() const;
virtual bool checkChainBlockPushPull();
virtual BOOL checkElecDamage() const;
virtual BOOL checkEmptyBottleSwing() const;
virtual BOOL checkBottleSwingMode() const;
virtual BOOL checkHawkWait() const;
virtual BOOL checkGoatThrow() const;
virtual BOOL checkGoatThrowAfter() const;
virtual BOOL checkWolfTagLockJump() const;
virtual BOOL checkWolfTagLockJumpLand() const;
virtual BOOL checkWolfRope();
virtual BOOL checkWolfRopeHang() const;
virtual BOOL checkRollJump() const;
virtual BOOL checkGoronRideWait() const;
virtual BOOL checkWolfChain() const;
virtual BOOL checkWolfWait() const;
virtual BOOL checkWolfJumpAttack() const;
virtual BOOL checkWolfRSit() const;
virtual bool checkBubbleFly() const;
virtual BOOL checkBottleDrinkEnd() const;
virtual BOOL checkWolfDig() const;
virtual BOOL checkCutCharge() const;
virtual BOOL checkCutTurnCharge() const;
virtual BOOL checkCutLargeJumpCharge() const;
virtual bool getBokoFlamePos(cXyz*);
virtual BOOL checkComboCutTurn() const;
virtual BOOL checkClimbMove() const;
virtual BOOL checkGrassWhistle() const;
virtual BOOL checkBoarRun() const;
virtual bool checkFmChainPut() const;
virtual bool checkHorseElecDamage() const;
virtual f32 getBaseAnimeFrameRate() const;
virtual f32 getBaseAnimeFrame() const;
virtual void setAnimeFrame(f32);
virtual BOOL checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const { return -1; }
virtual s32 getItemID() const;
virtual BOOL checkAutoJump() const { return FALSE; }
virtual bool checkSideStep() const { return FALSE; }
virtual bool checkWolfTriggerJump() const { return FALSE; }
virtual BOOL checkGuardBreakMode() const { return FALSE; }
virtual bool checkLv3Slide() const { return FALSE; }
virtual bool checkWolfHowlDemoMode() const { return FALSE; }
virtual bool checkChainBlockPushPull() { return FALSE; }
virtual BOOL checkElecDamage() const { return FALSE; }
virtual BOOL checkEmptyBottleSwing() const { return FALSE; }
virtual BOOL checkBottleSwingMode() const { return FALSE; }
virtual BOOL checkHawkWait() const { return FALSE; }
virtual BOOL checkGoatThrow() const { return FALSE; }
virtual BOOL checkGoatThrowAfter() const { return FALSE; }
virtual BOOL checkWolfTagLockJump() const { return FALSE; }
virtual BOOL checkWolfTagLockJumpLand() const { return FALSE; }
virtual BOOL checkWolfRope() { return FALSE; }
virtual BOOL checkWolfRopeHang() const { return FALSE; }
virtual BOOL checkRollJump() const { return FALSE; }
virtual BOOL checkGoronRideWait() const { return FALSE; }
virtual BOOL checkWolfChain() const { return FALSE; }
virtual BOOL checkWolfWait() const { return FALSE; }
virtual BOOL checkWolfJumpAttack() const { return FALSE; }
virtual BOOL checkWolfRSit() const { return FALSE; }
virtual bool checkBubbleFly() const { return FALSE; }
virtual BOOL checkBottleDrinkEnd() const { return FALSE; }
virtual BOOL checkWolfDig() const { return FALSE; }
virtual BOOL checkCutCharge() const { return FALSE; }
virtual BOOL checkCutTurnCharge() const { return FALSE; }
virtual BOOL checkCutLargeJumpCharge() const { return FALSE; }
virtual bool getBokoFlamePos(cXyz*) { return FALSE; }
virtual BOOL checkComboCutTurn() const { return FALSE; }
virtual BOOL checkClimbMove() const { return FALSE; }
virtual BOOL checkGrassWhistle() const { return FALSE; }
virtual BOOL checkBoarRun() const { return FALSE; }
virtual bool checkFmChainPut() const { return FALSE; }
virtual bool checkHorseElecDamage() const { return FALSE; }
virtual f32 getBaseAnimeFrameRate() const { return 1.0f; }
virtual f32 getBaseAnimeFrame() const { return 0.0f; }
virtual void setAnimeFrame(f32) {}
virtual BOOL checkWolfLock(fopAc_ac_c*) const { return FALSE; }
virtual bool cancelWolfLock(fopAc_ac_c*) { return FALSE; }
virtual s32 getAtnActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual s32 getItemID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual u32 getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
virtual u32 checkPlayerNoDraw();
virtual bool checkRopeTag();
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 onMagneGrab(f32, f32);
virtual BOOL exchangeGrabActor(fopAc_ac_c*) { return FALSE; }
virtual BOOL setForceGrab(fopAc_ac_c*, int, int) { return FALSE; }
virtual void setForcePutPos(cXyz const&) {}
virtual u32 checkPlayerNoDraw() { return FALSE; }
virtual bool checkRopeTag() { return FALSE; }
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 onMagneGrab(f32, f32) {}
virtual void onFrollCrashFlg(u8, int) {}
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual MtxP getModelJointMtx(u16) { return NULL; }
virtual MtxP getHeadMtx() { return NULL; }
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*) { return FALSE; }
virtual BOOL checkCutJumpCancelTurn() const { return FALSE; }
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
virtual BOOL checkSingleBoarBattleSecondBowReady() const;
virtual bool checkPointSubWindowMode() const;
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 playerStartCollisionSE(u32, u32);
virtual void changeTextureAnime(u16, u16, int);
virtual void cancelChangeTextureAnime();
virtual void cancelDungeonWarpReadyNeck();
virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*);
virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*);
virtual void onSceneChangeDead(u8, int);
virtual bool checkIronBallReturn() const { return FALSE; }
virtual bool checkIronBallGroundStop() const { return FALSE; }
virtual BOOL checkSingleBoarBattleSecondBowReady() const { return FALSE; }
virtual bool checkPointSubWindowMode() const { return FALSE; }
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) { return FALSE; }
virtual bool checkSetNpcTks(cXyz*, int, int) { return FALSE; }
virtual int setRollJump(f32, f32, short) { return FALSE; }
virtual void playerStartCollisionSE(u32, u32) {}
virtual void changeTextureAnime(u16, u16, int) {}
virtual void cancelChangeTextureAnime() {}
virtual void cancelDungeonWarpReadyNeck() {}
virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*) {}
virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*) {}
virtual void onSceneChangeDead(u8, int) {}
virtual u32 checkHorseRide() const { return false; }
virtual u32 checkBoarRide() const { return 0; }
virtual u32 checkCanoeRide() const { return 0; }
virtual u32 checkBoardRide() const { return 0; }
virtual u32 checkSpinnerRide() const { return 0; }
virtual daSpinner_c* getSpinnerActor();
virtual BOOL checkHorseRideNotReady() const;
virtual bool checkArrowChargeEnd() const;
virtual f32 getSearchBallScale() const;
virtual int checkFastShotTime();
virtual bool checkNoEquipItem() const;
virtual bool checkFireMaterial() const;
virtual bool checkKandelaarSwing(int) const;
virtual s16 getBoardCutTurnOffsetAngleY() const;
virtual cXyz* getMagneHitPos();
virtual cXyz* getMagneBootsTopVec();
virtual daSpinner_c* getSpinnerActor() { return NULL; }
virtual BOOL checkHorseRideNotReady() const { return FALSE; }
virtual bool checkArrowChargeEnd() const { return FALSE; }
virtual f32 getSearchBallScale() const { return 0.0f; }
virtual int checkFastShotTime() { return FALSE; }
virtual bool checkNoEquipItem() const { return TRUE; }
virtual bool checkFireMaterial() const { return FALSE; }
virtual bool checkKandelaarSwing(int) const { return FALSE; }
virtual s16 getBoardCutTurnOffsetAngleY() const { return 0; }
virtual cXyz* getMagneHitPos() { return &mSwordTopPos; }
virtual cXyz* getMagneBootsTopVec() { return &current.pos; }
virtual cXyz* getKandelaarFlamePos() { return NULL; }
virtual bool checkUseKandelaar(int);
virtual void setDkCaught(fopAc_ac_c*);
virtual void onPressedDamage(cXyz const&, short);
virtual bool checkPriActorOwn(fopAc_ac_c const*) const;
virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2);
virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const;
virtual void setWolfEnemyHangBiteAngle(short);
virtual void setKandelaarMtx(f32 (*)[4], int, int);
virtual bool getStickAngleFromPlayerShape(short*) const;
virtual bool checkSpinnerPathMove();
virtual bool checkSpinnerTriggerAttack();
virtual void onSpinnerPathForceRemove();
virtual int getIronBallBgHit() const;
virtual cXyz* getIronBallCenterPos();
virtual bool checkCanoeFishingGetLeft() const;
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
virtual void skipPortalObjWarp();
virtual BOOL checkTreasureRupeeReturn(int) const;
virtual void setSumouReady(fopAc_ac_c*);
virtual bool checkAcceptDungeonWarpAlink(int);
virtual s16 getSumouCounter() const;
virtual s16 checkSumouWithstand() const;
virtual void cancelGoronThrowEvent();
virtual void setSumouGraspCancelCount(int);
virtual void setSumouPushBackDirection(short);
virtual void setSumouLoseHeadUp();
virtual s16 getGiantPuzzleAimAngle() const;
virtual void setGoronSideMove(fopAc_ac_c*);
virtual void setCargoCarry(fopAc_ac_c*);
virtual bool getDpdFarFlg() const;
virtual cXyz* getHookshotTopPos();
virtual bool checkHookshotReturnMode() const;
virtual bool checkHookshotShootReturnMode() const;
virtual bool checkOctaIealHang() const;
virtual void cancelOctaIealHang();
virtual void cancelDragonHangBackJump();
virtual void setOctaIealWildHang();
virtual bool checkDragonHangRide() const;
virtual void changeDragonActor(fopAc_ac_c*);
virtual u8 getClothesChangeWaitTimer() const;
virtual u8 getShieldChangeWaitTimer() const;
virtual u8 getSwordChangeWaitTimer() const;
virtual BOOL checkMetamorphose() const;
virtual BOOL checkWolfDownAttackPullOut() const;
virtual BOOL checkBootsOrArmorHeavy() const;
virtual s32 getBottleOpenAppearItem() const;
virtual bool checkItemSwordEquip() const;
virtual f32 getSinkShapeOffset() const;
virtual BOOL checkSinkDead() const;
virtual BOOL checkHorseStart();
virtual Z2WolfHowlMgr* getWolfHowlMgrP();
virtual BOOL checkWolfHowlSuccessAnime() const;
virtual BOOL checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
virtual BOOL checkCutJumpMode() const;
virtual bool checkUseKandelaar(int) { return FALSE; }
virtual void setDkCaught(fopAc_ac_c*) {}
virtual void onPressedDamage(cXyz const&, short) {}
virtual bool checkPriActorOwn(fopAc_ac_c const*) const { return FALSE; }
virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2) { return FALSE; }
virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const { return FALSE; }
virtual void setWolfEnemyHangBiteAngle(short) {}
virtual void setKandelaarMtx(f32 (*)[4], int, int) {}
virtual bool getStickAngleFromPlayerShape(short*) const { return FALSE; }
virtual bool checkSpinnerPathMove() { return FALSE; }
virtual bool checkSpinnerTriggerAttack() { return FALSE; }
virtual void onSpinnerPathForceRemove() {}
virtual int getIronBallBgHit() const { return FALSE; }
virtual cXyz* getIronBallCenterPos() { return NULL; }
virtual bool checkCanoeFishingGetLeft() const { return FALSE; }
virtual bool checkCanoeFishingGetRight() const { return FALSE; }
virtual u8 checkBeeChildDrink() const { return FALSE; }
virtual void skipPortalObjWarp() {}
virtual BOOL checkTreasureRupeeReturn(int) const { return FALSE; }
virtual void setSumouReady(fopAc_ac_c*) {}
virtual bool checkAcceptDungeonWarpAlink(int) { return FALSE; }
virtual s16 getSumouCounter() const { return 0; }
virtual s16 checkSumouWithstand() const { return 0; }
virtual void cancelGoronThrowEvent() {}
virtual void setSumouGraspCancelCount(int) {}
virtual void setSumouPushBackDirection(short) {}
virtual void setSumouLoseHeadUp() {}
virtual s16 getGiantPuzzleAimAngle() const { return shape_angle.y; }
virtual void setGoronSideMove(fopAc_ac_c*) {}
virtual void setCargoCarry(fopAc_ac_c*) {}
virtual bool getDpdFarFlg() const { return 0; }
virtual cXyz* getHookshotTopPos() { return NULL; }
virtual bool checkHookshotReturnMode() const { return FALSE; }
virtual bool checkHookshotShootReturnMode() const { return FALSE; }
virtual bool checkOctaIealHang() const { return FALSE; }
virtual void cancelOctaIealHang() {}
virtual void cancelDragonHangBackJump() {}
virtual void setOctaIealWildHang() {}
virtual bool checkDragonHangRide() const { return FALSE; }
virtual void changeDragonActor(fopAc_ac_c*) {}
virtual u8 getClothesChangeWaitTimer() const { return 0; }
virtual u8 getShieldChangeWaitTimer() const { return 0; }
virtual u8 getSwordChangeWaitTimer() const { return 0; }
virtual BOOL checkMetamorphose() const { return FALSE; }
virtual BOOL checkWolfDownAttackPullOut() const { return FALSE; }
virtual BOOL checkBootsOrArmorHeavy() const { return FALSE; }
virtual s32 getBottleOpenAppearItem() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual bool checkItemSwordEquip() const { return FALSE; }
virtual f32 getSinkShapeOffset() const { return 0.0f; }
virtual BOOL checkSinkDead() const { return FALSE; }
virtual BOOL checkHorseStart() { return FALSE; }
virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return NULL; }
virtual BOOL checkWolfHowlSuccessAnime() const { return FALSE; }
virtual BOOL checkCopyRodTopUse() { return FALSE; }
virtual bool checkCopyRodEquip() const { return FALSE; }
virtual BOOL checkCutJumpMode() const { return FALSE; }
f32 getSpeedF() const { return speedF; }
@@ -1079,16 +1079,33 @@ public:
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip() {
static u32 getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
static bool checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
}
inline static bool checkLightMasterSwordEquip();
inline static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static bool checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
}
static bool checkCasualWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL;
}
static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
static bool checkZoraWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
}
static bool checkMagicArmorWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
}
static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); }
static daMidna_c* getMidnaActor() { return m_midnaActor; }
+5 -2
View File
@@ -287,8 +287,7 @@ void dMeter2Info_setCloth(u8 i_clothId, bool param_1);
void dMeter2Info_setShield(u8 i_itemId, bool param_1);
void dMeter2Info_set2DVibration();
void dMeter2Info_set2DVibrationM();
static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible);
static void dMeter2Info_offUseButton(int pButton);
void dMeter2Info_offUseButton(int pButton);
bool dMeter2Info_is2DActiveTouchArea();
u8 dMeter2Info_getRecieveLetterNum();
bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
@@ -813,6 +812,10 @@ inline bool dMeter2Info_isNextStage(const char*, s16, s16, s16) {
return false;
}
inline void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible) {
g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible);
}
const char* dMeter2Info_getPlusTextureName();
const char* dMeter2Info_getNumberTextureName(int pIndex);
int dMeter2Info_recieveLetter();
+12 -2
View File
@@ -32,11 +32,21 @@ void mDoAud_resetProcess();
bool mDoAud_resetRecover();
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
s32 mDoAud_load1stDynamicWave();
static void mDoAud_setLinkGroupInfo(u8 param_0);
static void mDoAud_setLinkHp(s32 param_0, s32 param_1);
void mDoAud_setFadeInStart(u8 param_0);
void mDoAud_setFadeOutStart(u8 param_0);
inline void mDoAud_setLinkGroupInfo(u8 param_0) {
if (Z2GetLink() != NULL) {
Z2GetLink()->setLinkGroupInfo(param_0);
}
}
inline void mDoAud_setLinkHp(s32 param_0, s32 param_1) {
if (Z2GetLink() != NULL) {
Z2GetLink()->setLinkHp(param_0, param_1);
}
}
inline void mDoAud_bgmSetSwordUsing(s32 id) {
Z2AudioMgr::getInterface()->bgmSetSwordUsing(id);
}
+1 -1
View File
@@ -80,7 +80,7 @@ inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16
mDoMtx_lookAt(param_0, param_1, param_2, param_3);
}
inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
inline void cMtx_multVec(const Mtx mtx, const Vec* src, Vec* dst) {
mDoMtx_multVec(mtx, src, dst);
}