mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-27 00:45:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes (#2830)

Browse Source 
* Replace DANPCF_C_HACK with a better fakematch

* d_a_obj_item OK

* Fix ninja diff

* Misc debug/nonmatching fixes

* Fix ninja diff for PAL

* Fix bad PAL split
This commit is contained in:
LagoLunatic
2025-11-19 17:10:03 -05:00
committed by GitHub
parent 8956be538e
commit 4cf2c7e37d
35 changed files with 187 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_ws.cpp
+11 -4
View File
@@ -198,17 +198,24 @@ int daE_WS_c::checkPlayerPos() {
}
/* 807E4568-807E470C 000C48 01A4+00 1/1 0/0 0/0 .text checkAttackEnd__8daE_WS_cFv */
// NONMATCHING
bool daE_WS_c::checkAttackEnd() {
cXyz player_pos;
mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0));
mDoMtx_stack_c::multVecZero(&player_pos);
if (!(daPy_getPlayerActorClass()->checkClimbMove() ||
BOOL r30 = false;
if (
daPy_getPlayerActorClass()->checkClimbMove() ||
dComIfGp_checkPlayerStatus1(0, 0x02000000) ||
dComIfGp_checkPlayerStatus1(0, 0x10000) ||
calcTargetDist(current.pos, player_pos) < 200.0f) ||
(!checkInSearchRange(current.pos, field_0x65c) || checkBeforeBg(shape_angle.y)))
calcTargetDist(current.pos, player_pos) < 200.0f
) {
r30 = true;
}
if (!r30 ||
!checkInSearchRange(current.pos, field_0x65c) ||
checkBeforeBg(shape_angle.y)
)
{
setActionMode(ACTION_WAIT_e);
speedF = 0.0f;