mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-12 03:47:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #520 from LagoLunatic/player

Browse Source 
d_a_npc_kamome 100%, no match
This commit is contained in:
Jasper St. Pierre
2023-10-14 15:25:09 -07:00
committed by GitHub
parent f8f6a4fbc5 4905163814
commit 18ff139287
30 changed files with 1682 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agb.cpp
+2 -2
View File
@@ -427,7 +427,7 @@ void daAgb_c::modeLookAttention() {
se_flag = true;
}
if (dComIfGp_getEventManager().endCheckOld("DEFAULT_AGB_LOOK_ATTENTION")) {
if (dComIfGp_evmng_endCheck("DEFAULT_AGB_LOOK_ATTENTION")) {
dComIfGp_event_onEventFlag(8);
mMode = 0;
se_flag = false;
@@ -1056,7 +1056,7 @@ int daAgb_Draw(daAgb_c* i_this) {
if (g_mDoGaC_gbaCom.mDoGaC_GbaLink()) {
if (i_this->field_0x66f != 0 && !(daAgb_c::mFlags.field_0xa & 1) &&
(!dComIfGp_event_runCheck() ||
dComIfGp_getEventManager().startCheckOld("DEFAULT_AGB_LOOK_ATTENTION") ||
dComIfGp_evmng_startCheck("DEFAULT_AGB_LOOK_ATTENTION") ||
i_this->mMode == 2) &&
(i_this->field_0x65c == 0 || i_this->mMode == 1 || i_this->field_0x66b == 0x10 ||
i_this->field_0x66b == 3 || i_this->field_0x66b == 12 || i_this->field_0x66b == 4 ||
src/d/actor/d_a_agbsw0.cpp
+1 -1
View File
@@ -1052,7 +1052,7 @@ BOOL daAgbsw0_c::ExeSubMW() {
mEyePos.z += cM_scos(player->shape_angle.y) * 10.0f;
}
if(dComIfGp_getEventManager().endCheckOld("DEFAULT_AGB_LOOK_ATTENTION")) {
if(dComIfGp_evmng_endCheck("DEFAULT_AGB_LOOK_ATTENTION")) {
dComIfGp_event_reset();
if(sw == 0xFF || getParamNo() == -1) {
fopAcM_delete(this);
src/d/actor/d_a_bomb2.cpp
+1 -1
View File
@@ -217,7 +217,7 @@ namespace daBomb2 {
mAcch.Set(&current.pos, &next.pos, this, true, &mCir, &speed, &current.angle, &shape_angle);
mAcch.ClrWaterNone();
mAcch.ClrRoofNone();
mAcch.m_roof_height = 50.0f;
mAcch.m_roof_crr_height = 50.0f;
mAcch.OnLineCheck();
field_0x51C = -1.0e9f;
field_0x520 = -1.0e9f;
src/d/actor/d_a_kytag04.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ int daKytag04_Create(fopAc_ac_c* i_this) {
a_this->mState = 0;
a_this->mOffColPat = a_this->mBase.mParameters;
a_this->mOnColPat = a_this->mBase.mParameters >> 8;
a_this->mSwitchId = a_this->current.angle.x;;
a_this->mSwitchId = a_this->current.angle.x;
a_this->mScaleX = a_this->mScale.x * 100.0f;
a_this->mScaleY = a_this->mScale.y * 100.0f;
a_this->mTimer = 0;
src/d/actor/d_a_nh.cpp
+4 -4
View File
@@ -46,8 +46,8 @@ public:
public:
/* 0x04 */ s8 mChildID;
/* 0x08 */ hio_prm_c prm;
/* 0x44 */ daNh_c* mActor;
}; // Size: 0x44
/* 0x44 */ daNh_c* mpActor;
}; // Size: 0x48
static daNh_HIO_c l_HIO;
@@ -243,9 +243,9 @@ s32 daNh_c::create() {
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("森のほたる", &l_HIO);
l_HIO.mActor = this;
l_HIO.mpActor = this;
}
if (!this->init()) {
if (!init()) {
phase_state = cPhs_ERROR_e;
}
src/d/actor/d_a_npc_kamome.cpp
+1272 -625
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -869,7 +869,7 @@ void daObjTpost_c::modeReceiveDemoInit() {
}
void daObjTpost_c::modeReceiveDemo() {
if(dComIfGp_getEventManager().endCheckOld("DEFAULT_POST")) {
if(dComIfGp_evmng_endCheck("DEFAULT_POST")) {
dLetter_read(m_letter[mNumReadable].mEventReg);
mNumReadable = getReadableLetterNum();
dComIfGp_event_onEventFlag(8);
src/d/actor/d_a_seatag.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ actor_process_profile_definition g_profile_SEATAG = {
&g_fopAc_Method.base,
0x01DF,
&l_daSeatag_Method,
fopAcStts_UNK40000_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e,
fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_tag_msg.cpp
+2 -2
View File
@@ -193,7 +193,7 @@ static s32 daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
l_msg->mMode = 0x13;
dComIfGp_event_onEventFlag(8);
if (a_this->getMessage() == 0x1902) {
daPy_getPlayerLinkActorClass()->mNoResetFlg0 &= 0xf7ffffff;
daPy_getPlayerLinkActorClass()->offPlayerNoDraw();
}
if (a_this->getType2() & 1) {
a_this->mAction = 0;
@@ -217,7 +217,7 @@ static s32 daTag_Msg_actionHunt(daTag_Msg_c* a_this) {
l_msg = 0;
msg_mode = 0;
if ((u32)a_this->getMessage() == 0x1902) {
daPy_getPlayerLinkActorClass()->mNoResetFlg0 |= 0x8000000;
daPy_getPlayerLinkActorClass()->onPlayerNoDraw();
}
} else if (a_this->rangeCheck() != 0 && a_this->otherCheck() != 0) {
if ((a_this->getType2() & 1) != 0) {
src/d/d_bg_s_acch.cpp
+6 -6
View File
@@ -61,8 +61,8 @@ dBgS_Acch::dBgS_Acch() {
m_tbl_size = 0;
pm_acch_cir = NULL;
m_roof_y = 0.0f;
m_roof_height = 0.0f;
m_roof_crr_height = 0.0f;
m_roof_height = 0.0f;
field_0xc8 = 200.0f;
pm_angle = NULL;
pm_shape_angle = NULL;
@@ -162,15 +162,15 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
LineCheck(i_bgs);
}
m_roof_crr_height = 1000000000.0f;
m_roof_height = 1000000000.0f;
if (!(m_flags & ROOF_NONE)) {
m_roof.SetExtChk(*(cBgS_Chk*)this);
ClrRoofHit();
cXyz roofPos = *pm_pos;
m_roof.SetPos(roofPos);
m_roof_y = i_bgs.RoofChk(&m_roof);
if (m_roof_y != 1000000000.0f && pm_pos->y + m_roof_height > m_roof_y) {
m_roof_crr_height = m_roof_y - m_roof_height;
if (m_roof_y != 1000000000.0f && pm_pos->y + m_roof_crr_height > m_roof_y) {
m_roof_height = m_roof_y - m_roof_crr_height;
SetRoofHit();
}
}
@@ -179,8 +179,8 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
ClrGroundFind();
GroundCheck(i_bgs);
GroundRoofProc(i_bgs);
} else if (m_roof_crr_height < pm_pos->y) {
pm_pos->y = m_roof_crr_height;
} else if (m_roof_height < pm_pos->y) {
pm_pos->y = m_roof_height;
}
if (!(m_flags & WATER_NONE)) {
src/d/d_npc.cpp
+9 -9
View File
@@ -448,7 +448,7 @@ bool dNpc_setAnmFNDirect(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 spee
return ret;
}
bool dNpc_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileidx, int soundFileIdx, const char* arcName) {
bool dNpc_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName) {
void* pSoundAnimRes = 0;
bool ret = false;
@@ -457,7 +457,7 @@ bool dNpc_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int a
pSoundAnimRes = dComIfG_getObjectRes(arcName, soundFileIdx);
}
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileidx);
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileIdx);
pMorf->setAnm((J3DAnmTransform*)pAnimRes, loopMode, morf, speed, 0.0f, -1.0f, pSoundAnimRes);
ret = true;
@@ -560,15 +560,15 @@ u16 fopNpc_npc_c::talk(int param_1) {
return mode;
}
bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileidx, int soundFileIdx, const char* arcName) {
bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName) {
if(0 <= soundFileIdx) {
void* pSoundAnimRes = dComIfG_getObjectRes(arcName, soundFileIdx);
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileidx);
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileIdx);
pMorf->setAnm((J3DAnmTransform*)pAnimRes, loopMode, morf, speed, 0.0f, -1.0f, pSoundAnimRes);
}
else {
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileidx);
void* pAnimRes = dComIfG_getObjectRes(arcName, animFileIdx);
pMorf->setAnm((J3DAnmTransform*)pAnimRes, loopMode, morf, speed, 0.0f, -1.0f, 0);
}
@@ -800,7 +800,7 @@ void dNpc_EventCut_c::cutTurnToActorStart() {
mSetId = 0;
}
Vec* pos = dComIfGp_evmng_getMyVec3dP(mEvtStaffId, "OffsetPos");
Vec* pos = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "OffsetPos");
if(pos) {
mOffsetPos = *pos;
}
@@ -930,7 +930,7 @@ void dNpc_EventCut_c::cutMoveToActorStart() {
u32* set = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "SetId");
f32* speed = dComIfGp_evmng_getMyFloatP(mEvtStaffId, "Speed");
f32* dist = dComIfGp_evmng_getMyFloatP(mEvtStaffId, "DelDistance");
Vec* offs = dComIfGp_evmng_getMyVec3dP(mEvtStaffId, "OffsetPos");
Vec* offs = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "OffsetPos");
u32* attn = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "Attention");
u32* noTurn = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "NoTurn");
u32* angle = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "ShapeAngle");
@@ -1077,7 +1077,7 @@ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData)
}
void dNpc_EventCut_c::cutTurnToPosStart() {
Vec* pos = dComIfGp_evmng_getMyVec3dP(mEvtStaffId, "Pos");
Vec* pos = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "Pos");
if(pos) {
mPos = *pos;
}
@@ -1163,7 +1163,7 @@ void dNpc_EventCut_c::cutTurnToPosProc() {
}
void dNpc_EventCut_c::cutMoveToPosStart() {
Vec* pos = dComIfGp_evmng_getMyVec3dP(mEvtStaffId, "Pos");
Vec* pos = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "Pos");
f32* speed = dComIfGp_evmng_getMyFloatP(mEvtStaffId, "Speed");
f32* dist = dComIfGp_evmng_getMyFloatP(mEvtStaffId, "DelDistance");
u32* attn = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "Attention");
src/m_Do/m_Do_ext.cpp
+1 -1
View File
@@ -1342,7 +1342,7 @@ void mDoExt_McaMorf::setMorf(f32 param_0) {
}
/* 8001300C-800130D0 .text play__14mDoExt_McaMorfFP3VecUlSc */
void mDoExt_McaMorf::play(Vec*, u32, s8) {
bool mDoExt_McaMorf::play(Vec*, u32, s8) {
/* Nonmatching */
}