mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 12:39:27 -04:00
Merge decomp/main into dusk
Merges 44 upstream commits from zeldaret/tp decomp/main. Conflict resolutions: - .github/workflows/build.yml: keep deleted (not needed for PC port) - README.md: keep PC port README - J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl - J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c - d_com_inf_game.h: keep PC port inlines + add upstream declarations - global.h: keep MULTI_CHAR macro + add FABSF macro - JUTConsole.cpp: keep uintptr_t cast for 64-bit - JUTDbPrint.cpp: keep PC enter_() helper + add cstring include - JUTResFont.cpp: take upstream loop/struct improvements with BE types - JUTCacheFont.cpp: take upstream decomp fix - float.h: use upstream !PLATFORM_GCN guard - d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability - d_a_npc_henna.cpp: keep uintptr_t + use upstream var name - d_demo.cpp: keep near_/far_ field renames for PC - d_resorce.cpp: keep uintptr_t + fix var name to res - d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring - m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT - angle_utils.h: remove redundant types.h include
This commit is contained in:
@@ -590,7 +590,7 @@ void daB_DS_c::mZsMoveChk() {
|
||||
}
|
||||
|
||||
angle_y = fopAcM_searchPlayerAngleY(this);
|
||||
angle_y += (s16)cM_rndFX(0x2000);
|
||||
ANGLE_ADD(angle_y, cM_rndFX(0x2000));
|
||||
}
|
||||
|
||||
if (!daPy_getPlayerActorClass()->checkSpinnerRide() || mAction == ACT_DAMAGE ||
|
||||
@@ -1044,7 +1044,7 @@ void daB_DS_c::neck_set() {
|
||||
angl.x = -mae.atan2sY_XZ() * 2.0f;
|
||||
if (mAction == ACT_BREATH_ATTACK) {
|
||||
angl.x = mBh2AttackAngleF;
|
||||
angl.x += (s16)(mBackboneLevel * 200);
|
||||
ANGLE_ADD(angl.x, mBackboneLevel * 200);
|
||||
}
|
||||
|
||||
if (angl.x > 0x2000) {
|
||||
@@ -5156,7 +5156,7 @@ int daB_DS_c::execute() {
|
||||
|
||||
if (!mIsOpeningDemo) {
|
||||
s16 hand_x_ang_target = -6000;
|
||||
hand_x_ang_target += (s16)(mBackboneLevel * 1000);
|
||||
ANGLE_ADD(hand_x_ang_target, mBackboneLevel * 1000);
|
||||
if (handX_ang > -4000) {
|
||||
handX_ang = -4000;
|
||||
}
|
||||
@@ -5178,7 +5178,7 @@ int daB_DS_c::execute() {
|
||||
}
|
||||
|
||||
if (jnt_pos.y < chk_pos.y) {
|
||||
handL_ang += (s16)(fabsf(jnt_pos.y - chk_pos.y) * 10.0f);
|
||||
ANGLE_ADD(handL_ang, fabsf(jnt_pos.y - chk_pos.y) * 10.0f);
|
||||
var_r25 = true;
|
||||
|
||||
if (field_0x84d & 1) {
|
||||
@@ -5201,7 +5201,7 @@ int daB_DS_c::execute() {
|
||||
}
|
||||
|
||||
if (jnt_pos.y < chk_pos.y) {
|
||||
handR_ang += (s16)(fabsf(jnt_pos.y - chk_pos.y) * 10.0f);
|
||||
ANGLE_ADD(handR_ang, fabsf(jnt_pos.y - chk_pos.y) * 10.0f);
|
||||
var_r25 = true;
|
||||
if (field_0x84d & 2) {
|
||||
if ((int)mpMorf->getFrame() >= 34 && (int)mpMorf->getFrame() < 41) {
|
||||
|
||||
Reference in New Issue
Block a user