mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-21 22:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_alink cleanup / debug work (#3045)

Browse Source 
* 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
This commit is contained in:
TakaRikka
2026-01-17 05:44:37 -08:00
committed by GitHub
parent 93dcac3343
commit b1f44ce532
85 changed files with 11833 additions and 10199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+689 -540
View File
File diff suppressed because it is too large Load Diff
include/d/actor/d_a_b_dr.h
+2 -2
View File
@@ -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;
include/d/actor/d_a_boomerang.h
+1 -1
View File
@@ -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); }
include/d/actor/d_a_canoe.h
+1 -1
View File
@@ -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; }
include/d/actor/d_a_cow.h
+10 -10
View File
@@ -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; }
include/d/actor/d_a_npc_bou.h
+1 -2
View File
@@ -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());
}
include/d/actor/d_a_npc_kn.h
+2
View File
@@ -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();
include/d/actor/d_a_npc_kolin.h
+1 -2
View File
@@ -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());
}
include/d/actor/d_a_obj_gra2.h
+5 -5
View File
@@ -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];
include/d/actor/d_a_obj_sekizoa.h
+14 -25
View File
@@ -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;
include/d/actor/d_a_obj_swhang.h
+2 -1
View File
@@ -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;
include/d/actor/d_a_obj_wchain.h
+10 -6
View File
@@ -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;
include/d/actor/d_a_obj_wind_stone.h
+1 -1
View File
@@ -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); }
include/d/actor/d_a_obj_yobikusa.h
+4 -1
View File
@@ -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;
include/d/actor/d_a_player.h
+253 -257
View File
@@ -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); }
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_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); }
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; }
void setSumouForceTackle() { mMode = 0x1B; }
void setSumouForceGraspCancel() { mMode = 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; }
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_UNK_40000000); }
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);
include/d/actor/d_a_spinner.h
+1
View File
@@ -48,6 +48,7 @@ public:
dPath* checkPathMoveNow() { return mpPathMove; }
static u32 getWaitArg() { return 0; }
static int getWaterSinkLimit() { return 50; }
BOOL getDeleteFlg() const { return mDeleteFlg; }
include/d/actor/d_a_tag_kmsg.h
+2 -2
View File
@@ -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 {