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

Rename `MQ_800C4A00` to `nuContWaitMesgQ`

This commit is contained in:
gijs 2023-10-20 19:41:07 +02:00
parent bc821ded12
commit 2a951738a0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common.h
View File

@ -142,7 +142,6 @@ extern u8 D_800A9FF8;
extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS]; extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS];
extern void (*D_800A9FE0)(s16); extern void (*D_800A9FE0)(s16);
extern OSMesgQueue MQ_800C4A00;
extern OSContPad __GLOBAL_CONTROLLER_DATA[MAXCONTROLLERS]; extern OSContPad __GLOBAL_CONTROLLER_DATA[MAXCONTROLLERS];
extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS]; extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS];

2
linker_scripts/symbols/addr.txt
View File

@ -31,6 +31,7 @@ nuStackIdle = 0x800B17A0;
nuPiCartHandle = 0x800E7A20; nuPiCartHandle = 0x800E7A20;
nuPiMgrMesgQ = 0x800BE030; nuPiMgrMesgQ = 0x800BE030;
nuPiMesgBuf = 0x800BE048; nuPiMesgBuf = 0x800BE048;
nuContWaitMesgQ = 0x800C4A00;
nuBoot = 0x8007F880; nuBoot = 0x8007F880;
nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@ -915,7 +916,6 @@ __MUS_MEM_800B1868 = 0x800B1868;
MQ_SWAP_BUFFER = 0x800E9BA8; MQ_SWAP_BUFFER = 0x800E9BA8;
MQ_800E7988 = 0x800E7988; MQ_800E7988 = 0x800E7988;
MQ_800C4A00 = 0x800C4A00;
MQ_800E9BF0 = 0x800E9BF0; MQ_800E9BF0 = 0x800E9BF0;
MQ_800C35A0 = 0x800C35A0; MQ_800C35A0 = 0x800C35A0;
MQ_800AF320 = 0x800AF320; MQ_800AF320 = 0x800AF320;

8
src/_ob_prized_reading.c
View File

@ -14,7 +14,7 @@ u8 nuContMgrInit(void) {
s32 var_v1; s32 var_v1;
nuContDataUnLock(); nuContDataUnLock();
osCreateMesgQueue(&MQ_800C4A00, &OSMESG_800BE190, 1); osCreateMesgQueue(&nuContWaitMesgQ, &OSMESG_800BE190, 1);
osCreateMesgQueue(&MQ_800E9BF0, &OSMESG_800BE194, 1); osCreateMesgQueue(&MQ_800E9BF0, &OSMESG_800BE194, 1);
nuSiCallBackAdd(&D_800A9FF8); nuSiCallBackAdd(&D_800A9FF8);
nuContQueryRead(); nuContQueryRead();
@ -84,12 +84,12 @@ s32 __real_read_controller(void) {
s32 __calls_read_controller_0(s16* arg0) { s32 __calls_read_controller_0(s16* arg0) {
if (D_800C4B30 == 0) { if (D_800C4B30 == 0) {
osRecvMesg(&MQ_800C4A00, NULL, 0); osRecvMesg(&nuContWaitMesgQ, NULL, 0);
__read_controller(__GLOBAL_CONTROLLER_DATA, 1); __read_controller(__GLOBAL_CONTROLLER_DATA, 1);
if (D_800A9FE0 != NULL) { if (D_800A9FE0 != NULL) {
D_800A9FE0(*arg0); D_800A9FE0(*arg0);
} }
osSendMesg(&MQ_800C4A00, NULL, 0); osSendMesg(&nuContWaitMesgQ, NULL, 0);
} }
return 0; return 0;
} }
@ -106,7 +106,7 @@ void __calls_read_controller_1(Arg___calls_read_controller_1* arg) {
s32 __calls_read_controller_2(s16* arg0) { s32 __calls_read_controller_2(s16* arg0) {
s32 var_v0; s32 var_v0;
osRecvMesg(&MQ_800C4A00, NULL, 0); osRecvMesg(&nuContWaitMesgQ, NULL, 0);
var_v0 = __read_controller(__GLOBAL_CONTROLLER_DATA, 0); var_v0 = __read_controller(__GLOBAL_CONTROLLER_DATA, 0);
if (var_v0 == 0) { if (var_v0 == 0) {
if (D_800A9FE0 != NULL) { if (D_800A9FE0 != NULL) {