mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -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:
@@ -13,6 +13,7 @@
|
||||
#include "d/d_s_play.h"
|
||||
#include "f_op/f_op_camera_mng.h"
|
||||
#include "m_Do/m_Do_lib.h"
|
||||
#include <cstring>
|
||||
|
||||
static u8 hio_set;
|
||||
|
||||
@@ -273,10 +274,10 @@ void daObjKAM_c::WallWalk() {
|
||||
field_0x99a.z = -cM_atan2s(normal->x, normYzMag);
|
||||
field_0x99a.x = cM_atan2s(normal->z, normal->y);
|
||||
} else {
|
||||
field_0x990 += (s16)0x100;
|
||||
ANGLE_ADD(field_0x990, 0x100);
|
||||
}
|
||||
} else {
|
||||
field_0x990 += (s16)0x100;
|
||||
ANGLE_ADD(field_0x990, 0x100);
|
||||
}
|
||||
|
||||
cLib_addCalcAngleS2(¤t.angle.y, field_0x990, 0x10, 0x50);
|
||||
@@ -773,7 +774,7 @@ int daObjKAM_c::create() {
|
||||
field_0x9c0 = fopAcM_GetParam(this) & 0xf;
|
||||
if (field_0x9c0 == 2) {
|
||||
field_0x56c = 0;
|
||||
shape_angle.x -= (s16)0x2000;
|
||||
ANGLE_SUB(shape_angle.x, 0x2000);
|
||||
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
|
||||
} else {
|
||||
mDraw = true;
|
||||
|
||||
Reference in New Issue
Block a user