mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-27 14:39:20 -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:
@@ -8,7 +8,7 @@
|
||||
#include "global.h"
|
||||
|
||||
#if PLATFORM_WII
|
||||
#include "m_Do/m_Re_controller_pad.h"
|
||||
#include "m_Re/m_Re_controller_pad.h"
|
||||
#endif
|
||||
|
||||
void cAPICPad_recalibrate() {
|
||||
@@ -113,7 +113,7 @@ f32 cAPICPad_X_STICK(u32 i_padNo) {
|
||||
}
|
||||
|
||||
f32 cAPICPad_X_STICK_3D(u32 i_padNo) {
|
||||
return mReCPd::getPad(i_padNo).m_stick3D;
|
||||
return mReCPd::getPad(i_padNo).m_stick3D.x;
|
||||
}
|
||||
|
||||
f32 cAPICPad_Y_STICK(u32 i_padNo) {
|
||||
|
||||
Reference in New Issue
Block a user