mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 04:31:37 -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:
@@ -2420,8 +2420,8 @@ s16 daMidna_c::getNeckAimAngle(cXyz const* i_atnPos, s16* o_neckX, s16* o_neckY,
|
||||
*o_eyeY = (s16)(sVar8 - sVar2) >> 1;
|
||||
*o_neckX = *o_eyeX;
|
||||
*o_neckY = *o_eyeY;
|
||||
*o_eyeX += (s16)(atn_angle_x - sVar7);
|
||||
*o_eyeY += (s16)(atn_angle_y - sVar8);
|
||||
ANGLE_ADD(*o_eyeX, atn_angle_x - sVar7);
|
||||
ANGLE_ADD(*o_eyeY, atn_angle_y - sVar8);
|
||||
} else {
|
||||
*o_neckX = daAlink_getAlinkActorClass()->getProcNeckX();
|
||||
*o_neckY = daAlink_getAlinkActorClass()->getMidnaProcNeckY();
|
||||
|
||||
Reference in New Issue
Block a user