From 1f79bf2bb245c587756b1ae85b1e6bee55a1fb8c Mon Sep 17 00:00:00 2001 From: gijs Date: Sun, 22 Oct 2023 13:47:25 +0200 Subject: [PATCH] Rename `__real_read_controller` to `nuContQueryImpl` --- include/common.h | 2 -- linker_scripts/symbols/addr.txt | 2 +- src/nu/nucontmgr.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index e81eefb..98e49e2 100644 --- a/include/common.h +++ b/include/common.h @@ -159,8 +159,6 @@ extern void __calls_osViBlack(bool black); extern void __osViSwapBuffer_3(void** buffers); -extern s32 __real_read_controller(void); - extern void func_8008A354(); extern void func_8008A37C(); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 71f1db0..19022b7 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -127,6 +127,7 @@ nuContPakRepairId = 0x8008AC70; nuContReadDataImpl = 0x8008A3A4; nuContReadImpl = 0x8008A508; nuContReadNWImpl = 0x8008A528; +nuContQueryImpl = 0x8008A42C; obUnpackThreadStart = 0x8007ABAC; @@ -955,7 +956,6 @@ osViModeNtscLan1 = 0x800AB960; osUnmapTLBAll = 0x8009AB00; osMapTLBRdb = 0x8009AAA0; -__real_read_controller = 0x8008A42C; __calls_romCopy_8009DA50 = 0x8009DA50; __calls_romCopy_8009DAF4 = 0x8009DAF4; __calls_romCopy_8009DBB8 = 0x8009DBB8; diff --git a/src/nu/nucontmgr.c b/src/nu/nucontmgr.c index 58b2891..e418001 100644 --- a/src/nu/nucontmgr.c +++ b/src/nu/nucontmgr.c @@ -63,7 +63,7 @@ s32 nuContReadDataImpl(OSContPad* data, u32 flags) { return 0; } -s32 __real_read_controller(void) { +s32 nuContQueryImpl(void) { s32 var_v0; var_v0 = osContStartQuery(&nuSiMesgQ);