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

d_a_player_main cleanup and inlines

Browse Source
This commit is contained in:
LagoLunatic
2025-06-15 13:59:16 -04:00
parent a15a72f209
commit 0146d0b91f
29 changed files with 691 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+9 -6
View File
@@ -1785,7 +1785,6 @@ public:
mCurProc == daPyProc_GRAB_THROW_e;
}
BOOL checkNoControll() const { return dComIfGp_getPlayer(0) != this; }
void clearDamageWait() {}
void exchangeGrabActor(fopAc_ac_c* actor) { mActorKeepGrab.setData(actor); }
void getDekuLeafWindPos() const {}
void getBoomerangCatchPos() const {}
@@ -1808,11 +1807,13 @@ public:
int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; }
static int getStartModeFromParam(u32 param) { return (param >> 0x0C) & 0xF; }
int getStartEvent() { return (fopAcM_GetParam(this) >> 0x18) & 0xFF; }
void onModeFlg(u32 flag) { mModeFlg |= flag; }
void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
u32 checkModeFlg(u32 flag) const { return mModeFlg & flag; }
void clearDamageWait() { offModeFlg(ModeFlg_DAMAGE); }
request_of_phase_process_class* getPhase() { return &mPhase; }
@@ -1842,8 +1843,13 @@ public:
BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != 0; }
void checkSpecialDemoMode() const {}
void checkAttentionLock() {}
f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) {
return param_0 + (mStickDistance * (param_1 - param_0));
}
void seStartSystem(u32 i_seNum) { mDoAud_seStart(i_seNum); }
BOOL checkAttentionLock() { return mpAttention->Lockon(); }
void checkBoomerangRock() {}
void checkBothItemEquipAnime() const {}
void checkCrawlWaterIn() {}
void checkDoubleItemEquipAnime() const {}
@@ -1854,12 +1860,9 @@ public:
void checkRopeThrowAnime() const {}
void checkShieldEquip() const {}
void checkSwordEquipAnime() const {}
void getAnmSpeedStickRate(f32, f32) {}
void getBombWaterPillarBrk() {} // mpGwp00BrkData?
void getBombWaterPillarBtk() {} // mpGwp00BtkData?
void getStartModeFromParam(u32) {}
void getTactLeftHandPos() const {}
void seStartSystem(u32) {}
void setFootEffectPosType(u8) {}
void setSpeedAndAngleBoomerang() {}
void setSpeedAndAngleBow() {}
@@ -2180,7 +2183,7 @@ public:
/* 0x35A4 */ f32 m35A4;
/* 0x35A8 */ f32 m35A8;
/* 0x35AC */ f32 m35AC;
/* 0x35B0 */ f32 mStickDistance; //
/* 0x35B0 */ f32 mStickDistance;
/* 0x35B4 */ f32 m35B4;
/* 0x35B8 */ f32 m35B8;
/* 0x35BC */ f32 mVelocity;
include/m_Do/m_Do_audio.h
+63 -22
View File
@@ -47,7 +47,6 @@ extern mDoAud_zelAudio_c g_mDoAud_zelAudio;
void mDoAud_setSceneName(const char*, s32, s32);
void mDoAud_Execute();
BOOL mDoAud_isUsedHeapForStreamBuffer();
int mDoAud_load1stDynamicWave();
int mDoAud_getTactDirection(int stick, int ret);
extern JKRSolidHeap* g_mDoAud_audioHeap;
@@ -64,7 +63,9 @@ inline void mDoAud_subBgmStop() {
mDoAud_zelAudio_c::getInterface()->subBgmStop();
}
inline void mDoAud_changeSubBgmStatus(u32 status) {
inline void mDoAud_changeBgmStatus(s32 status) {}
inline void mDoAud_changeSubBgmStatus(s32 status) {
mDoAud_zelAudio_c::getInterface()->changeSubBgmStatus(status);
}
@@ -92,7 +93,27 @@ inline int mDoAud_checkPlayingSubBgmFlag() {
return mDoAud_zelAudio_c::getInterface()->checkPlayingSubBgmFlag();
}
inline void mDoAud_prepareLandingDemo(u32 idx) {
inline s32 mDoAud_checkFirstWaves() {
return mDoAud_zelAudio_c::getInterface()->checkFirstWaves();
}
inline void mDoAud_loadStaticWaves() {
mDoAud_zelAudio_c::getInterface()->loadStaticWaves();
}
int mDoAud_load1stDynamicWave();
inline void mDoAud_load2ndDynamicWave() {
mDoAud_zelAudio_c::getInterface()->load2ndDynamicWave();
}
inline void mDoAud_check1stDynamicWave() {}
inline bool mDoAud_checkAllWaveLoadStatus() {
return mDoAud_zelAudio_c::getInterface()->checkAllWaveLoadStatus();
}
inline void mDoAud_prepareLandingDemo(s32 idx) {
mDoAud_zelAudio_c::getInterface()->prepareLandingDemo(idx);
}
@@ -108,10 +129,6 @@ inline void mDoAud_sceneBgmStart() {
mDoAud_zelAudio_c::getInterface()->sceneBgmStart();
}
inline void mDoAud_load2ndDynamicWave() {
mDoAud_zelAudio_c::getInterface()->load2ndDynamicWave();
}
inline void mDoAud_taktModeMute() {
mDoAud_zelAudio_c::getInterface()->taktModeMute();
}
@@ -131,10 +148,6 @@ inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2, s8 i_reverb)
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_messageSePlay(u16 i_seNum, Vec* i_sePos = NULL, s8 i_reverb = 0) {
mDoAud_zelAudio_c::getInterface()->messageSePlay(i_seNum, i_sePos, i_reverb);
}
inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
@@ -147,6 +160,10 @@ inline void mDoAud_seStart(u32 i_seNum) {
mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_messageSePlay(u16 i_seNum, Vec* i_sePos = NULL, s8 i_reverb = 0) {
mDoAud_zelAudio_c::getInterface()->messageSePlay(i_seNum, i_sePos, i_reverb);
}
inline void mDoAud_bgmSetSwordUsing(s32 param_1) {
mDoAud_zelAudio_c::getInterface()->bgmSetSwordUsing(param_1);
}
@@ -155,10 +172,18 @@ inline void mDoAud_seStop(u32 i_seNum, s32 param_2) {
mDoAud_zelAudio_c::getInterface()->seStop(i_seNum, param_2);
}
inline void mDoAud_seStop(u32 i_seNum) {
mDoAud_zelAudio_c::getInterface()->seStop(i_seNum, 0);
}
inline void mDoAud_seStopActor(Vec* param_1, u32 param_2) {
mDoAud_zelAudio_c::getInterface()->seStopActor(param_1, param_2);
}
inline void mDoAud_seStopActor(Vec* param_0) {
mDoAud_zelAudio_c::getInterface()->seStopActor(param_0, -1);
}
inline void mDoAud_seDeleteObject(Vec* i_sePos) {
mDoAud_zelAudio_c::getInterface()->seDeleteObject(i_sePos);
}
@@ -171,16 +196,16 @@ inline void mDoAud_linkVoiceStart(u32 param_0, Vec* i_sePos, u8 param_3, s8 para
mDoAud_zelAudio_c::getInterface()->linkVoiceStart(param_0, i_sePos, param_3, param_4);
}
inline void mDoAud_getCameraMapInfo(u32 param_0) {
mDoAud_zelAudio_c::getInterface()->getCameraMapInfo(param_0);
inline void mDoAud_setLinkSwordType(s32 param_0, s32 param_1) {
mDoAud_zelAudio_c::getInterface()->setLinkSwordType(param_0, param_1);
}
inline void mDoAud_setCameraGroupInfo(u8 param_0) {
mDoAud_zelAudio_c::getInterface()->setCameraGroupInfo(param_0);
inline void mDoAud_setLinkShieldType(s32 param_0, s32 param_1) {
mDoAud_zelAudio_c::getInterface()->setLinkShieldType(param_0, param_1);
}
inline void mDoAud_getCameraInfo(Vec* param_0, MtxP param_1, u32 param_2) {
mDoAud_zelAudio_c::getInterface()->getCameraInfo(param_0, param_1, param_2);
inline void mDoAud_setLinkBootsType(s32 param_0) {
mDoAud_zelAudio_c::getInterface()->setLinkBootsType(param_0);
}
inline void mDoAud_setLinkGroupInfo(u8 param_0) {
@@ -195,11 +220,27 @@ inline void mDoAud_setLinkHp(s32 param_0, s32 param_1) {
mDoAud_zelAudio_c::getInterface()->setLinkHp(param_0, param_1);
}
inline void mDoAud_bgmNowKaitengiri() {
mDoAud_zelAudio_c::getInterface()->bgmNowKaitengiri();
}
inline void mDoAud_getCameraMapInfo(u32 param_0) {
mDoAud_zelAudio_c::getInterface()->getCameraMapInfo(param_0);
}
inline void mDoAud_setCameraGroupInfo(u8 param_0) {
mDoAud_zelAudio_c::getInterface()->setCameraGroupInfo(param_0);
}
inline void mDoAud_getCameraInfo(Vec* param_0, MtxP param_1, u32 param_2) {
mDoAud_zelAudio_c::getInterface()->getCameraInfo(param_0, param_1, param_2);
}
inline void mDoAud_setShipSailState(s32 state) {
mDoAud_zelAudio_c::getInterface()->setShipSailState(state);
}
inline void mDoAud_shipCruiseSePlay(Vec* i_sePos, f32 param_1) {
inline void mDoAud_shipCruiseSePlay(cXyz* i_sePos, f32 param_1) {
mDoAud_zelAudio_c::getInterface()->shipCruiseSePlay(i_sePos, param_1);
}
@@ -337,10 +378,6 @@ inline void mDoAud_bgmNowBattle(f32 distance) {
mDoAud_zelAudio_c::getInterface()->bgmNowBattle(distance);
}
inline bool mDoAud_checkAllWaveLoadStatus() {
return mDoAud_zelAudio_c::getInterface()->checkAllWaveLoadStatus();
}
inline void mDoAud_initSeaEnvPos() {
mDoAud_zelAudio_c::getInterface()->initSeaEnvPos();
}
@@ -393,4 +430,8 @@ inline void mDoAud_talkOut() {
mDoAud_zelAudio_c::getInterface()->talkOut();
}
inline void mDoAud_checkSePlaying(u32 param_0) {}
inline void mDoAud_heartGaugeOn() {}
inline void mDoAud_resetRecover() {}
#endif /* M_DO_AUDIO_H */
src/JAZelAudio/JAIZelBasic.cpp
+1 -1
View File
@@ -1577,7 +1577,7 @@ void JAIZelBasic::stSkyCloistersProcess() {
u32 JAIZelBasic::getRandomU32(u32 param_1) {
u32 tmp = jai_rng_seed;
jai_rng_seed = tmp * 2;
jai_rng_seed += (tmp >> 0x1f ^ tmp >> 6 & 0x10);
jai_rng_seed += (tmp >> 0x1f ^ (tmp >> 6 & 0x10));
tmp = (jai_rng_seed / param_1);
return jai_rng_seed - tmp * param_1;
}
src/d/actor/d_a_bomb3.inc
+1 -1
View File
@@ -1195,7 +1195,7 @@ void daBomb_c::se_cannon_fly_set() {
/* 800DC400-800DC44C .text se_cannon_fly_stop__8daBomb_cFv */
void daBomb_c::se_cannon_fly_stop() {
if(field_0x77F) {
mDoAud_seStopActor(&current.pos, -1);
mDoAud_seStopActor(&current.pos);
field_0x77F = 0;
}
}
src/d/actor/d_a_player_boomerang.inc
+3 -3
View File
@@ -102,7 +102,7 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
if (!checkBoomerangAnime()) {
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
return procBoomerangMove_init();
} else {
return procBoomerangSubject_init();
@@ -166,7 +166,7 @@ BOOL daPy_lk_c::procBoomerangSubject() {
setShapeAngleToAtnActor();
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
}
@@ -256,7 +256,7 @@ BOOL daPy_lk_c::procBoomerangCatch_init() {
/* 80149E1C-80149ECC .text procBoomerangCatch__9daPy_lk_cFv */
BOOL daPy_lk_c::procBoomerangCatch() {
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
} else {
setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
src/d/actor/d_a_player_bottle.inc
+1 -1
View File
@@ -569,7 +569,7 @@ BOOL daPy_lk_c::procBottleGet() {
m355E = 1;
}
if (frameCtrl.checkPass(39.0f)) {
mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
seStartSystem(JA_SE_ME_ITEM_GET_S);
dComIfGp_setMesgBgmOn2();
}
return true;
src/d/actor/d_a_player_bow.inc
+4 -4
View File
@@ -177,7 +177,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() {
setBowReloadAnime();
makeArrow();
if (mActorKeepEquip.getActor() == NULL) {
mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
seStartSystem(JA_SE_ITEM_TARGET_OUT);
}
} else if (daArrow_c::changeArrowMp()) {
if (mEquipItem != dItem_BOW_e) {
@@ -208,7 +208,7 @@ void daPy_lk_c::checkNextActionBowFly() {
/* 8014A680-8014A6F4 .text checkNextBowMode__9daPy_lk_cFv */
BOOL daPy_lk_c::checkNextBowMode() {
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
return procBowMove_init();
} else {
return procBowSubject_init();
@@ -259,7 +259,7 @@ BOOL daPy_lk_c::procBowSubject_init() {
BOOL daPy_lk_c::procBowSubject() {
dComIfGp_setDoStatus(dActStts_RETURN_e);
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
}
@@ -296,7 +296,7 @@ BOOL daPy_lk_c::procBowMove_init() {
BOOL daPy_lk_c::procBowMove() {
if (mpAttnActorLockOn != NULL) {
setSpeedAndAngleAtnActor();
} else if (!mpAttention->Lockon() && mActorKeepEquip.getActor() == NULL) {
} else if (!checkAttentionLock() && mActorKeepEquip.getActor() == NULL) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
} else {
setSpeedAndAngleAtn();
src/d/actor/d_a_player_climb.inc
+1 -2
View File
@@ -15,8 +15,7 @@
/* 80135B50-80135B74 .text getClimbMoveAnmSpeed__9daPy_lk_cFv */
f32 daPy_lk_c::getClimbMoveAnmSpeed() {
return daPy_HIO_ladder_c0::m.field_0x34 +
(mStickDistance * (daPy_HIO_ladder_c0::m.field_0x30 - daPy_HIO_ladder_c0::m.field_0x34));
return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x34, daPy_HIO_ladder_c0::m.field_0x30);
}
/* 80135B74-80135DA0 .text setClimbShapeOffset__9daPy_lk_cFv */
src/d/actor/d_a_player_crawl.inc
+4 -9
View File
@@ -19,19 +19,14 @@
/* 801387A4-801387EC .text getCrawlMoveAnmSpeed__9daPy_lk_cFv */
f32 daPy_lk_c::getCrawlMoveAnmSpeed() {
if (mProcVar0.m3570 != 0) {
f32 fVar1 = 1.5f;
f32 fVar2 = 0.5f;
return (mStickDistance * fVar1) + fVar2;
return getAnmSpeedStickRate(0.5f, 2.0f);
}
return daPy_HIO_crouch_c0::m.field_0x34 +
(mStickDistance * (daPy_HIO_crouch_c0::m.field_0x30 - daPy_HIO_crouch_c0::m.field_0x34));
return getAnmSpeedStickRate(daPy_HIO_crouch_c0::m.field_0x34, daPy_HIO_crouch_c0::m.field_0x30);
}
/* 801387EC-80138868 .text getCrawlMoveSpeed__9daPy_lk_cFv */
f32 daPy_lk_c::getCrawlMoveSpeed() {
float fVar1;
fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
f32 fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
if (fVar1 >= 17.0f) {
fVar1 = fVar1 - 17.0f;
}
@@ -466,7 +461,7 @@ BOOL daPy_lk_c::procCrawlMove() {
checkCrawlSideWall(&spF4, &spDC, &spC4, &spD0, &sp08, &sp0A)))
{
mProcVar0.m3570 = 1;
mResetFlg0 = mResetFlg0 | 0x1000;
onResetFlg0(daPyRFlg0_UNK1000);
m370C = ((spD0 + spC4) * 0.5f) - spB8;
m34D4 = sp0A + 0x4000;
}
src/d/actor/d_a_player_dproc.inc
+6 -8
View File
@@ -208,7 +208,7 @@ BOOL daPy_lk_c::dProcTalk_init() {
}
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
if (mDemo.getParam0() != 1) {
mDoAud_seStart(JA_SE_TALK_START);
seStartSystem(JA_SE_TALK_START);
}
initShipRideUseItem(iVar2, 0);
return true;
@@ -398,7 +398,7 @@ void daPy_lk_c::setGetItemSound(u16 param_1, int param_2) {
if (param_1 == dItem_GREEN_RUPEE_e || param_1 == dItem_BLUE_RUPEE_e || param_1 == dItem_YELLOW_RUPEE_e ||
param_1 == dItem_RED_RUPEE_e || param_1 == dItem_PURPLE_RUPEE_e || param_1 == TINCLE_RUPEE1)
{
mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
seStartSystem(JA_SE_ME_ITEM_GET_S);
dComIfGp_setMesgBgmOn2();
} else if ((param_1 == dItem_HEART_CONTAINER_e) ||
(param_1 == dItem_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3)))
@@ -411,7 +411,7 @@ void daPy_lk_c::setGetItemSound(u16 param_1, int param_2) {
mDoAud_subBgmStart(JA_BGM_ITEM_GET_S);
dComIfGp_setMesgBgmOn();
} else if (param_2 != dItem_HEART_e) {
mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
seStartSystem(JA_SE_ME_ITEM_GET_S);
dComIfGp_setMesgBgmOn2();
} else {
mDoAud_subBgmStart(JA_BGM_ITEM_GET);
@@ -1453,7 +1453,7 @@ BOOL daPy_lk_c::dProcPresent_init() {
dProcPresent_init_sub();
}
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
mDoAud_seStart(JA_SE_TALK_START);
seStartSystem(JA_SE_TALK_START);
m3574 = 0;
return true;
}
@@ -1584,9 +1584,7 @@ BOOL daPy_lk_c::dProcStandItemPut() {
} else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) {
fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
if (grab_actor != NULL) {
mDoAud_seStart(
JA_SE_LK_W_DAIZA_ATTACH, &grab_actor->current.pos, NULL, dComIfGp_getReverb(grab_actor->current.roomNo)
);
fopAcM_seStartCurrent(grab_actor, JA_SE_LK_W_DAIZA_ATTACH, 0);
}
freeGrabItem();
dComIfGp_evmng_cutEnd(mStaffIdx);
@@ -1746,7 +1744,7 @@ BOOL daPy_lk_c::dProcAgbUse_init() {
setAnimeEquipItem();
mVelocity = 0.0f;
setSingleMoveAnime(ANM_USETCEIVER, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC);
mDoAud_seStart(JA_SE_TALK_START);
seStartSystem(JA_SE_TALK_START);
initShipRideUseItem(iVar2, 2);
return true;
}
src/d/actor/d_a_player_fan.inc
+1 -1
View File
@@ -107,7 +107,7 @@ BOOL daPy_lk_c::checkFanGlideProc(int param_0) {
if (dComIfGs_getMagic() >= 1) {
return procFanGlide_init(param_0);
}
mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
seStartSystem(JA_SE_ITEM_TARGET_OUT);
}
return false;
}
src/d/actor/d_a_player_food.inc
+1 -1
View File
@@ -34,7 +34,7 @@ BOOL daPy_lk_c::procFoodThrow_init() {
return TRUE;
}
if (m3630 != fpcM_ERROR_PROCESS_ID_e) {
mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
seStartSystem(JA_SE_ITEM_TARGET_OUT);
return FALSE;
}
src/d/actor/d_a_player_grab.inc
+4 -4
View File
@@ -222,7 +222,7 @@ BOOL daPy_lk_c::checkNextActionGrab() {
dComIfGp_setDoStatus(dActStts_OPEN_e);
} else if (iVar3 != 0) {
dComIfGp_setDoStatus(dActStts_DROP_e);
} else if (mpAttention->Lockon()) {
} else if (checkAttentionLock()) {
int direction = getDirectionFromShapeAngle();
if (mStickDistance <= 0.05f ||
(mStickDistance > 0.05f && (direction == DIR_FORWARD || direction == DIR_BACKWARD)))
@@ -735,7 +735,7 @@ BOOL daPy_lk_c::procGrabWait() {
return checkNextMode(0);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
} else {
setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
@@ -755,7 +755,7 @@ BOOL daPy_lk_c::procGrabWait() {
if (checkGrabAnime()) {
m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
}
} else if (shape_angle.y != m34DE && !mpAttention->Lockon()) {
} else if (shape_angle.y != m34DE && !checkAttentionLock()) {
float fVar2;
if (checkNoResetFlg1(daPyFlg1_UNK800000)) {
fVar2 = -1.0f;
@@ -798,7 +798,7 @@ BOOL daPy_lk_c::procGrabHeavyWait() {
return checkNextMode(0);
}
if (!mpAttention->Lockon() && mStickDistance > 0.05f) {
if (!checkAttentionLock() && mStickDistance > 0.05f) {
cLib_addCalcAngleS(
&shape_angle.y,
m34E8,
src/d/actor/d_a_player_hammer.inc
+3 -3
View File
@@ -37,7 +37,7 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int
float local_54;
BOOL bVar2;
int attrib_code;
int iVar6;
u32 iVar6;
JPABaseEmitter* emitter;
f32 dVar9;
int iStack_58;
@@ -248,7 +248,7 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() {
);
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
m34D4 = shape_angle.y;
} else {
m34D4 = m34E8;
@@ -296,7 +296,7 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() {
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
voiceStart(1);
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
m34D4 = shape_angle.y;
} else {
m34D4 = m34E8;
src/d/actor/d_a_player_hang.inc
+1 -2
View File
@@ -15,8 +15,7 @@
/* 80133F1C-80133F40 .text getHangMoveAnmSpeed__9daPy_lk_cFv */
f32 daPy_lk_c::getHangMoveAnmSpeed() {
return daPy_HIO_hang_c0::m.field_0x24 +
(mStickDistance * (daPy_HIO_hang_c0::m.field_0x28 - daPy_HIO_hang_c0::m.field_0x24));
return getAnmSpeedStickRate(daPy_HIO_hang_c0::m.field_0x24, daPy_HIO_hang_c0::m.field_0x28);
}
/* 80133F40-80133FB4 .text getHangDirectionFromAngle__9daPy_lk_cFv */
src/d/actor/d_a_player_hook.inc
+5 -5
View File
@@ -94,11 +94,11 @@ void daPy_lk_c::setHookshotSight() {
if (mSightPacket.getLockFlg()) {
mSightPacket.incFrame();
if (mSightPacket.checkSEFrame()) {
mDoAud_seStart(JA_SE_INDICATOR_1);
seStartSystem(JA_SE_INDICATOR_1);
}
} else {
mSightPacket.onLockFlg();
mDoAud_seStart(JA_SE_INDICATOR_1);
seStartSystem(JA_SE_INDICATOR_1);
}
} else {
mSightPacket.offLockFlg();
@@ -186,7 +186,7 @@ BOOL daPy_lk_c::checkNextHookshotMode() {
m355E = 0;
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
return procHookshotMove_init();
} else {
return procHookshotSubject_init();
@@ -222,7 +222,7 @@ BOOL daPy_lk_c::procHookshotSubject() {
dComIfGp_setDoStatus(dActStts_RETURN_e);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
}
@@ -274,7 +274,7 @@ BOOL daPy_lk_c::procHookshotMove() {
if (hookshot->checkWait()) {
if (mpAttnActorLockOn != NULL) {
setSpeedAndAngleAtnActor();
} else if (m355E == 0 && !mpAttention->Lockon()) {
} else if (m355E == 0 && !checkAttentionLock()) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
} else {
setSpeedAndAngleAtn();
src/d/actor/d_a_player_ladder.inc
+1 -2
View File
@@ -15,8 +15,7 @@
/* 80132F34-80132F58 .text getLadderMoveAnmSpeed__9daPy_lk_cFv */
f32 daPy_lk_c::getLadderMoveAnmSpeed() {
return daPy_HIO_ladder_c0::m.field_0x28 +
(mStickDistance * (daPy_HIO_ladder_c0::m.field_0x24 - daPy_HIO_ladder_c0::m.field_0x28));
return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x28, daPy_HIO_ladder_c0::m.field_0x24);
}
/* 80132F58-80133058 .text setLadderFootSe__9daPy_lk_cFv */
src/d/actor/d_a_player_main.cpp
+527 -585
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_player_rope.inc
+9 -9
View File
@@ -328,7 +328,7 @@ BOOL daPy_lk_c::checkNextActionRopeReady() {
} else {
return true;
}
} else if (!mpAttention->Lockon()) {
} else if (!checkAttentionLock()) {
dComIfGp_setDoStatus(dActStts_RETURN_e);
}
if (((itemButton()) && (mEquipItem == getReadyItem())) && (m355C == 0)) {
@@ -363,7 +363,7 @@ BOOL daPy_lk_c::checkNextRopeMode() {
m355E = 0;
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
return procRopeMove_init();
} else {
return procRopeSubject_init();
@@ -404,7 +404,7 @@ BOOL daPy_lk_c::procRopeSubject_init() {
current.angle.y = shape_angle.y;
mDoAud_seStart(JA_SE_CAMERA_L_MOVE);
seStartSystem(JA_SE_CAMERA_L_MOVE);
mProcVar0.m3570 = 0;
m3600 = -1.0f;
@@ -426,7 +426,7 @@ BOOL daPy_lk_c::procRopeSubject() {
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK40000_e);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setSpeedAndAngleAtn();
}
@@ -446,11 +446,11 @@ BOOL daPy_lk_c::procRopeSubject() {
mSightPacket.incFrame();
if (mSightPacket.checkSEFrame()) {
mDoAud_seStart(JA_SE_INDICATOR_1);
seStartSystem(JA_SE_INDICATOR_1);
}
} else {
mSightPacket.onLockFlg();
mDoAud_seStart(JA_SE_INDICATOR_1);
seStartSystem(JA_SE_INDICATOR_1);
}
} else {
mSightPacket.offLockFlg();
@@ -765,7 +765,7 @@ BOOL daPy_lk_c::procRopeSwing() {
procRopeHangWait_init(0);
} else if (f30 > 0.6f) {
if (cM_fcos(sp0C) > 0.77f) {
mDoAud_seStart(JA_SE_LK_ROPE_SWING_F, &mRopePos, NULL, mReverb);
mDoAud_seStart(JA_SE_LK_ROPE_SWING_F, &mRopePos, 0, mReverb);
}
}
@@ -1157,7 +1157,7 @@ BOOL daPy_lk_c::procRopeMove() {
if (mpAttnActorLockOn != NULL) {
setSpeedAndAngleAtnActor();
} else {
if ((m355E == 0) && (!mpAttention->Lockon())) {
if ((m355E == 0) && (!checkAttentionLock())) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
} else {
setSpeedAndAngleAtn();
@@ -1202,7 +1202,7 @@ BOOL daPy_lk_c::procRopeThrowCatch() {
if (!checkItemModeActorPointer()) {
return true;
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK40000_e);
} else {
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK40000_e);
src/d/actor/d_a_player_ship.inc
+10 -10
View File
@@ -238,7 +238,7 @@ void daPy_lk_c::setShipRidePos(int param_0) {
/* 801403E0-80140480 .text setShipAttentionAnmSpeed__9daPy_lk_cFf */
void daPy_lk_c::setShipAttentionAnmSpeed(f32 param_0) {
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24);
mFrameCtrlUpper[UPPER_MOVE2_e].setRate(param_0);
} else {
@@ -706,7 +706,7 @@ BOOL daPy_lk_c::procShipScope_init(int param_0) {
setShipRidePos(0);
setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, 5.0f);
dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
mDoAud_seStart(JA_SE_ITM_SUBMENU_IN_1);
seStartSystem(JA_SE_ITM_SUBMENU_IN_1);
offNoResetFlg0(daPyFlg0_SCOPE_CANCEL);
mEquipItem = dComIfGp_getSelectItem(mReadyItemBtn);
if (param_0 != 0) {
@@ -785,7 +785,7 @@ BOOL daPy_lk_c::procShipBoomerang() {
if (checkUpperAnime(LKANM_BCK_BOOMWAIT)) {
setShipAttentionAnmSpeed(daPy_HIO_boom_c0::m.field_0x18);
checkNextActionBoomerangReady();
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
setShipAttnetionBodyAngle();
} else {
m34DA = 0;
@@ -835,7 +835,7 @@ BOOL daPy_lk_c::procShipHookshot_init() {
dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e | daPyStts0_SHIP_RIDE_e);
setShipRidePos(0);
m34D4 = ship->shape_angle.y;
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
mProcVar0.m3570 = 1;
} else {
mProcVar0.m3570 = 0;
@@ -852,7 +852,7 @@ BOOL daPy_lk_c::procShipHookshot() {
setShipRidePos(0);
dComIfGp_setDoStatus(dActStts_RETURN_e);
daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor();
if (doTrigger() || hookshot == NULL || (mProcVar0.m3570 != 0 && m355E == 0 && !mpAttention->Lockon())) {
if (doTrigger() || hookshot == NULL || (mProcVar0.m3570 != 0 && m355E == 0 && !checkAttentionLock())) {
procShipPaddle_init();
deleteEquipItem(TRUE);
return true;
@@ -863,7 +863,7 @@ BOOL daPy_lk_c::procShipHookshot() {
if (hookshot->checkWait()) {
setShipAttentionAnmSpeed(1.0f);
}
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
if (hookshot->checkWait()) {
setShipAttnetionBodyAngle();
} else {
@@ -879,7 +879,7 @@ BOOL daPy_lk_c::procShipHookshot() {
shape_angle.y += (s16)(ship->shape_angle.y - m34D4);
}
if (hookshot->checkWait()) {
if (!mpAttention->Lockon()) {
if (!checkAttentionLock()) {
setHookshotSight();
} else {
mSightPacket.offDrawFlg();
@@ -915,7 +915,7 @@ BOOL daPy_lk_c::procShipBow_init() {
setShipRidePos(0);
m34D4 = ship->shape_angle.y;
m34DA = 0;
if (mpAttention->Lockon() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
if (checkAttentionLock() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
mProcVar0.m3570 = 1;
} else {
mProcVar0.m3570 = 0;
@@ -932,7 +932,7 @@ BOOL daPy_lk_c::procShipBow() {
setShipRidePos(0);
if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
dComIfGp_setDoStatus(dActStts_RETURN_e);
if (doTrigger() || ((!mpAttention->Lockon() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) {
if (doTrigger() || ((!checkAttentionLock() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) {
procShipPaddle_init();
deleteEquipItem(TRUE);
return true;
@@ -944,7 +944,7 @@ BOOL daPy_lk_c::procShipBow() {
if (checkBowWaitAnime()) {
setShipAttentionAnmSpeed(1.0f);
}
if (mpAttention->Lockon() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e)) {
if (checkAttentionLock() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e)) {
setShipAttnetionBodyAngle();
mProcVar0.m3570 = 1;
} else {
src/d/actor/d_a_player_swim.inc
+2 -2
View File
@@ -22,7 +22,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() {
BOOL bVar3 = false;
if (mCurProc != daPyProc_SWIM_UP_e) {
if (!mpAttention->Lockon()) {
if (!checkAttentionLock()) {
if (mStickDistance > 0.05f) {
oldAngleY = shape_angle.y;
@@ -510,7 +510,7 @@ BOOL daPy_lk_c::procSwimMove() {
J3DFrameCtrl* mFrameCtrl = mFrameCtrlUnder;
int direction;
if (!mpAttention->Lockon()) {
if (!checkAttentionLock()) {
direction = DIR_FORWARD;
}
else if (mStickDistance > 0.05f) {
src/d/actor/d_a_player_sword.inc
+3 -3
View File
@@ -409,7 +409,7 @@ int daPy_lk_c::changeCutProc() {
m34C4++;
int direction = getCutDirection() - 1;
short sVar2;
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
sVar2 = shape_angle.y;
} else {
sVar2 = m34E8;
@@ -434,7 +434,7 @@ int daPy_lk_c::changeCutProc() {
} else if (direction == DIR_RIGHT) {
procCutR_init(sVar2);
} else if (direction == DIR_NONE) {
if (mpAttention->Lockon()) {
if (checkAttentionLock()) {
procCutA_init(sVar2);
} else {
procCutL_init(sVar2);
@@ -1708,7 +1708,7 @@ BOOL daPy_lk_c::procCutTurnMove() {
}
}
if (m34D0 != -1) {
mDoAud_seStart(JA_SE_LK_SWORD_CHARGE);
seStartSystem(JA_SE_LK_SWORD_CHARGE);
}
if (changeSlideProc()) {
return true;
src/d/actor/d_a_player_tact.inc
+7 -7
View File
@@ -117,7 +117,7 @@ BOOL daPy_lk_c::checkTactLastInput() {
/* 8014D9F8-8014DA78 .text setTactZev__9daPy_lk_cFUiiPc */
void daPy_lk_c::setTactZev(fpc_ProcID tactZevPartnerId, int r30, char* r31) {
if (tactZevPartnerId != fpcM_ERROR_PROCESS_ID_e) {
mDoAud_seStart(JA_SE_PRE_TAKT);
seStartSystem(JA_SE_PRE_TAKT);
}
mTactZevPartnerId = tactZevPartnerId;
m34CC = r30;
@@ -256,7 +256,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
if (r30 == -1) {
dCam_getBody()->StartEventCamera(0xC, fopAcM_GetID(this), 0);
mDoAud_seStart(JA_SE_TAKT_USE_BEGIN);
seStartSystem(JA_SE_TAKT_USE_BEGIN);
}
mDoAud_tact_reset();
@@ -333,7 +333,7 @@ BOOL daPy_lk_c::procTactWait() {
if (m34D2 != 0) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
resetActAnimeUpper(UPPER_MOVE1_e, -1.0f);
mDoAud_seStart(JA_SE_TAKT_USE_CANCEL);
seStartSystem(JA_SE_TAKT_USE_CANCEL);
}
g_dComIfG_gameInfo.play.field_0x4947 = 0;
@@ -461,7 +461,7 @@ BOOL daPy_lk_c::procTactWait() {
((mProcVar0.m3570 == -1 || mProcVar0.m3570 == -3) && (m3574 >= 0 && m3574 != 6 && m3574 != 7 && dComIfGs_isTact(m3574))))
{
m34D2 = 30;
mDoAud_seStart(JA_SE_WTAKT_MATCH_SIGNAL);
seStartSystem(JA_SE_WTAKT_MATCH_SIGNAL);
m35A0 = 0.0f;
} else {
m3574 = -1;
@@ -650,7 +650,7 @@ BOOL daPy_lk_c::procTactPlay() {
}
}
} else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
mDoAud_seStart(JA_SE_TAKT_MATCHED);
seStartSystem(JA_SE_TAKT_MATCHED);
fopMsgM_messageSendOn();
m34D0 = 1;
@@ -685,7 +685,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
dComIfGp_event_setTalkPartner(dComIfGp_getCb1Player());
fopAcM_orderChangeEvent(this, dComIfGp_getCb1Player(), l_tact_event_label, 0, -1);
mDoAud_seStart(JA_SE_CTRL_LINK_TO_NPC);
seStartSystem(JA_SE_CTRL_LINK_TO_NPC);
} else if (r30 == 5) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
fopAcM_orderChangeEvent(this, l_tact_night_event_label, 0, -1);
@@ -806,7 +806,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() {
/* 8014F690-8014F8A0 .text procTactPlayOriginal__9daPy_lk_cFv */
BOOL daPy_lk_c::procTactPlayOriginal() {
mDoAud_seStart(JA_SE_LK_WTAKT_USING);
seStartSystem(JA_SE_LK_WTAKT_USING);
if (m_old_fdata->getOldFrameRate() < 0.01f) {
if (m34D6 > 0) {
src/d/actor/d_a_player_weapon.inc
+3 -3
View File
@@ -57,7 +57,7 @@ BOOL daPy_lk_c::procWeaponNormalSwing_init() {
m3700 = cXyz::Zero;
m34C2 = 1;
voiceStart(1);
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
m34D4 = shape_angle.y;
} else {
m34D4 = m34E8;
@@ -238,7 +238,7 @@ BOOL daPy_lk_c::procWeaponFrontSwingReady_init() {
);
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
m34D4 = shape_angle.y;
} else {
m34D4 = m34E8;
@@ -287,7 +287,7 @@ BOOL daPy_lk_c::procWeaponFrontSwing_init() {
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
voiceStart(1);
if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
if (checkAttentionLock() || mStickDistance <= 0.05f) {
m34D4 = shape_angle.y;
} else {
m34D4 = m34E8;
src/d/actor/d_a_player_whide.inc
+13 -12
View File
@@ -15,16 +15,13 @@
/* 8013707C-801371E0 .text setBlendWHideMoveAnime__9daPy_lk_cFf */
void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) {
float fVar1;
float fVar2;
float fVar3;
float fVar4;
float fVar5;
float fVar6;
float fVar7;
s16 sVar1;
daPy_ANM dVar5;
f32 fVar1;
f32 fVar5;
daPy_ANM dVar6;
s16 sVar1;
f32 fVar6;
f32 fVar3;
daPy_ANM dVar5;
if (!checkNoResetFlg0(daPyFlg0_UNK10000)) {
fVar1 = daPy_HIO_wall_c0::m.field_0x14;
@@ -51,20 +48,24 @@ void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) {
dVar5 = ANM_WALLWLDW;
}
}
fVar5 *= fVar4;
fVar5 *= param_0;
f32 fVar7;
fVar7 = mVelocity / mMaxNormalSpeed;
if (fVar7 < 0.0f) {
fVar7 = 0.0f;
}
f32 fVar4;
if (fVar7 < fVar3) {
fVar4 = 1.0f - fVar7 / fVar3;
m3598 = 1.0f;
} else {
fVar4 = 0.0f;
fVar2 = 1.0f;
m3598 = (fVar2 - ((fVar2 - fVar6) * (fVar7 - fVar3)) / (fVar2 - fVar3));
m3598 = (1.0f - ((1.0f - fVar6) * (fVar7 - fVar3)) / (1.0f - fVar3));
}
setMoveAnime(fVar4, fVar1, 0.0f, dVar5, dVar6, 5, fVar5);
mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(sVar1);
mFrameCtrlUnder[UNDER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getEnd() - 0.001f);
mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f);
src/d/d_com_inf_game.cpp
+3 -4
View File
@@ -1171,13 +1171,12 @@ void dComIfGs_setGameStartStage() {
daPy_lk_c* player_p = daPy_getPlayerLinkActorClass();
point = player_p->mRestartPoint;
s8 temp_r3 = player_p->current.roomNo;
room_no = temp_r3;
room_no = fopAcM_GetRoomNo(player_p);
stage_scls_info_class* scls_p;
if (temp_r3 >= 0 && point != 0xFF && dComIfGs_checkSeaLandingEvent(room_no)) {
if (fopAcM_GetRoomNo(player_p) >= 0 && point != 0xFF && dComIfGs_checkSeaLandingEvent(room_no)) {
strcpy(stage_name, dComIfGp_getStartStageName());
} else {
stage_scls_info_class* scls_p;
if (dComIfGp_getShipActor() != NULL) {
scls_p = dComIfGd_getMeshSceneList(dComIfGp_getShipActor()->current.pos);
} else {
src/d/d_s_logo.cpp
+2 -2
View File
@@ -629,7 +629,7 @@ cPhs_State phase_0(dScnLogo_c* i_this) {
if (!cDyl_InitAsyncIsDone())
return cPhs_INIT_e;
if (mDoAud_zelAudio_c::isInitFlag() && JAIZelBasic::getInterface()->checkFirstWaves())
if (mDoAud_zelAudio_c::isInitFlag() && mDoAud_checkFirstWaves())
return cPhs_INIT_e;
#if VERSION == VERSION_PAL
@@ -904,7 +904,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
l_FmapDataCommand = mDoDvdThd_toMainRam_c::create("/res/FmapDat/FmapDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
JUT_ASSERT(VERSION_SELECT(1426, 1426, 1751, 1791), l_FmapDataCommand != NULL);
JAIZelBasic::getInterface()->loadStaticWaves();
mDoAud_loadStaticWaves();
mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60);
mDoGph_gInf_c::waitBlanking(0);
mDoGph_gInf_c::startFadeIn(30);
src/d/d_save.cpp
+2 -2
View File
@@ -969,10 +969,10 @@ void dSv_player_config_c::init() {
u32 soundMode = OSGetSoundMode();
if (soundMode == 0) {
mSoundMode = 0;
JAIZelBasic::getInterface()->setOutputMode(0);
mDoAud_setOutputMode(0);
} else {
mSoundMode = 1;
JAIZelBasic::getInterface()->setOutputMode(1);
mDoAud_setOutputMode(1);
}
mAttentionType = 0;
src/d/d_stage.cpp
+1 -1
View File
@@ -1477,7 +1477,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
appen->base.angle = player_data->base.angle;
appen->base.setID = player_data->base.setID;
if (roomParam != 0 && (int)((appen->base.parameters >> 0xC) & 0xF) != 2) {
if (roomParam != 0 && daPy_lk_c::getStartModeFromParam(appen->base.parameters) != 2) {
appen->base.parameters = (roomParam & 0xFFFFFFC0) | (appen->base.parameters & 0x3F);
}
}