npc_wrestler dbg work (#2795)

This commit is contained in:
YunataSavior
2025-11-10 19:52:59 -08:00
committed by GitHub
parent 23a1c94063
commit 70272b88f5
9 changed files with 590 additions and 337 deletions
@@ -42,6 +42,11 @@ inline float tan(float num) {
inline float pow(float x, float y) {
return ::pow(x, y);
}
inline float pow(float x, int y) {
// FIXME: Needs to use powf
return ::pow(x, y);
}
} // namespace std
#endif
@@ -63,6 +63,7 @@ double frexp(double, int*);
double ldexp(double, int);
double modf(double, double*);
double pow(double, double);
float powf(float, float);
double sin(double);
float sinf(float);
double sqrt(double);
@@ -3,4 +3,9 @@
/* 8036C780-8036C7A0 3670C0 0020+00 0/0 3/3 24/24 .text pow */
double pow(double x, double y) {
return __ieee754_pow(x, y);
}
}
float powf(float x, float y) {
// FIXME: Is this correct?
return __ieee754_pow(x, y);
}
+2 -4
View File
@@ -3950,7 +3950,7 @@ bool daNpcChat_c::wait(void* param_1) {
if (
dKy_darkworld_check() == 0 && daPy_py_c::checkNowWolf() &&
fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0, 2.0) || mFear
fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0f, 2.0f) || mFear
) {
setAction(&daNpcChat_c::fear);
if (!mFear) {
@@ -3988,8 +3988,7 @@ bool daNpcChat_c::wait(void* param_1) {
setMotion(i_motion, -1.0f, 1);
}
if (mTalkFlag) {
if (dComIfGp_event_getTalkPartner() != this) {
if (mTalkFlag && dComIfGp_event_getTalkPartner() != this) {
if (field_0xe51 == 1) {
setMotion(MOT_SITWAIT_A, -1.0f, 0);
} else if (field_0xe51 == 2) {
@@ -3997,7 +3996,6 @@ bool daNpcChat_c::wait(void* param_1) {
} else {
setMotion(MOT_WAIT_A, -1.0f, 0);
}
}
}
} else if (mTalkFlag) {
mMode = 0;
File diff suppressed because it is too large Load Diff