mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_name work for PAL (#2742)

Browse Source 
* d_name work for PAL

* Fix regressions
This commit is contained in:
hev7
2025-10-18 00:46:07 +01:00
committed by GitHub
parent 9e3d968435
commit 962728ce44
8 changed files with 391 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_kn.cpp
+4 -4
View File
@@ -2340,7 +2340,6 @@ static void* s_subEnd6(void* i_actor, void* i_other) {
/* 80A2FC80-80A30398 005360 0718+00 1/0 0/0 0/0 .text teach06_superJumpWait__10daNpc_Kn_cFPv */
int daNpc_Kn_c::teach06_superJumpWait(void* param_0) {
// NONMATCHING - value comparison not getting optimized
switch (mMode) {
case 0:
case 1:
@@ -2427,7 +2426,7 @@ int daNpc_Kn_c::teach06_superJumpWait(void* param_0) {
}
} else {
if (field_0x15bd == 2 &&
(cut_type != daPy_py_c::CUT_TYPE_LARGE_JUMP && cut_type != daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH))
!(cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP || cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH))
{
mEvtNo = 22;
fpcM_Search(s_subEnd6, this);
@@ -2765,7 +2764,6 @@ static void* s_subEnd7(void* i_actor, void* i_other) {
/* 80A31028-80A315D0 006708 05A8+00 1/0 0/0 0/0 .text teach07_superTurnAttackWait__10daNpc_Kn_cFPv
*/
// NONMATCHING - value comparison not getting optimized
int daNpc_Kn_c::teach07_superTurnAttackWait(void* param_0) {
switch (mMode) {
case 0:
@@ -2837,7 +2835,9 @@ int daNpc_Kn_c::teach07_superTurnAttackWait(void* param_0) {
mSound.startCollisionSE(Z2SE_HIT_SWORD, 0x28);
}
}
} else if (field_0x15bd == 2 && cut_type != daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT && cut_type != daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) {
} else if (field_0x15bd == 2 &&
!(cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT))
{
mEvtNo = 0x19;
fpcM_Search(s_subEnd7, this);
break;