encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

misc and d_event

Browse Source
This commit is contained in:
lepelog
2022-07-02 03:08:21 +02:00
parent b973f1c798
commit b649193f04
36 changed files with 357 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+4 -2
View File
@@ -2572,11 +2572,12 @@ public:
BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
bool checkFishingCastMode() const {
bool var_r5;
bool var_r4 = 1;
bool var_r3 = 0;
if (mProcID == PROC_FISHING_CAST) {
bool var_r5 = 0;
var_r5 = 0;
if (mItemActor.getActor() != NULL && mItemActor.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
@@ -4633,7 +4634,7 @@ public:
FORCE_PANIC = 8,
};
enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000 };
enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000, NO_DRAW = 0x2000 };
enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 };
@@ -4699,6 +4700,7 @@ public:
void changeDemoMode(u32 mode) { mDemoMode = mode; }
BOOL checkNpcNear() { return checkStateFlg0(NPC_NEAR); }
BOOL checkNpcFar() { return checkStateFlg0(NPC_FAR); }
BOOL checkNoDraw() const { return checkStateFlg0(NO_DRAW); }
inline bool checkMidnaRealBody();
include/d/a/d_a_player.h
+6 -1
View File
@@ -157,6 +157,8 @@ private:
}; // Size: 0x24
class daMidna_c;
class daPy_py_c;
inline daPy_py_c* dComIfGp_getLinkPlayer();
class daPy_py_c : public fopAc_ac_c {
public:
@@ -351,7 +353,7 @@ public:
/* 80182A10 */ void checkGoronSideMove() const;
/* 80182AAC */ void getRightFootPosP();
/* 80182AB4 */ void getLeftFootPosP();
/* 80182ABC */ u32 getMidnaActor();
/* 80182ABC */ //u32 getMidnaActor();
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
@@ -589,6 +591,9 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static BOOL i_checkNowWolf() {
return dComIfGp_getLinkPlayer()->i_checkWolf();
}
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;