mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 21:30:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add all player demo mode names to enum

Browse Source
This commit is contained in:
LagoLunatic
2025-06-15 16:10:33 -04:00
parent 25b9aeae03
commit f042f156f5
12 changed files with 192 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player.h
+78 -43
View File
@@ -30,48 +30,83 @@ STATIC_ASSERT(sizeof(daPy_mtxFollowEcallBack_c) == 0x0C);
class daPy_demo_c {
public:
enum {
DEMO_UNK00_e = 0x00,
DEMO_UNK01_e = 0x01,
DEMO_UNK02_e = 0x02,
DEMO_UNK03_e = 0x03,
DEMO_UNK04_e = 0x04,
DEMO_UNK05_e = 0x05,
DEMO_UNK06_e = 0x06,
DEMO_UNK08_e = 0x08,
DEMO_UNK09_e = 0x09,
DEMO_UNK0A_e = 0x0A,
DEMO_UNK0E_e = 0x0E,
DEMO_UNK0F_e = 0x0F,
DEMO_UNK10_e = 0x10,
DEMO_UNK11_e = 0x11,
DEMO_UNK12_e = 0x12,
DEMO_UNK14_e = 0x14,
DEMO_UNK17_e = 0x17,
DEMO_UNK18_e = 0x18,
DEMO_UNK1A_e = 0x1A,
DEMO_UNK1B_e = 0x1B,
DEMO_UNK1D_e = 0x1D,
DEMO_UNK1E_e = 0x1E,
DEMO_UNK1F_e = 0x1F,
DEMO_UNK22_e = 0x22,
DEMO_UNK25_e = 0x25,
DEMO_UNK27_e = 0x27,
DEMO_UNK2A_e = 0x2A,
DEMO_UNK2B_e = 0x2B,
DEMO_UNK2C_e = 0x2C,
DEMO_UNK2F_e = 0x2F,
DEMO_UNK33_e = 0x33,
DEMO_UNK35_e = 0x35,
DEMO_UNK38_e = 0x38,
DEMO_UNK39_e = 0x39,
DEMO_UNK3D_e = 0x3D,
DEMO_UNK3E_e = 0x3E,
DEMO_UNK40_e = 0x40,
DEMO_UNK44_e = 0x44,
DEMO_UNK48_e = 0x48,
DEMO_UNK4A_e = 0x4A,
DEMO_LAST_e = 0x4B,
DEMO_NEW_ANM0_e = 0x200,
/* 0x000 */ DEMO_UNK00_e = 0,
/* 0x001 */ DEMO_N_WAIT_e = 1,
/* 0x002 */ DEMO_N_WALK_e = 2,
/* 0x003 */ DEMO_N_DASH_e = 3,
/* 0x004 */ DEMO_INIT_WAIT_e = 4,
/* 0x005 */ DEMO_WAIT_TURN_e = 5,
/* 0x006 */ DEMO_N_TALK_e = 6,
/* 0x007 */ DEMO_DAM_ACTION_e = 7,
/* 0x008 */ DEMO_E_TALK_e = 8,
/* 0x009 */ DEMO_LDAM_e = 9,
/* 0x00A */ DEMO_OPEN_TREASURE_e = 10,
/* 0x00B */ DEMO_GET_ITEM_e = 11,
/* 0x00C */ DEMO_UNEQUIP_e = 12,
/* 0x00D */ DEMO_HOLDUP_e = 13,
/* 0x00E */ DEMO_KEEP_e = 14,
/* 0x00F */ DEMO_LAROUND_e = 15,
/* 0x010 */ DEMO_BJUMP_e = 16,
/* 0x011 */ DEMO_PFALL_e = 17,
/* 0x012 */ DEMO_UNK_018_e = 18,
/* 0x013 */ DEMO_SALUTE_e = 19,
/* 0x014 */ DEMO_L_AROUND2_e = 20,
/* 0x015 */ DEMO_T_PICKUP_e = 21,
/* 0x016 */ DEMO_T_WAIT_e = 22,
/* 0x017 */ DEMO_A_WAIT_e = 23,
/* 0x018 */ DEMO_SURPRISED_e = 24,
/* 0x019 */ DEMO_TBACK_e = 25,
/* 0x01A */ DEMO_LOOKUP_e = 26,
/* 0x01B */ DEMO_UNK_027_e = 27,
/* 0x01C */ DEMO_UNK_028_e = 28,
/* 0x01D */ DEMO_UNK_029_e = 29,
/* 0x01E */ DEMO_UNK_030_e = 30,
/* 0x01F */ DEMO_LWAIT_e = 31,
/* 0x020 */ DEMO_PWAIT_032_e = 32,
/* 0x021 */ DEMO_PUSH_e = 33,
/* 0x022 */ DEMO_TACT_e = 34,
/* 0x023 */ DEMO_DOOR_e = 35,
/* 0x024 */ DEMO_NOD_e = 36,
/* 0x025 */ DEMO_PRESENT_e = 37,
/* 0x026 */ DEMO_WCHANGE_e = 38,
/* 0x027 */ DEMO_SHIP_e = 39,
/* 0x028 */ DEMO_SIPUT_e = 40,
/* 0x029 */ DEMO_UNK_041_e = 41,
/* 0x02A */ DEMO_KM_WAIT_e = 42,
/* 0x02B */ DEMO_CUT_ROLL_e = 43,
/* 0x02C */ DEMO_POS_INIT_e = 44,
/* 0x02D */ DEMO_UNK_045_e = 45,
/* 0x02E */ DEMO_PGET_e = 46,
/* 0x02F */ DEMO_VOLCANO_e = 47,
/* 0x030 */ DEMO_WARP_e = 48,
/* 0x031 */ DEMO_S_SURP_e = 49,
/* 0x032 */ DEMO_SMILE_e = 50,
/* 0x033 */ DEMO_UNK_051_e = 51,
/* 0x034 */ DEMO_AGB_e = 52,
/* 0x035 */ DEMO_LTURN_e = 53,
/* 0x036 */ DEMO_LET_OPEN_e = 54,
/* 0x037 */ DEMO_LET_READ_e = 55,
/* 0x038 */ DEMO_GRAB_PUT_e = 56,
/* 0x039 */ DEMO_RD_STOP_e = 57,
/* 0x03A */ DEMO_RD_CATCH_e = 58,
/* 0x03B */ DEMO_GET_DANCE_e = 59,
/* 0x03C */ DEMO_BO_FAIRY_e = 60,
/* 0x03D */ DEMO_BO_OPEN_e = 61,
/* 0x03E */ DEMO_S_WARP_e = 62,
/* 0x03F */ DEMO_OPEN_SBOX_e = 63,
/* 0x040 */ DEMO_SFALL_e = 64,
/* 0x041 */ DEMO_FOODSET_e = 65,
/* 0x042 */ DEMO_SWAIT_e = 66,
/* 0x043 */ DEMO_PWAIT_067_e = 67,
/* 0x044 */ DEMO_UNK_068_e = 68,
/* 0x045 */ DEMO_SHIPSIT_e = 69,
/* 0x046 */ DEMO_UNK_070_e = 70,
/* 0x047 */ DEMO_SHIPOFF_e = 71,
/* 0x048 */ DEMO_UNK_072_e = 72,
/* 0x049 */ DEMO_FOODTHROW_e = 73,
/* 0x04A */ DEMO_UNK_074_e = 0x4A,
/* 0x04B */ DEMO_LAST_e = 0x4B,
/* 0x200 */ DEMO_NEW_ANM0_e = 0x200,
};
void setDemoType(u16 pType) { mDemoType = pType; }
@@ -434,7 +469,7 @@ public:
}
void cancelOriginalDemo() {
mDemo.setSystemDemoType();
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK01_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
}
void onNoResetFlg0(daPy_FLG0 flag) { mNoResetFlg0 |= flag; }
src/d/actor/d_a_auction.cpp
+17 -17
View File
@@ -756,7 +756,7 @@ void daAuction_c::eventMainInit() {
daPy_py_c* pLink = (daPy_py_c*)dComIfGp_getLinkPlayer();
pLink->changeOriginalDemo();
mCurLinkAnm = daPy_demo_c::DEMO_UNK01_e;
mCurLinkAnm = daPy_demo_c::DEMO_N_WAIT_e;
dComIfGp_event_setTalkPartner(this);
m82F = 0;
@@ -781,11 +781,11 @@ bool daAuction_c::eventMain() {
if (
pLink->getBaseAnimeFrameRate() == 0.0f &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK01_e &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK25_e
mCurLinkAnm != daPy_demo_c::DEMO_N_WAIT_e &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK_029_e &&
mCurLinkAnm != daPy_demo_c::DEMO_PRESENT_e
) {
setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
setLinkAnm(daPy_demo_c::DEMO_N_WAIT_e);
}
mFlags &= 4;
@@ -928,7 +928,7 @@ void daAuction_c::eventMainKai() {
m800 = mCurrBid + 1;
dComIfGp_setMessageSetNumber(mCurrBid + 1);
end = 0x1CFA;
setLinkAnm(daPy_demo_c::DEMO_UNK48_e);
setLinkAnm(daPy_demo_c::DEMO_UNK_072_e);
mpTimer->setShowType(1);
dAuction_screen_gaugeUp();
@@ -960,8 +960,8 @@ void daAuction_c::eventMainKai() {
dComIfGp_setNpcNameMessageID(l_npc_msg_dat[getAucMdlNo(m824)].field_0x00);
setMessage2(msgParam);
setCameraNpc(m824, 0);
if (m824 == 0 && mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e) {
setLinkAnm(daPy_demo_c::DEMO_UNK14_e);
if (m824 == 0 && mCurLinkAnm != daPy_demo_c::DEMO_UNK_029_e) {
setLinkAnm(daPy_demo_c::DEMO_L_AROUND2_e);
}
m834 |= 0x20;
@@ -1071,7 +1071,7 @@ void daAuction_c::eventMainUri() {
setCameraNpc(m824, 0);
if (m824 == 0) {
setLinkAnm(daPy_demo_c::DEMO_UNK14_e);
setLinkAnm(daPy_demo_c::DEMO_L_AROUND2_e);
}
m834 |= 0x20;
@@ -1112,8 +1112,8 @@ void daAuction_c::eventMainMsgSet() {
/* 0000279C-0000294C .text eventMainMsgEnd__11daAuction_cFv */
void daAuction_c::eventMainMsgEnd() {
if (eventMesEnd()) {
if (mCurLinkAnm != daPy_demo_c::DEMO_UNK01_e && mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e) {
setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
if (mCurLinkAnm != daPy_demo_c::DEMO_N_WAIT_e && mCurLinkAnm != daPy_demo_c::DEMO_UNK_029_e) {
setLinkAnm(daPy_demo_c::DEMO_N_WAIT_e);
}
if (m834 & 0x20) {
@@ -1347,7 +1347,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
m826 = tmp;
m824 = tmp;
if (m826 != 0) {
setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
setLinkAnm(daPy_demo_c::DEMO_N_WAIT_e);
}
break;
}
@@ -1356,12 +1356,12 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
if (dComIfGs_getRupee() < msgSetNo) {
mDoAud_seStart(JA_SE_AUC_BID_NG);
setLinkAnm(daPy_demo_c::DEMO_UNK4A_e);
setLinkAnm(daPy_demo_c::DEMO_UNK_074_e);
*pMsgNo = 0x1CFB;
m7C4[0] = 50.0f;
} else if (msgSetNo <= mCurrBid) {
mDoAud_seStart(JA_SE_AUC_BID_NG);
setLinkAnm(daPy_demo_c::DEMO_UNK4A_e);
setLinkAnm(daPy_demo_c::DEMO_UNK_074_e);
*pMsgNo = 0x1D1E;
m7C4[0] = 50.0f;
} else {
@@ -1419,7 +1419,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
case 0x1D21:
case 0x1D22:
case 0x1D23: {
setLinkAnm(daPy_demo_c::DEMO_UNK14_e);
setLinkAnm(daPy_demo_c::DEMO_L_AROUND2_e);
int rnd = getRand(6) + 1;
*pMsgNo = l_npc_msg_dat[getAucMdlNo(rnd)].field_0x06;
m825 = rnd;
@@ -1569,8 +1569,8 @@ void daAuction_c::setCameraNpc(int idx, s16 param_2) {
/* 000039FC-00003A3C .text setLinkAnm__11daAuction_cFUc */
void daAuction_c::setLinkAnm(u8 linkAnm) {
if (linkAnm == daPy_demo_c::DEMO_UNK01_e && m826 == 0) {
linkAnm = daPy_demo_c::DEMO_UNK1D_e;
if (linkAnm == daPy_demo_c::DEMO_N_WAIT_e && m826 == 0) {
linkAnm = daPy_demo_c::DEMO_UNK_029_e;
}
daPy_lk_c* pLink = (daPy_lk_c*)dComIfGp_getLinkPlayer();
src/d/actor/d_a_fganon.cpp
+4 -4
View File
@@ -1669,7 +1669,7 @@ void demo_camera(fganon_class* i_this) {
i_this->mB80 = 0.0f;
player->changeOriginalDemo();
player->changeDemoMode(daPy_demo_c::DEMO_UNK18_e);
player->changeDemoMode(daPy_demo_c::DEMO_SURPRISED_e);
}
case 2: {
transformedPos.x = -300306.0f;
@@ -1691,7 +1691,7 @@ void demo_camera(fganon_class* i_this) {
}
if (i_this->mB56 == 30) {
player->changeDemoMode(daPy_demo_c::DEMO_UNK35_e);
player->changeDemoMode(daPy_demo_c::DEMO_LTURN_e);
}
if (i_this->mB56 == 45) {
@@ -1810,7 +1810,7 @@ void demo_camera(fganon_class* i_this) {
i_this->mB5C.y = 921.0f;
i_this->mB5C.z = -300851.0f;
player->changeDemoMode(daPy_demo_c::DEMO_UNK1A_e);
player->changeDemoMode(daPy_demo_c::DEMO_LOOKUP_e);
}
break;
}
@@ -1866,7 +1866,7 @@ void demo_camera(fganon_class* i_this) {
cLib_addCalc2(&i_this->mB68.y, (i_this->eyePos.y - 30.0f) + REG0_F(11), 0.1f, 20.0f);
if (i_this->mB56 == 100) {
i_this->mB54 = 55;
player->changeDemoMode(daPy_demo_c::DEMO_UNK0F_e);
player->changeDemoMode(daPy_demo_c::DEMO_LAROUND_e);
i_this->mB56 = 0;
}
else {
src/d/actor/d_a_obj_toripost.cpp
+2 -2
View File
@@ -723,7 +723,7 @@ void daObjTpost_c::modeTalkXY() {
if(field_0x8E4 != -1 && cLib_calcTimer(&field_0x8E4) == 0) {
player->changeOriginalDemo();
player->changeDemoMode(daPy_demo_c::DEMO_UNK18_e);
player->changeDemoMode(daPy_demo_c::DEMO_SURPRISED_e);
field_0x8E4 = -1;
}
@@ -735,7 +735,7 @@ void daObjTpost_c::modeTalkXY() {
case 0xCF1:
if(player->getBaseAnimeFrameRate() == 0.0f) {
player->changeOriginalDemo();
player->changeDemoMode(daPy_demo_c::DEMO_UNK01_e);
player->changeDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
}
break;
src/d/actor/d_a_player_bottle.inc
+2 -2
View File
@@ -208,7 +208,7 @@ BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) {
return true;
}
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK3D_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_BO_OPEN_e) {
if (!dComIfGp_event_compulsory(this)) {
return false;
}
@@ -235,7 +235,7 @@ BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) {
} else {
mProcVar0.m3570 = 2;
}
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK3D_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_BO_OPEN_e) {
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &mProcVar0.m3570, 0);
}
initShipRideUseItem(iVar1, 2);
src/d/actor/d_a_player_bow.inc
+4 -4
View File
@@ -48,7 +48,7 @@ static BOOL daPy_bowJointCB(J3DNode* node, int calcTiming) {
/* 80149FD0-8014A008 .text bowButton__9daPy_lk_cCFv */
BOOL daPy_lk_c::bowButton() const {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e) {
return doButton();
} else {
return itemButton();
@@ -69,7 +69,7 @@ BOOL daPy_lk_c::checkBowAnime() const {
void daPy_lk_c::makeArrow() {
// Fakematch: The first call to getPt1 needs to load gameinfo differently from the other two.
// Adding a redundant (dEvt_control_c*) cast to just that one fixes it.
BOOL r4 = mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e;
BOOL r4 = mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e;
if ((!r4 && dComIfGs_getArrowNum() != 0) ||
(r4 && ((dEvt_control_c*)&g_dComIfG_gameInfo.play.getEvent())->getPt1() != NULL &&
fopAcM_GetName(dComIfGp_event_getPt1()) == PROC_NPC_SO &&
@@ -143,7 +143,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() {
} else if (bowButton() == NULL) {
if (arrow != NULL) {
fopAcM_SetParam(arrow, 1);
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_068_e) {
dComIfGp_setItemArrowNumCount(-1);
}
mActorKeepEquip.clearData();
@@ -171,7 +171,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() {
} else if (checkBowShootAnime()) {
if (mFrameCtrlUpper[UPPER_MOVE2_e].getRate() < 0.01f) {
if (m355E == 0 && bowButton() &&
(mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e || mEquipItem == getReadyItem()) &&
(mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e || mEquipItem == getReadyItem()) &&
!checkUseArrowEffect())
{
setBowReloadAnime();
src/d/actor/d_a_player_grab.inc
+2 -2
View File
@@ -631,7 +631,7 @@ BOOL daPy_lk_c::procGrabPut() {
fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
if (grab_actor == NULL) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK38_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_GRAB_PUT_e) {
dComIfGp_evmng_cutEnd(mStaffIdx);
return true;
} else {
@@ -686,7 +686,7 @@ BOOL daPy_lk_c::procGrabPut() {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) {
grab_actor->speedF = 0.0f;
freeGrabItem();
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK38_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_GRAB_PUT_e) {
dComIfGp_evmng_cutEnd(mStaffIdx);
} else {
checkNextMode(0);
src/d/actor/d_a_player_main.cpp
+73 -73
View File
@@ -1369,8 +1369,8 @@ BOOL daPy_lk_c::checkUpperReadyThrowAnime() const {
BOOL daPy_lk_c::checkNoCollisionCorret() {
if (checkModeFlg(ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_LADDER | ModeFlg_CAUGHT) ||
mDemo.getDemoType() == 1 ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0A_e ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK1E_e ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_OPEN_TREASURE_e ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_030_e ||
checkResetFlg0(daPyRFlg0_UNK1000) ||
eventInfo.checkCommandDoor() ||
mCurProc == daPyProc_VERTICAL_JUMP_e ||
@@ -2272,7 +2272,7 @@ void daPy_lk_c::setNormalSpeedF(f32 param_1, f32 param_2, f32 param_3, f32 param
} else {
dVar10 = mStickDistance * (mMaxNormalSpeed * mStickDistance);
}
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e || getSlidePolygon() != NULL) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KEEP_e || getSlidePolygon() != NULL) {
return;
}
if (mAcch.ChkWallHit()) {
@@ -2398,7 +2398,7 @@ void daPy_lk_c::posMoveFromFootPos() {
speed.x = f1 * cM_ssin(current.angle.y);
speed.z = f1 * cM_scos(current.angle.y);
} else if (mCurProc != daPyProc_CUT_ROLL_e || !dComIfGp_event_runCheck() ||
mDemo.getDemoType() != 0 || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2B_e)
mDemo.getDemoType() != 0 || mDemo.getDemoMode() == daPy_demo_c::DEMO_CUT_ROLL_e)
{
speed.x = speedF * cM_ssin(current.angle.y);
speed.z = speedF * cM_scos(current.angle.y);
@@ -2909,7 +2909,7 @@ BOOL daPy_lk_c::checkAtnWaitAnime() {
fopAcM_GetName(mpAttnActorLockOn) == PROC_BOOMERANG
)
) ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e
mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e
) {
return true;
}
@@ -3246,7 +3246,7 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) {
f32 f2 = cM_ssin(iVar6);
f32 fVar4 = cM_scos(iVar6);
u8 uVar1 = mDirection;
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e) {
if (mDemo.getParam0() == 1) {
mDirection = DIR_LEFT;
} else {
@@ -4383,7 +4383,7 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
BOOL r24 = checkAttentionLock() ||
(mActorKeepThrow.getActor() != NULL && mpAttnActorLockOn == mActorKeepThrow.getActor()) ||
checkUpperReadyThrowAnime() ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e;
mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e;
if (r24) {
mMaxNormalSpeed = daPy_HIO_atnMove_c0::m.field_0xC;
@@ -4412,7 +4412,7 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
r3 = checkNextHookshotMode();
} else if (checkRopeAnime()) {
r3 = checkNextRopeMode();
} else if (mpAttnActorLockOn != NULL || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e)) {
} else if (mpAttnActorLockOn != NULL || (mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e)) {
if (std::abs(mVelocity) <= 0.001f) {
r3 = procAtnActorWait_init();
} else {
@@ -5361,10 +5361,10 @@ BOOL daPy_lk_c::changeDemoProc() {
}
u32 demo_mode = mDemo.getDemoMode();
JUT_ASSERT(9342, (demo_mode < daPy_demo_c::DEMO_LAST_e) || (demo_mode == daPy_demo_c::DEMO_NEW_ANM0_e));
if (demo_mode != daPy_demo_c::DEMO_NEW_ANM0_e && demo_mode != daPy_demo_c::DEMO_UNK1E_e &&
demo_mode != daPy_demo_c::DEMO_UNK09_e && demo_mode != daPy_demo_c::DEMO_UNK11_e &&
demo_mode != daPy_demo_c::DEMO_UNK40_e && demo_mode != daPy_demo_c::DEMO_UNK04_e &&
demo_mode != daPy_demo_c::DEMO_UNK2F_e && demo_mode != daPy_demo_c::DEMO_UNK3E_e)
if (demo_mode != daPy_demo_c::DEMO_NEW_ANM0_e && demo_mode != daPy_demo_c::DEMO_UNK_030_e &&
demo_mode != daPy_demo_c::DEMO_LDAM_e && demo_mode != daPy_demo_c::DEMO_PFALL_e &&
demo_mode != daPy_demo_c::DEMO_SFALL_e && demo_mode != daPy_demo_c::DEMO_INIT_WAIT_e &&
demo_mode != daPy_demo_c::DEMO_VOLCANO_e && demo_mode != daPy_demo_c::DEMO_S_WARP_e)
{
if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && !dComIfGp_checkPlayerStatus0(0, daPyStts0_SWIM_e))
{
@@ -5381,7 +5381,7 @@ BOOL daPy_lk_c::changeDemoProc() {
onNoResetFlg0(daPyFlg0_UNK100000);
return (this->*mDemoProcInitFuncTable[demo_mode])();
}
if (demo_mode == daPy_demo_c::DEMO_UNK04_e) {
if (demo_mode == daPy_demo_c::DEMO_INIT_WAIT_e) {
int var_r28;
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
return true;
@@ -5392,7 +5392,7 @@ BOOL daPy_lk_c::changeDemoProc() {
}
return var_r28;
}
if ((demo_mode == daPy_demo_c::DEMO_UNK06_e) || demo_mode == daPy_demo_c::DEMO_UNK08_e) {
if ((demo_mode == daPy_demo_c::DEMO_N_TALK_e) || demo_mode == daPy_demo_c::DEMO_E_TALK_e) {
if (checkModeFlg(ModeFlg_04000000)) {
return true;
}
@@ -5412,7 +5412,7 @@ BOOL daPy_lk_c::changeDemoProc() {
} else {
return dProcTalk_init();
}
} else if (demo_mode == daPy_demo_c::DEMO_UNK09_e) {
} else if (demo_mode == daPy_demo_c::DEMO_LDAM_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
if ((mCurProc == daPyProc_LARGE_DAMAGE_UP_e) || mCurProc == daPyProc_LARGE_DAMAGE_WALL_e) {
return false;
@@ -5423,24 +5423,24 @@ BOOL daPy_lk_c::changeDemoProc() {
} else {
return procLargeDamage_init(-3, 1, 0, 0);
}
} else if (demo_mode == daPy_demo_c::DEMO_UNK1B_e) {
} else if (demo_mode == daPy_demo_c::DEMO_UNK_027_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
return procLargeDamageUp_init(-3, 1, 0, 0);
} else if (demo_mode == daPy_demo_c::DEMO_UNK10_e) {
} else if (demo_mode == daPy_demo_c::DEMO_BJUMP_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
if (mCurProc == daPyProc_BACK_JUMP_LAND_e) {
return false;
}
return procBackJump_init();
} else if (demo_mode == daPy_demo_c::DEMO_UNK11_e) {
} else if (demo_mode == daPy_demo_c::DEMO_PFALL_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54);
} else if (demo_mode == daPy_demo_c::DEMO_UNK40_e) {
} else if (demo_mode == daPy_demo_c::DEMO_SFALL_e) {
if (mCurProc == daPyProc_LAND_e) {
return true;
}
return procSlowFall_init();
} else if (demo_mode == daPy_demo_c::DEMO_UNK1F_e) {
} else if (demo_mode == daPy_demo_c::DEMO_LWAIT_e) {
if ((!checkModeFlg(
ModeFlg_MIDAIR | ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | ModeFlg_SWIM |
ModeFlg_LADDER | ModeFlg_04000000 | ModeFlg_CAUGHT
@@ -5455,13 +5455,13 @@ BOOL daPy_lk_c::changeDemoProc() {
dComIfGp_evmng_cutEnd(mStaffIdx);
return true;
}
} else if (demo_mode == daPy_demo_c::DEMO_UNK22_e) {
} else if (demo_mode == daPy_demo_c::DEMO_TACT_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
if (mCurProc == daPyProc_TACT_PLAY_e || mCurProc == daPyProc_TACT_PLAY_END_e) {
return true;
}
return procTactWait_init(mDemo.getParam0());
} else if (demo_mode == daPy_demo_c::DEMO_UNK33_e) {
} else if (demo_mode == daPy_demo_c::DEMO_UNK_051_e) {
fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
if (grab_actor == NULL || grab_actor != dComIfGp_getCb1Player()) {
deleteEquipItem(FALSE);
@@ -5470,14 +5470,14 @@ BOOL daPy_lk_c::changeDemoProc() {
fopAcM_setCarryNow(mActorKeepGrab.getActor(), TRUE);
}
return procGrabWait_init();
} else if (demo_mode == daPy_demo_c::DEMO_UNK3D_e) {
} else if (demo_mode == daPy_demo_c::DEMO_BO_OPEN_e) {
onNoResetFlg0(daPyFlg0_UNK100000);
return procBottleOpen_init(dComIfGp_event_getPreItemNo());
} else if (((checkNoResetFlg0(daPyFlg0_UNK100000) || mCurProc == daPyProc_SUBJECTIVITY_e) ||
checkUpperReadyThrowAnime()) &&
(demo_mode == daPy_demo_c::DEMO_UNK2A_e || demo_mode == daPy_demo_c::DEMO_UNK01_e ||
demo_mode == daPy_demo_c::DEMO_UNK02_e || demo_mode == daPy_demo_c::DEMO_UNK03_e ||
(demo_mode == daPy_demo_c::DEMO_UNK17_e || demo_mode == daPy_demo_c::DEMO_UNK12_e)))
(demo_mode == daPy_demo_c::DEMO_KM_WAIT_e || demo_mode == daPy_demo_c::DEMO_N_WAIT_e ||
demo_mode == daPy_demo_c::DEMO_N_WALK_e || demo_mode == daPy_demo_c::DEMO_N_DASH_e ||
(demo_mode == daPy_demo_c::DEMO_A_WAIT_e || demo_mode == daPy_demo_c::DEMO_UNK_018_e)))
{
offNoResetFlg0(daPyFlg0_UNK100000);
if (checkUpperReadyThrowAnime()) {
@@ -5562,7 +5562,7 @@ BOOL daPy_lk_c::checkRestHPAnime() {
if (!checkPlayerGuard() && checkNoUpperAnime() && mpAttnActorLockOn == NULL &&
((mDemo.getDemoType() == 0 && !checkModeFlg(ModeFlg_IN_SHIP) &&
dComIfGs_getLife() <= daPy_HIO_move_c0::m.field_0xE) ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK12_e))
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_018_e))
{
return true;
}
@@ -5988,7 +5988,7 @@ BOOL daPy_lk_c::procControllWait() {
/* 80112E60-80113044 .text procWait_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procWait_init() {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2A_e && m_tex_scroll_heap.field_0x6 == 0xFFFF) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KM_WAIT_e && m_tex_scroll_heap.field_0x6 == 0xFFFF) {
changeTextureAnime(LKANM_BTP_TMABACC, LKANM_BTK_TEUR, -1);
voiceStart(38);
m34D0 = 0x14;
@@ -6079,7 +6079,7 @@ BOOL daPy_lk_c::procWait() {
m35A0 = 0.005f * (s16)(shape_angle.y - sVar2);
setBlendMoveAnime(-1.0f);
}
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2A_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KM_WAIT_e) {
if (m34D0 != 0) {
m34D0--;
} else if (cM_rnd() < 0.05f) {
@@ -6164,7 +6164,7 @@ BOOL daPy_lk_c::procMove_init() {
BOOL daPy_lk_c::procMove() {
setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
if (!checkNextMode(0) && !changeFrontWallTypeProc() && !checkIceSlipFall()) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK02_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_N_WALK_e) {
// Fakematch? Regalloc doesn't match unless all three of these vars are given temps.
f32 vel = mVelocity;
f32 temp1 = mMaxNormalSpeed;
@@ -6558,7 +6558,7 @@ BOOL daPy_lk_c::procWaitTurn() {
}
if (sVar1 == 0) {
if (dComIfGp_event_runCheck()) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK05_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_WAIT_TURN_e) {
dComIfGp_evmng_cutEnd(mStaffIdx);
} else {
checkNextMode(0);
@@ -7205,7 +7205,7 @@ BOOL daPy_lk_c::procLand_init(f32 param_1, int param_2) {
BOOL daPy_lk_c::procLand() {
resetFootEffect();
if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK40_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_SFALL_e) {
dComIfGp_evmng_cutEnd(mStaffIdx);
} else {
checkNextMode(0);
@@ -7281,7 +7281,7 @@ BOOL daPy_lk_c::procFall_init(int param_1, f32 param_2) {
BOOL bVar1;
BOOL bVar2;
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK11_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_PFALL_e) {
mAcch.SetGrndNone();
mAcch.OnLineCheckNone();
}
@@ -7617,7 +7617,7 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16
return false;
}
commonProcInit(daPyProc_LARGE_DAMAGE_e);
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK09_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_LDAM_e) {
mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0;
} else {
mDamageWaitTimer = 0;
@@ -8985,7 +8985,7 @@ void daPy_lk_c::setNeckAngle() {
sp18 = &(r24->eyePos);
r28 = true;
} else if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000)) {
if (!dComIfGp_event_runCheck() || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK39_e) {
if (!dComIfGp_event_runCheck() || mDemo.getDemoMode() == daPy_demo_c::DEMO_RD_STOP_e) {
if (dComIfGp_att_getLookTarget() != NULL) {
sp18 = &dComIfGp_att_getLookTarget()->eyePos;
r28 = true;
@@ -9025,10 +9025,10 @@ void daPy_lk_c::setNeckAngle() {
u32 mode = mDemo.getDemoMode();
if (
mCurProc == daPyProc_DEMO_LOOK_WAIT_e ||
mode == daPy_demo_c::DEMO_UNK04_e ||
mode == daPy_demo_c::DEMO_UNK01_e ||
mode == daPy_demo_c::DEMO_UNK02_e ||
mode == daPy_demo_c::DEMO_UNK03_e
mode == daPy_demo_c::DEMO_INIT_WAIT_e ||
mode == daPy_demo_c::DEMO_N_WAIT_e ||
mode == daPy_demo_c::DEMO_N_WALK_e ||
mode == daPy_demo_c::DEMO_N_DASH_e
) {
r24 = getDemoLookActor();
if (r24 != NULL) {
@@ -10264,7 +10264,7 @@ void daPy_lk_c::setDemoData() {
dDemo_actor_c* demo_actor_p = dComIfGp_demo_getActor(demoActorID);
cXyz* pos_p = NULL;
s16 angle;
u32 demo_mode = daPy_demo_c::DEMO_UNK01_e;
u32 demo_mode = daPy_demo_c::DEMO_N_WAIT_e;
int* prm0_p = NULL;
int* prm1_p = NULL;
if (!dComIfGp_event_runCheck()) {
@@ -10346,9 +10346,9 @@ void daPy_lk_c::setDemoData() {
if (
mDemo.getDemoType() != 4 &&
(
demo_mode == daPy_demo_c::DEMO_UNK01_e ||
demo_mode == daPy_demo_c::DEMO_UNK2A_e ||
demo_mode == daPy_demo_c::DEMO_UNK17_e
demo_mode == daPy_demo_c::DEMO_N_WAIT_e ||
demo_mode == daPy_demo_c::DEMO_KM_WAIT_e ||
demo_mode == daPy_demo_c::DEMO_A_WAIT_e
)
) {
if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) {
@@ -10363,7 +10363,7 @@ void daPy_lk_c::setDemoData() {
int* angle_p = dComIfGp_evmng_getMyIntegerP(mStaffIdx, "angle");
if (angle_p != NULL) {
angle = *angle_p;
} else if (demo_mode == daPy_demo_c::DEMO_UNK05_e) {
} else if (demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) {
angle = mDemo.getMoveAngle();
} else {
angle = shape_angle.y;
@@ -10389,11 +10389,11 @@ void daPy_lk_c::setDemoData() {
}
}
}
if ((demo_mode == daPy_demo_c::DEMO_UNK27_e) && dComIfGp_getShipActor() == NULL) {
demo_mode = daPy_demo_c::DEMO_UNK01_e;
if ((demo_mode == daPy_demo_c::DEMO_SHIP_e) && dComIfGp_getShipActor() == NULL) {
demo_mode = daPy_demo_c::DEMO_N_WAIT_e;
}
if (mDemo.getDemoType() == 4) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KEEP_e) {
if (mDemo.getTimer() != 0) {
mDemo.decTimer();
cXyz sp5C = current.pos - home.pos;
@@ -10418,13 +10418,13 @@ void daPy_lk_c::setDemoData() {
} else {
mDemo.setParam1(0);
}
if ((demo_mode == daPy_demo_c::DEMO_UNK04_e) || (demo_mode == daPy_demo_c::DEMO_UNK2C_e)) {
if ((demo_mode == daPy_demo_c::DEMO_INIT_WAIT_e) || (demo_mode == daPy_demo_c::DEMO_POS_INIT_e)) {
mVelocity = 0.0f;
speedF = 0.0f;
mStts.ClrCcMove();
setPlayerPosAndAngle(pos_p, angle);
mDemo.setMoveAngle(angle);
if (demo_mode == daPy_demo_c::DEMO_UNK04_e && mDemo.getParam0() != 0) {
if (demo_mode == daPy_demo_c::DEMO_INIT_WAIT_e && mDemo.getParam0() != 0) {
deleteEquipItem(FALSE);
if (mDemo.getParam0() == 1 && checkSwordEquip()) {
#if VERSION == VERSION_DEMO
@@ -10447,45 +10447,45 @@ void daPy_lk_c::setDemoData() {
dComIfGp_getShipActor()->initStartPos(&current.pos, shape_angle.y);
}
}
} else if (demo_mode == daPy_demo_c::DEMO_UNK2B_e) {
} else if (demo_mode == daPy_demo_c::DEMO_CUT_ROLL_e) {
cXyz sp50 = *pos_p - current.pos;
s16 r24 = current.angle.y;
current.angle.y = cM_atan2s(sp50.x, sp50.z);
shape_angle.y = current.angle.y;
m34EC -= (s16)(current.angle.y - r24);
} else if ((demo_mode == daPy_demo_c::DEMO_UNK02_e) || (demo_mode == daPy_demo_c::DEMO_UNK03_e)) {
} else if ((demo_mode == daPy_demo_c::DEMO_N_WALK_e) || (demo_mode == daPy_demo_c::DEMO_N_DASH_e)) {
cXyz sp44 = *pos_p - current.pos;
if (std::abs(mVelocity) / mMaxNormalSpeed < daPy_HIO_move_c0::m.field_0x2C) {
demo_mode = daPy_demo_c::DEMO_UNK02_e;
demo_mode = daPy_demo_c::DEMO_N_WALK_e;
}
f32 dVar22 = sp44.abs2XZ();
if (dVar22 < 100.0f || (dVar22 < 2500.0f && std::abs(mVelocity) < 0.001f)) {
demo_mode = daPy_demo_c::DEMO_UNK01_e;
demo_mode = daPy_demo_c::DEMO_N_WAIT_e;
mVelocity = 0.0f;
} else if ((demo_mode == daPy_demo_c::DEMO_UNK02_e && dVar22 < 400.0f) || dVar22 < 2500.0f) {
} else if ((demo_mode == daPy_demo_c::DEMO_N_WALK_e && dVar22 < 400.0f) || dVar22 < 2500.0f) {
mDemo.setStick(0.0f);
}
mDemo.setMoveAngle(cM_atan2s(sp44.x, sp44.z));
} else if ((demo_mode == daPy_demo_c::DEMO_UNK05_e) || (demo_mode == daPy_demo_c::DEMO_UNK18_e)) {
} else if ((demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) || (demo_mode == daPy_demo_c::DEMO_SURPRISED_e)) {
mDemo.setMoveAngle(angle);
}
mDemo.setDemoMode(demo_mode);
} else if (mDemo.getDemoType() != 3) {
mDemo.setDemoMode(demo_mode);
}
if ((checkModeFlg(ModeFlg_00080000) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK06_e)) ||
(mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK08_e))
if ((checkModeFlg(ModeFlg_00080000) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_N_TALK_e)) ||
(mDemo.getDemoMode() == daPy_demo_c::DEMO_E_TALK_e))
{
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
} else {
dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK10_e);
}
if (mStaffIdx != -1 && (demo_mode == daPy_demo_c::DEMO_UNK01_e || demo_mode == daPy_demo_c::DEMO_UNK04_e ||
demo_mode == daPy_demo_c::DEMO_UNK17_e || demo_mode == daPy_demo_c::DEMO_UNK0E_e ||
demo_mode == daPy_demo_c::DEMO_UNK11_e || demo_mode == daPy_demo_c::DEMO_UNK12_e ||
demo_mode == daPy_demo_c::DEMO_UNK2A_e || demo_mode == daPy_demo_c::DEMO_UNK2B_e ||
demo_mode == daPy_demo_c::DEMO_UNK2C_e || demo_mode == daPy_demo_c::DEMO_UNK27_e ||
demo_mode == daPy_demo_c::DEMO_UNK33_e))
if (mStaffIdx != -1 && (demo_mode == daPy_demo_c::DEMO_N_WAIT_e || demo_mode == daPy_demo_c::DEMO_INIT_WAIT_e ||
demo_mode == daPy_demo_c::DEMO_A_WAIT_e || demo_mode == daPy_demo_c::DEMO_KEEP_e ||
demo_mode == daPy_demo_c::DEMO_PFALL_e || demo_mode == daPy_demo_c::DEMO_UNK_018_e ||
demo_mode == daPy_demo_c::DEMO_KM_WAIT_e || demo_mode == daPy_demo_c::DEMO_CUT_ROLL_e ||
demo_mode == daPy_demo_c::DEMO_POS_INIT_e || demo_mode == daPy_demo_c::DEMO_SHIP_e ||
demo_mode == daPy_demo_c::DEMO_UNK_051_e))
{
dComIfGp_evmng_cutEnd(mStaffIdx);
}
@@ -10500,7 +10500,7 @@ void daPy_lk_c::setStickData() {
mStickDistance = 0.0f;
m34E8 = 0;
} else {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e) {
mStickDistance = g_mDoCPd_cpadInfo[0].mMainStickValue;
m34DC = g_mDoCPd_cpadInfo[0].mMainStickAngle + 0x8000;
m34E8 = m34DC + dCam_getControledAngleY(dComIfGp_getCamera(mCameraInfoIdx));
@@ -10512,8 +10512,8 @@ void daPy_lk_c::setStickData() {
!dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e) &&
mCurProc != daPyProc_NOT_USE_e && mCurProc != daPyProc_BOTTLE_GET_e
) {
if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK02_e) ||
(mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK03_e))
if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_N_WALK_e) ||
(mDemo.getDemoMode() == daPy_demo_c::DEMO_N_DASH_e))
{
if (dComIfGp_demo_getActor(demoActorID) != NULL) {
mStickDistance = 1.0f;
@@ -10524,7 +10524,7 @@ void daPy_lk_c::setStickData() {
mStickDistance = 0.0f;
}
m34E8 = mDemo.getMoveAngle();
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KEEP_e) {
mItemButton = m34CA;
}
} else if (fopOvlpM_IsPeek() == 1) {
@@ -10802,12 +10802,12 @@ void daPy_lk_c::checkFallCode() {
if (!eventInfo.checkCommandDoor()) {
mDemo.setDemoType(3);
if (m3580 == 5) {
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK11_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_PFALL_e);
} else if ((checkModeFlg(ModeFlg_SWIM) || m34C3 == 1) || m34C3 == 4) {
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK0E_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_KEEP_e);
mVelocity *= 0.75f;
} else {
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK02_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_N_WALK_e);
}
local_44 = current.pos - old.pos;
dVar5 = local_44.abs();
@@ -10826,7 +10826,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
if (!checkNoResetFlg0(daPyFlg0_UNK4000) && (i_point != 0 || dComIfGp_event_compulsory(this))) {
mDemo.setOriginalDemoType();
if (i_point == 0) {
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK01_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
}
onNoResetFlg0(daPyFlg0_UNK4000);
changePlayer(this);
@@ -12510,7 +12510,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
if (mEventIdx == 0xFF) {
mVelocity = dComIfGs_getLastSceneSpeedF();
mDemo.setDemoType(4);
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK0E_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_KEEP_e);
mDemo.setMoveAngle(current.angle.y);
mDemo.setTimer(0x23);
if (changeSwimProc()) {
@@ -12557,7 +12557,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
procSlowFall_init();
} else if (startMode == 0xe) {
mDemo.setDemoType(4);
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK01_e);
mDemo.setDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
procWait_init();
csXyz auStack_58(0, 0, 0);
fpc_ProcID fVar11 = fopAcM_createChild(PROC_FM, fopAcM_GetID(this), 0, &current.pos,
src/d/actor/d_a_player_ship.inc
+5 -5
View File
@@ -905,7 +905,7 @@ BOOL daPy_lk_c::procShipBow_init() {
deleteEquipItem(TRUE);
gravity = 0.0f;
ship->setPaddleMove();
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e) {
mEquipItem = dItem_BOW_e;
} else {
mEquipItem = dComIfGp_getSelectItem(mReadyItemBtn);
@@ -917,7 +917,7 @@ BOOL daPy_lk_c::procShipBow_init() {
setShipRidePos(0);
m34D4 = ship->shape_angle.y;
m34DA = 0;
if (checkAttentionLock() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
if (checkAttentionLock() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_068_e) {
mProcVar0.m3570 = 1;
} else {
mProcVar0.m3570 = 0;
@@ -928,11 +928,11 @@ BOOL daPy_lk_c::procShipBow_init() {
/* 80142084-80142250 .text procShipBow__9daPy_lk_cFv */
BOOL daPy_lk_c::procShipBow() {
if ((mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) && changeShipEndProc()) {
if ((mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_068_e) && changeShipEndProc()) {
return true;
}
setShipRidePos(0);
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_068_e) {
dComIfGp_setDoStatus(dActStts_RETURN_e);
if (doTrigger() || ((!checkAttentionLock() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) {
procShipPaddle_init();
@@ -946,7 +946,7 @@ BOOL daPy_lk_c::procShipBow() {
if (checkBowWaitAnime()) {
setShipAttentionAnmSpeed(1.0f);
}
if (checkAttentionLock() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e)) {
if (checkAttentionLock() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_068_e)) {
setShipAttnetionBodyAngle();
mProcVar0.m3570 = 1;
} else {
src/d/actor/d_a_player_swim.inc
+1 -1
View File
@@ -113,7 +113,7 @@ BOOL daPy_lk_c::changeSwimProc() {
BOOL res;
cXyz local_18;
if (checkNoResetFlg0(daPyFlg0_UNK80) && !checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_SWIM) && !checkNoControll() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK11_e && m35D0 - current.pos.y > daPy_HIO_swim_c0::m.field_0x24) {
if (checkNoResetFlg0(daPyFlg0_UNK80) && !checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_SWIM) && !checkNoControll() && mDemo.getDemoMode() != daPy_demo_c::DEMO_PFALL_e && m35D0 - current.pos.y > daPy_HIO_swim_c0::m.field_0x24) {
dComIfGp_setItemTimeCount(900);
dComIfGp_setItemTimeMax(900);
src/d/actor/d_a_player_sword.inc
+3 -3
View File
@@ -1540,7 +1540,7 @@ BOOL daPy_lk_c::procCutRoll() {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
uVar1 = current.angle.y;
if (mAcch.ChkWallHit() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK2B_e)) {
if (mAcch.ChkWallHit() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_CUT_ROLL_e)) {
fVar2 = 25.0f + mAcchCir[0].GetWallR();
local_48.set(current.pos.x, current.pos.y + mAcchCir[0].GetWallH(), current.pos.z);
f32 cos = cM_scos(uVar1);
@@ -1568,7 +1568,7 @@ BOOL daPy_lk_c::procCutRoll() {
}
sVar3 = current.angle.y - uVar1;
if (dComIfGp_event_runCheck() != 0) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK2B_e) {
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_CUT_ROLL_e) {
m34D0 = 0;
} else {
m34D0 = 5;
@@ -1587,7 +1587,7 @@ BOOL daPy_lk_c::procCutRoll() {
} else if (cLib_addCalc(&mVelocity, 0.0f, 0.1f, 2.5f, 1.0f) < 0.5f) {
shape_angle.y = shape_angle.y + m34EC;
current.angle.y = shape_angle.y;
if (dComIfGp_event_runCheck() != 0 && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK2B_e)) {
if (dComIfGp_event_runCheck() != 0 && (mDemo.getDemoMode() != daPy_demo_c::DEMO_CUT_ROLL_e)) {
procWait_init();
} else {
procCutRollEnd_init();
src/d/actor/d_a_ship.cpp
+1 -1
View File
@@ -852,7 +852,7 @@ f32 daShip_c::getWaterY() {
waterY = m03F4;
#else
daPy_lk_c* link = daPy_getPlayerLinkActorClass();
if (link && link->mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e ) {
if (link && link->mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_068_e ) {
waterY = 0.0f;
}
else {