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:
Luke Street
2026-02-28 13:28:42 -07:00
3803 changed files with 240344 additions and 16831 deletions
+5 -4
View File
@@ -17,6 +17,7 @@
#if DEBUG
#include "JSystem/JHostIO/JORFile.h"
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
enum Aru_RES_File_ID {
@@ -1402,19 +1403,19 @@ int daNpc_Aru_c::duck(int param_1) {
switch (field_0xfca) {
case 1:
sVar1 -= (s16) 0x1000;
ANGLE_SUB(sVar1, 0x1000);
break;
case 7:
sVar1 += (s16) 0x1000;
ANGLE_ADD(sVar1, 0x1000);
break;
case 2:
sVar1 -= (s16) 0x4000;
ANGLE_SUB(sVar1, 0x4000);
break;
case 6:
sVar1 += (s16) 0x4000;
ANGLE_ADD(sVar1, 0x4000);
break;
}