mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-20 13:24:40 -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:
@@ -425,7 +425,7 @@ static void joint_control(mant_class* i_this, mant_j_s* param_2, int param_3, f3
|
||||
sp08 *= -1;
|
||||
}
|
||||
|
||||
sp08 *= (s16)(-4000 + VREG_S(5));
|
||||
ANGLE_MULT(sp08, -4000 + VREG_S(5));
|
||||
spFC.x = 0.0f;
|
||||
spFC.y = 0.0f;
|
||||
spFC.z = i_this->field_0x394c;
|
||||
@@ -438,7 +438,7 @@ static void joint_control(mant_class* i_this, mant_j_s* param_2, int param_3, f3
|
||||
spB4 = spC0 * (d_p[sp34 - 1] + NREG_F(sp34));
|
||||
|
||||
sp18 = i_this->field_0x3958;
|
||||
sp18 *= 1.0f + VREG_F(0) - sp34 * (0.07f + VREG_F(1));
|
||||
sp18 *= 1.0f + VREG_F(0) - sp34 * (0.07f + VREG_F(1));
|
||||
|
||||
sp84.zero();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user