gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `__start_copy_global_controller_data` to `nuContDataClose` and `__end_copy_global_controller_data` to `nuContDataOpen`

This commit is contained in:
gijs 2023-10-20 21:20:36 +02:00
parent 92fd0c2213
commit 6499c2fe8f
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common.h
View File

@ -163,9 +163,6 @@ extern void __calls_osViBlack(bool black);
extern void __osViSwapBuffer_3(void** buffers); 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 __read_controller(OSContPad* data, u32 flags);
extern s32 __real_read_controller(void); extern s32 __real_read_controller(void);
extern s32 __calls_read_controller_0(s16* arg0); extern s32 __calls_read_controller_0(s16* arg0);

4
linker_scripts/symbols/addr.txt
View File

@ -81,6 +81,8 @@ nuContDataUnLock = 0x8008A5D0;
nuSiCallBackAdd = 0x8008B130; nuSiCallBackAdd = 0x8008B130;
nuContMgrRemove = 0x8008A334; nuContMgrRemove = 0x8008A334;
nuSiCallBackRemove = 0x8008B1D0; nuSiCallBackRemove = 0x8008B1D0;
nuContDataClose = 0x8008A354;
nuContDataOpen = 0x8008A37C;
obCurrentTime = 0x800C47D0; obCurrentTime = 0x800C47D0;
@ -990,8 +992,6 @@ __GLOBAL_CONTROLLER_DATA_COPY = 0x0800AEE78; // size:0x18
__calls_copy_controller_data = 0x8007297C; __calls_copy_controller_data = 0x8007297C;
__copy_global_controller_data = 0x8008A600; __copy_global_controller_data = 0x8008A600;
__start_copy_global_controller_data = 0x8008A354;
__end_copy_global_controller_data = 0x8008A37C;
__read_controller = 0x8008A3A4; __read_controller = 0x8008A3A4;
__calls_read_controller_0 = 0x8008A47C; __calls_read_controller_0 = 0x8008A47C;
__calls_read_controller_1 = 0x8008A508; __calls_read_controller_1 = 0x8008A508;

4
src/_ob_classy_fold.c
View File

@ -3,9 +3,9 @@
#include "nu/nusys.h" #include "nu/nusys.h"
void __copy_global_controller_data(OSContPad* arg0) { void __copy_global_controller_data(OSContPad* arg0) {
__start_copy_global_controller_data(); nuContDataClose();
bcopy(&__GLOBAL_CONTROLLER_DATA, arg0, 0x18); bcopy(&__GLOBAL_CONTROLLER_DATA, arg0, 0x18);
__end_copy_global_controller_data(); nuContDataOpen();
} }
void nuContQueryRead(void) { void nuContQueryRead(void) {

4
src/_ob_prized_reading.c
View File

@ -37,11 +37,11 @@ void nuContMgrRemove(void) {
nuSiCallBackRemove(&nuContCallBack); nuSiCallBackRemove(&nuContCallBack);
} }
void __start_copy_global_controller_data(void) { void nuContDataClose(void) {
osSendMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); osSendMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK);
} }
void __end_copy_global_controller_data(void) { void nuContDataOpen(void) {
osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK);
} }