mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-07 19:20:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_chin matching (#2822)

Browse Source
This commit is contained in:
Max Roncace
2025-11-19 00:10:04 -05:00
committed by GitHub
parent 1b2fe5e2e3
commit 7f863c069b
19 changed files with 2200 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_chin.cpp
+1944 -2119
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_grr.cpp
+2 -1
View File
@@ -1399,7 +1399,8 @@ int daNpc_grR_c::talk(void* param_1) {
} else if (mType == TYPE_SPAWATER) {
/* dSv_event_flag_c::F_0399 - Kakariko Village - Conversation with Gor Liggs - hot spring game available */
if (daNpcF_chkEvtBit(399)) {
if (mFlow.getChoiceNo() == 0) {
int choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dStage_changeScene(0x24, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
} else {
rv = TRUE;
src/d/actor/d_a_npc_hoz.cpp
+11 -5
View File
@@ -637,7 +637,8 @@ BOOL daNpc_Hoz_c::evtEndProc() {
field_0xf8a = 1;
field_0xf8c = 0;
if (mFlow.getChoiceNo() == 0) {
int choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dMeter2Info_setMiniGameItem(3);
dMeter2Info_onMenuInForce(2);
}
@@ -1315,16 +1316,19 @@ int daNpc_Hoz_c::talk(void* param_0) {
dComIfGp_event_reset();
mMode = 3;
int choiceNo;
switch (mType) {
case 1:
if (dComIfGs_isSwitch(field_0xf88, fopAcM_GetRoomNo(this))) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
field_0xf8c = 1;
mEvtNo = 1;
evtChange();
}
} else if (dMeter2Info_getRentalBombBag() == 0xFF) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dMeter2Info_setMiniGameItem(3);
dMeter2Info_onMenuInForce(2);
}
@@ -1332,7 +1336,8 @@ int daNpc_Hoz_c::talk(void* param_0) {
break;
case 2:
if (daNpcT_chkTmpBit(0x43)) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
field_0xf8c = 1;
mEvtNo = 1;
evtChange();
@@ -1341,7 +1346,8 @@ int daNpc_Hoz_c::talk(void* param_0) {
break;
case 5:
field_0xf8a = 1;
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
field_0xf8c = 1;
mEvtNo = 1;
evtChange();
src/d/actor/d_a_npc_kn.cpp
+2 -1
View File
@@ -3322,7 +3322,8 @@ int daNpc_Kn_c::ECut_secondEncount(int i_idx) {
break;
case 10:
if (talkProc(0, 0, NULL, 0)) {
if (mFlow.getChoiceNo() == 0) {
int choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
int sp8 = 0;
switch (mType) {
case 1:
src/d/actor/d_a_npc_myna2.cpp
+9 -3
View File
@@ -1100,6 +1100,7 @@ int daNpc_myna2_c::ECut_gameFailure(int i_staffId) {
}
}
int choiceNo;
switch (prm) {
case 0:
calcHovering(0, 1);
@@ -1110,7 +1111,8 @@ int daNpc_myna2_c::ECut_gameFailure(int i_staffId) {
case 10:
calcHovering(0, 1);
if (talkProc(NULL, 1, NULL)) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dStage_changeScene(6, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1);
} else {
rt = 1;
@@ -1159,6 +1161,7 @@ int daNpc_myna2_c::ECut_gameGoal(int i_staffId) {
}
}
int choiceNo;
switch (prm) {
case 0:
calcHovering(0, 1);
@@ -1169,7 +1172,8 @@ int daNpc_myna2_c::ECut_gameGoal(int i_staffId) {
case 10:
calcHovering(0, 1);
if (talkProc(NULL, 1, NULL)) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dStage_changeScene(11, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1);
} else {
rt = 1;
@@ -1232,6 +1236,7 @@ int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) {
}
}
int choiceNo;
switch (prm) {
case 0:
calcHovering(0, 1);
@@ -1253,7 +1258,8 @@ int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) {
case 25:
calcHovering(0, 1);
if (talkProc(NULL, 1, NULL)) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
dStage_changeScene(11, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1);
} else {
rt = 1;
src/d/actor/d_a_npc_zra.inc
+3 -1
View File
@@ -1361,6 +1361,7 @@ BOOL daNpc_zrA_c::talkSwim(void* param_0) {
BOOL bvar2 = false;
int flow_id;
int choiceNo;
switch (mMode) {
case 0:
if (mDamageTimer != 0) {
@@ -1390,7 +1391,8 @@ BOOL daNpc_zrA_c::talkSwim(void* param_0) {
}
if (bvar2 && talkProc(NULL, 1, NULL)) {
if (mFlow.getChoiceNo() == 0) {
choiceNo = mFlow.getChoiceNo();
if (choiceNo == 0) {
field_0x1558 = 1;
mSwimAngleCalc = current.angle;
mSwimSpeedScale = 1.0f;
src/d/actor/d_a_obj_glowSphere.cpp
+3 -3
View File
@@ -436,21 +436,21 @@ int _GlSph_Mng_c::_setting_main() {
/* 80BFA5C4-80BFA60C 001364 0048+00 0/0 0/0 1/1 .text _chkAllGet_main__12_GlSph_Mng_cFv
*/
bool _GlSph_Mng_c::_chkAllGet_main() {
BOOL _GlSph_Mng_c::_chkAllGet_main() {
_GlSph_LstInfo_c* info = mListBuf;
for (int i = 0; i < 120; i++) {
if (info->isSet()) {
daGlwSph_c* psph = info->getpSph();
if (psph != NULL && !psph->is_getted()) {
return false;
return FALSE;
}
}
info++;
}
return true;
return TRUE;
}
/* 80BFAFE8 0002+00 data_80BFAFE8 mSphSe__12_GlSph_Mng_c */
src/d/actor/d_a_tag_TWgate.cpp
+8 -3
View File
@@ -446,6 +446,7 @@ void daTagTWGate_c::executeDemoOrdin2() {
break;
}
}
int choiceNo;
switch(*cutName) {
case '0001':
case '0003':
@@ -453,7 +454,8 @@ void daTagTWGate_c::executeDemoOrdin2() {
break;
case '0002':
if (talkProc(NULL, 1, NULL)) {
if (mMsgFlow.getChoiceNo() == 0) {
choiceNo = mMsgFlow.getChoiceNo();
if (choiceNo == 0) {
setAction(ACT_DEMO_ORDIN_3);
}
evtMng.cutEnd(staffId);
@@ -637,6 +639,7 @@ void daTagTWGate_c::executeDemoRanail2() {
break;
}
}
int choiceNo;
switch(*cutName) {
case '0001':
case '0003':
@@ -644,7 +647,8 @@ void daTagTWGate_c::executeDemoRanail2() {
break;
case '0002':
if (talkProc(NULL, 1, NULL)) {
if (mMsgFlow.getChoiceNo() == 0) {
choiceNo = mMsgFlow.getChoiceNo();
if (choiceNo == 0) {
setAction(ACT_DEMO_RANAIL_3);
}
evtMng.cutEnd(staffId);
@@ -829,6 +833,7 @@ void daTagTWGate_c::executeDemoHyral2() {
break;
}
}
int choiceNo;
switch(*piVar3) {
case '0001':
case '0003':
@@ -836,7 +841,7 @@ void daTagTWGate_c::executeDemoHyral2() {
break;
case '0002':
if (talkProc(NULL, 1, NULL)) {
s16 choiceNo = mMsgFlow.getChoiceNo();
choiceNo = mMsgFlow.getChoiceNo();
if (choiceNo == 0) {
setAction(ACT_DEMO_HYRAL_3);
}
src/d/d_save.cpp
+1 -1
View File
@@ -1336,7 +1336,7 @@ void dSv_MiniGame_c::init() {
}
}
mStarTime = 120000;
mHookGameTime = 120000;
mBalloonScore = 0;
mRaceGameTime = 0;
unk16 = 0;
src/d/d_timer.cpp
+6 -6
View File
@@ -480,12 +480,12 @@ int dTimer_c::getRestTimeMs() {
}
/* 8025DB10-8025DB38 258450 0028+00 1/1 0/0 4/4 .text isStart__8dTimer_cFv */
u8 dTimer_c::isStart() {
bool dTimer_c::isStart() {
if (field_0x16A != 1 && m_mode == 4) {
return 1;
return true;
}
return 0;
return false;
}
/* 8025DB38-8025DBE0 258478 00A8+00 1/1 0/0 0/0 .text __ct__21dDlst_TimerScrnDraw_cFv */
@@ -1592,7 +1592,7 @@ static int dTimer_Create(msg_class* i_this) {
}
/* 80260F8C-80261034 25B8CC 00A8+00 0/0 1/1 9/9 .text dTimer_createTimer__FlUlUcUcffff */
s32 dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5,
fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5,
f32 param_6, f32 param_7) {
if (dComIfG_getTimerMode() == -1) {
return fopMsgM_Timer_create(PROC_TIMER, i_mode, i_limitMs, i_type, param_3, param_4,
@@ -1645,12 +1645,12 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) {
}
/* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */
u8 dTimer_isStart() {
bool dTimer_isStart() {
if (dComIfG_getTimerPtr() != NULL) {
return dComIfG_getTimerPtr()->isStart();
}
return 0;
return false;
}
/* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text dTimer_getRestTimeMs__Fv */
src/m_Do/m_Do_ext.cpp
+11 -9
View File
@@ -1380,11 +1380,11 @@ void mDoExt_McaMorf::getTransform(u16 param_0, J3DTransformInfo* param_1) {
mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
int param_4, f32 param_5, int param_6, int param_7,
Z2Creature* param_8, u32 param_9, u32 param_10) {
Z2Creature* param_8, u32 i_modelFlag, u32 i_differedDlistFlag) {
mTranslate = false;
mMorfNone = false;
create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9,
param_10);
create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8,
i_modelFlag, i_differedDlistFlag);
}
/* 80010888-800108F0 00B1C8 0068+00 1/0 0/0 0/0 .text __dt__16mDoExt_McaMorfSOFv */
@@ -1398,7 +1398,7 @@ mDoExt_McaMorfSO::~mDoExt_McaMorfSO() {
int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
int param_4, f32 param_5, int param_6, int param_7,
Z2Creature* i_sound, u32 param_9, u32 param_10) {
Z2Creature* i_sound, u32 i_modelFlag, u32 i_differedDlistFlag) {
mpModel = NULL;
mpTransformInfo = NULL;
mpQuat = NULL;
@@ -1408,20 +1408,22 @@ int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_
return 0;
}
if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL && param_9 == 0) {
if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL &&
i_modelFlag == 0)
{
if (i_modelData->isLocked()) {
param_9 = 0x20000;
i_modelFlag = 0x20000;
} else {
param_9 = 0x80000;
i_modelFlag = 0x80000;
}
}
mpModel = mDoExt_J3DModel__create(i_modelData, param_9, param_10);
mpModel = mDoExt_J3DModel__create(i_modelData, i_modelFlag, i_differedDlistFlag);
if (mpModel == NULL) {
return 0;
}
if (param_9 != 0x80000) {
if (i_modelFlag != 0x80000) {
mDoExt_changeMaterial(mpModel);
}