diff --git a/include/common.h b/include/common.h index 092f5c6..766ce40 100644 --- a/include/common.h +++ b/include/common.h @@ -163,9 +163,6 @@ extern void __calls_osViBlack(bool black); extern void __osViSwapBuffer_3(void** buffers); -extern void __start_copy_global_controller_data(void); -extern void __end_copy_global_controller_data(void); - extern s32 __read_controller(OSContPad* data, u32 flags); extern s32 __real_read_controller(void); extern s32 __calls_read_controller_0(s16* arg0); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 4e086a5..7af86cd 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -81,6 +81,8 @@ nuContDataUnLock = 0x8008A5D0; nuSiCallBackAdd = 0x8008B130; nuContMgrRemove = 0x8008A334; nuSiCallBackRemove = 0x8008B1D0; +nuContDataClose = 0x8008A354; +nuContDataOpen = 0x8008A37C; obCurrentTime = 0x800C47D0; @@ -990,8 +992,6 @@ __GLOBAL_CONTROLLER_DATA_COPY = 0x0800AEE78; // size:0x18 __calls_copy_controller_data = 0x8007297C; __copy_global_controller_data = 0x8008A600; -__start_copy_global_controller_data = 0x8008A354; -__end_copy_global_controller_data = 0x8008A37C; __read_controller = 0x8008A3A4; __calls_read_controller_0 = 0x8008A47C; __calls_read_controller_1 = 0x8008A508; diff --git a/src/_ob_classy_fold.c b/src/_ob_classy_fold.c index 73e6019..8ab7e6b 100644 --- a/src/_ob_classy_fold.c +++ b/src/_ob_classy_fold.c @@ -3,9 +3,9 @@ #include "nu/nusys.h" void __copy_global_controller_data(OSContPad* arg0) { - __start_copy_global_controller_data(); + nuContDataClose(); bcopy(&__GLOBAL_CONTROLLER_DATA, arg0, 0x18); - __end_copy_global_controller_data(); + nuContDataOpen(); } void nuContQueryRead(void) { diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c index 08aede4..79a4519 100644 --- a/src/_ob_prized_reading.c +++ b/src/_ob_prized_reading.c @@ -37,11 +37,11 @@ void nuContMgrRemove(void) { nuSiCallBackRemove(&nuContCallBack); } -void __start_copy_global_controller_data(void) { +void nuContDataClose(void) { osSendMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); } -void __end_copy_global_controller_data(void) { +void nuContDataOpen(void) { osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); }