diff --git a/include/common.h b/include/common.h index e139eec..e81eefb 100644 --- a/include/common.h +++ b/include/common.h @@ -159,7 +159,6 @@ extern void __calls_osViBlack(bool black); extern void __osViSwapBuffer_3(void** buffers); -extern s32 __read_controller(OSContPad* data, u32 flags); extern s32 __real_read_controller(void); extern void func_8008A354(); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 497c4f3..a0909d8 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -124,6 +124,7 @@ nuContPakFileDelete = 0x8008AEE0; nuContPakFileState = 0x8008AF20; nuContPakRepairId = 0x8008AC70; +nuContReadDataImpl = 0x8008A3A4; obUnpackThreadStart = 0x8007ABAC; obThreadUnpackProc = 0x800AF0D0; // size:0x1B0 @@ -1034,7 +1035,6 @@ romCopy_256 = 0x80074CF0; // rom:0x50F0 __GLOBAL_CONTROLLER_DATA_COPY = 0x0800AEE78; // size:0x18 __calls_copy_controller_data = 0x8007297C; -__read_controller = 0x8008A3A4; __calls_read_controller_1 = 0x8008A508; __calls_read_controller_2 = 0x8008A528; diff --git a/src/nu/nucontmgr.c b/src/nu/nucontmgr.c index 06854ea..df0ce61 100644 --- a/src/nu/nucontmgr.c +++ b/src/nu/nucontmgr.c @@ -45,7 +45,7 @@ void nuContDataOpen(void) { osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); } -s32 __read_controller(OSContPad* data, u32 flags) { +s32 nuContReadDataImpl(OSContPad* data, u32 flags) { s32 res; res = osContStartReadData(&nuSiMesgQ); @@ -83,7 +83,7 @@ s32 nuContRetrace(NUSiCommonMesg* mesg) { osRecvMesg(&nuContWaitMesgQ, NULL, OS_MESG_NOBLOCK); - __read_controller(nuContData, 1); + nuContReadDataImpl(nuContData, 1); if(nuContReadFunc != NULL) { nuContReadFunc(mesg->mesg); @@ -100,14 +100,14 @@ typedef struct { } Arg___calls_read_controller_1; void __calls_read_controller_1(Arg___calls_read_controller_1* arg) { - __read_controller(arg->data, 0); + nuContReadDataImpl(arg->data, 0); } s32 __calls_read_controller_2(s16* arg0) { s32 var_v0; osRecvMesg(&nuContWaitMesgQ, NULL, 0); - var_v0 = __read_controller(nuContData, 0); + var_v0 = nuContReadDataImpl(nuContData, 0); if (var_v0 == 0) { if (nuContReadFunc != NULL) { nuContReadFunc(*arg0);