mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge decomp/main into dusk

Browse Source 
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:
Luke Street
2026-02-28 13:28:42 -07:00
parent 819f59c1c7 ebe7c7aabc
commit 32c32a73ca
3803 changed files with 240344 additions and 16831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_ymb.cpp
+4 -4
View File
@@ -902,16 +902,16 @@ void daE_YMB_c::executeFly() {
if (fVar1 > 1800.0f) {
adj_angle = playerAngleY + 0x8000 + cM_rndFX(2048.0f);
if ((s16)(cLib_targetAngleY(&current.pos, &field_0x69c) - playerAngleY) > 0) {
adj_angle -= (s16) 0x1800;
ANGLE_SUB(adj_angle, 0x1800);
} else {
adj_angle += (s16) 0x1800;
ANGLE_ADD(adj_angle, 0x1800);
}
} else {
adj_angle = playerAngleY + 0x8000 + cM_rndFX(2048.0f);
if (cM_rnd() < 0.5f) {
adj_angle += (s16) 0x1800;
ANGLE_ADD(adj_angle, 0x1800);
} else {
adj_angle -= (s16) 0x1800;
ANGLE_SUB(adj_angle, 0x1800);
}
}
}