mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-09 12:35:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_player_main work

Browse Source
This commit is contained in:
LagoLunatic
2024-01-12 22:46:07 -05:00
parent 0562d09a0f
commit 76b28bee52
16 changed files with 840 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ void daObjTpost_c::cutPresentProc(int staffIdx) {
void daObjTpost_c::cutSetAnmStart(int staffIdx) {
const char* name = dComIfGp_evmng_getMyStringP(staffIdx, "Name");
if(name != 0 && dEvmng_strcmp(name, "HAKIDASU") == 0) {
if(name != 0 && strcmp(name, "HAKIDASU") == 0) {
setAnm(3, false);
}
else {
src/d/actor/d_a_player_dproc.inc
+7 -2
View File
@@ -19,7 +19,9 @@ void daPy_lk_c::getDemoLookActor() {
/* 8012CDD4-8012CE2C .text setTinkleCeiverModel__9daPy_lk_cFv */
void daPy_lk_c::setTinkleCeiverModel() {
/* Nonmatching */
JKRHeap* oldHeap = setItemHeap();
initModel(&mpHeldItemModel, LINK_BDL_TCEIVER, 0x13000022);
mDoExt_setCurrentHeap(oldHeap);
}
/* 8012CE2C-8012CEFC .text setTalismanModel__9daPy_lk_cFv */
@@ -34,7 +36,10 @@ void daPy_lk_c::setLetterModel() {
/* 8012CFE8-8012D010 .text checkCaughtShapeHide__9daPy_lk_cFv */
BOOL daPy_lk_c::checkCaughtShapeHide() {
/* Nonmatching */
if (mCurProc == daPyProc_DEMO_CAUGHT_e && m3570 != 0) {
return TRUE;
}
return FALSE;
}
/* 8012D010-8012D08C .text setShapeAngleToTalkActor__9daPy_lk_cFv */
src/d/actor/d_a_player_food.inc
+8 -8
View File
@@ -30,10 +30,10 @@ void daPy_lk_c::setHyoiModel() {
/* 801543A0-801546F4 .text procFoodThrow_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procFoodThrow_init() {
if (mCurProc == PROC_FOOD_THROW_e) {
if (mCurProc == daPyProc_FOOD_THROW_e) {
return TRUE;
}
if (m3630 != -1) {
if (m3630 != fpcM_ERROR_PROCESS_ID_e) {
mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
return FALSE;
}
@@ -52,7 +52,7 @@ BOOL daPy_lk_c::procFoodThrow_init() {
int temp = checkShipRideUseItem(1);
commonProcInit(PROC_FOOD_THROW_e);
commonProcInit(daPyProc_FOOD_THROW_e);
if (temp == 0) {
f32 offset1 = cM_ssin(shape_angle.y) * 150.0f;
@@ -107,14 +107,14 @@ BOOL daPy_lk_c::procFoodThrow_init() {
}
initShipRideUseItem(temp, 2);
m3630 = -1;
m3630 = fpcM_ERROR_PROCESS_ID_e;
return TRUE;
}
/* 801546F4-80154880 .text procFoodThrow__9daPy_lk_cFv */
BOOL daPy_lk_c::procFoodThrow() {
J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[0];
J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
setShipRidePosUseItem();
if (frameCtrl.getRate() < 0.01f) {
if (mDemo.getDemoType() != 5) {
@@ -149,7 +149,7 @@ BOOL daPy_lk_c::procFoodThrow() {
/* 80154880-80154A48 .text procFoodSet_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procFoodSet_init() {
if (mCurProc == PROC_FOOD_SET_e) {
if (mCurProc == daPyProc_FOOD_SET_e) {
if (mDemo.getParam0() == 1) {
if (mHeldItemType == ANIMAL_ESA) {
u8 btnIdx = dComIfGp_event_getTalkXYBtn();
@@ -177,7 +177,7 @@ BOOL daPy_lk_c::procFoodSet_init() {
}
int temp = checkShipRideUseItem(1);
commonProcInit(PROC_FOOD_SET_e);
commonProcInit(daPyProc_FOOD_SET_e);
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
@@ -198,7 +198,7 @@ BOOL daPy_lk_c::procFoodSet_init() {
/* 80154A48-80154B80 .text procFoodSet__9daPy_lk_cFv */
BOOL daPy_lk_c::procFoodSet() {
J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[0];
J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
setShipRidePosUseItem();
src/d/actor/d_a_player_main.cpp
+467 -157
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_player_particle.inc
+3 -2
View File
@@ -134,8 +134,9 @@ void daPy_waterDropEcallBack_c::end() {
}
/* 8012A0B4-8012A0E0 .text makeEmitterColor__28daPy_mtxPosFollowEcallBack_cFUsPA4_fPC4cXyzPC5csXyzPC8_GXColorPC8_GXColor */
void daPy_mtxPosFollowEcallBack_c::makeEmitterColor(u16, MtxP, const cXyz*, const csXyz*, const GXColor*, const GXColor*) {
/* Nonmatching */
void daPy_mtxPosFollowEcallBack_c::makeEmitterColor(u16 particleID, MtxP mtx, const cXyz* pos, const csXyz* angle, const GXColor* prmColor, const GXColor* envColor) {
mpAngle = angle;
daPy_mtxFollowEcallBack_c::makeEmitterColor(particleID, mtx, pos, prmColor, envColor);
}
/* 8012A0E0-8012A160 .text execute__28daPy_mtxPosFollowEcallBack_cFP14JPABaseEmitter */
src/d/actor/d_a_player_swim.inc
+1 -1
View File
@@ -48,7 +48,7 @@ void daPy_lk_c::changeSwimOutProc() {
}
/* 8013D530-8013D638 .text setSwimMoveAnime__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */
void daPy_lk_c::setSwimMoveAnime(daPy_lk_c::daPy_ANM) {
void daPy_lk_c::setSwimMoveAnime(daPy_ANM) {
/* Nonmatching */
}
src/d/actor/d_a_player_sword.inc
+2 -2
View File
@@ -83,7 +83,7 @@ void daPy_lk_c::changeCutProc() {
}
/* 80155C3C-80156034 .text changeCutReverseProc__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */
void daPy_lk_c::changeCutReverseProc(daPy_lk_c::daPy_ANM) {
void daPy_lk_c::changeCutReverseProc(daPy_ANM) {
/* Nonmatching */
}
@@ -218,7 +218,7 @@ BOOL daPy_lk_c::procCutTurnMove() {
}
/* 80159130-801592A4 .text procCutReverse_init__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */
BOOL daPy_lk_c::procCutReverse_init(daPy_lk_c::daPy_ANM) {
BOOL daPy_lk_c::procCutReverse_init(daPy_ANM) {
/* Nonmatching */
}
src/d/actor/d_a_player_tact.inc
+19 -19
View File
@@ -89,7 +89,7 @@ int daPy_lk_c::getTactPlayLeftArmAnm(s32 r4) {
/* 8014D97C-8014D9A4 .text checkEndTactMusic__9daPy_lk_cCFv */
BOOL daPy_lk_c::checkEndTactMusic() const {
if (mCurProc == PROC_TACT_PLAY_e && m34D0 != 0) {
if (mCurProc == daPyProc_TACT_PLAY_e && m34D0 != 0) {
return TRUE;
}
return FALSE;
@@ -97,7 +97,7 @@ BOOL daPy_lk_c::checkEndTactMusic() const {
/* 8014D9A4-8014D9D0 .text getTactMetronomeRate__9daPy_lk_cFv */
f32 daPy_lk_c::getTactMetronomeRate() {
if (mCurProc == PROC_TACT_WAIT_e) {
if (mCurProc == daPyProc_TACT_WAIT_e) {
return m35A0 / mDoAud_zelAudio_c::getTact().field_0x30;
} else {
return -1.0f;
@@ -106,7 +106,7 @@ f32 daPy_lk_c::getTactMetronomeRate() {
/* 8014D9D0-8014D9F8 .text checkTactLastInput__9daPy_lk_cFv */
BOOL daPy_lk_c::checkTactLastInput() {
if (mCurProc == PROC_TACT_WAIT_e && m34D2 != -1) {
if (mCurProc == daPyProc_TACT_WAIT_e && m34D2 != -1) {
return TRUE;
}
return FALSE;
@@ -134,7 +134,7 @@ BOOL daPy_lk_c::getTactTopPos(cXyz* out) {
/* 8014DACC-8014DB00 .text getTactNormalWait__9daPy_lk_cCFv */
BOOL daPy_lk_c::getTactNormalWait() const {
if (mCurProc == PROC_TACT_WAIT_e && m3570 == -1 && m34D2 == -1) {
if (mCurProc == daPyProc_TACT_WAIT_e && m3570 == -1 && m34D2 == -1) {
return TRUE;
}
return FALSE;
@@ -142,16 +142,16 @@ BOOL daPy_lk_c::getTactNormalWait() const {
/* 8014DB00-8014DB2C .text getTactMusic__9daPy_lk_cCFv */
s32 daPy_lk_c::getTactMusic() const {
if (mCurProc == PROC_TACT_PLAY_e)
if (mCurProc == daPyProc_TACT_PLAY_e)
return m3570;
if (mCurProc == PROC_TACT_WAIT_e)
if (mCurProc == daPyProc_TACT_WAIT_e)
return m3574;
return -1;
}
/* 8014DB2C-8014DB74 .text getTactTimerCancel__9daPy_lk_cCFv */
int daPy_lk_c::getTactTimerCancel() const {
if (mCurProc == PROC_TACT_WAIT_e && m35AC <= 0.0f) {
if (mCurProc == daPyProc_TACT_WAIT_e && m35AC <= 0.0f) {
if (m35AC <= -100.0f) {
return 2;
} else {
@@ -163,7 +163,7 @@ int daPy_lk_c::getTactTimerCancel() const {
/* 8014DB74-8014DB9C .text checkTactPlayMelody__9daPy_lk_cFv */
BOOL daPy_lk_c::checkTactPlayMelody() {
if (mCurProc == PROC_TACT_PLAY_e && m34DA == 0) {
if (mCurProc == daPyProc_TACT_PLAY_e && m34DA == 0) {
return TRUE;
}
return FALSE;
@@ -171,7 +171,7 @@ BOOL daPy_lk_c::checkTactPlayMelody() {
/* 8014DB9C-8014DBEC .text resetTactCount__9daPy_lk_cFv */
void daPy_lk_c::resetTactCount() {
if (mCurProc == PROC_TACT_WAIT_e) {
if (mCurProc == daPyProc_TACT_WAIT_e) {
m34D8 = 0;
m35A0 = 0.0f;
m34DA = 0;
@@ -182,7 +182,7 @@ void daPy_lk_c::resetTactCount() {
/* 8014DBEC-8014E100 .text procTactWait_init__9daPy_lk_cFi */
BOOL daPy_lk_c::procTactWait_init(int r30) {
if (mCurProc == PROC_TACT_WAIT_e) {
if (mCurProc == daPyProc_TACT_WAIT_e) {
if (m3570 != r30) {
m34D8 = 0;
m34DA = 0;
@@ -248,14 +248,14 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
}
}
commonProcInit(PROC_TACT_WAIT_e);
commonProcInit(daPyProc_TACT_WAIT_e);
daPy_matAnm_c::offMabaFlg();
daPy_matAnm_c::setMabaTimer(1);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4);
setActAnimeUpper(0x127, UPPER_UNK1, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
mAnmRatioUpper[1].setRatio(0.0f);
setActAnimeUpper(0x127, UPPER_UNK2, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
mAnmRatioUpper[2].setRatio(0.0f);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE1_e, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE2_e, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f);
mVelocity = 0.0f;
m34D4 = 0;
m34D6 = 0;
@@ -308,17 +308,17 @@ BOOL daPy_lk_c::procTactWait() {
/* 8014E9A4-8014EBA0 .text procTactPlay_init__9daPy_lk_cFlii */
BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) {
int r28 = checkShipRideUseItem(0);
commonProcInit(PROC_TACT_PLAY_e);
commonProcInit(daPyProc_TACT_PLAY_e);
dComIfGp_setPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e);
m3570 = r27;
if (r31 == 0) {
m3628 = fopMsgM_messageSet(0x5AD + r27);
} else {
m3628 = -1;
m3628 = fpcM_ERROR_PROCESS_ID_e;
}
mDoAud_tact_setVolume(0.0f);
resetActAnimeUpper(UPPER_UNK2, -1.0f);
resetActAnimeUpper(UPPER_UNK1, -1.0f);
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
resetActAnimeUpper(UPPER_MOVE1_e, -1.0f);
m34DA = 0xA;
daPy_ANM anm;
src/f_op/f_op_actor_mng.cpp
+1 -1
View File
@@ -1330,7 +1330,7 @@ BOOL fopAcM_getGroundAngle(fopAc_ac_c* actor, csXyz* p_angle) {
}
/* 80027E28-80027E5C .text fopAcM_setCarryNow__FP10fopAc_ac_ci */
void fopAcM_setCarryNow(fopAc_ac_c* i_this, int stageLayer) {
void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer) {
fopAcM_OnStatus(i_this, fopAcStts_CARRY_e);
if (stageLayer) {
fopAcM_setStageLayer(i_this);