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
+4 -4
View File
@@ -395,7 +395,7 @@ int daE_HM_c::W_MoveCheckWall() {
dComIfG_Bgsp().GetTriPla(linChk, &plane1);
if (!dComIfG_Bgsp().GetMagnetCode(linChk)) {
field_0x5b4 += (s16)0x200;
ANGLE_ADD(field_0x5b4, 0x200);
return 1;
}
@@ -438,7 +438,7 @@ int daE_HM_c::W_WallCheck() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(linChk, &plane);
if (!dComIfG_Bgsp().GetMagnetCode(linChk)) {
field_0x5b4 += (s16)0x200;
ANGLE_ADD(field_0x5b4, 0x200);
return 1;
}
}
@@ -841,7 +841,7 @@ void daE_HM_c::DeathMotion() {
f32 frame = mAnm_p->getFrame();
if (mAcch.ChkGroundHit() && (field_0x5da++, field_0x5da) == 1) {
speed.y = yREG_F(11) + 35.0f;
current.angle.y -= (s16)0x1000;
ANGLE_SUB(current.angle.y, 0x1000);
SetAnm(8, 0, nREG_F(9) + 1.0f, nREG_F(12) + 1.0f);
mAnm_p->setPlaySpeed(yREG_F(12) + 2.0f);
}
@@ -1075,7 +1075,7 @@ void daE_HM_c::At_Check() {
}
if ((s16)mAtInfo.mAttackPower > 0) {
health -= (s16)mAtInfo.mAttackPower;
S16_SUB(health, mAtInfo.mAttackPower);
}
s8 unkByte1 = 0;