diff --git a/include/common.h b/include/common.h index 6ca3961..0630e59 100644 --- a/include/common.h +++ b/include/common.h @@ -138,7 +138,6 @@ extern OSMesgQueue MQ_800E7988; extern s32 D_800C4B30; -extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS]; extern void (*D_800A9FE0)(s16); extern OSContPad __GLOBAL_CONTROLLER_DATA[MAXCONTROLLERS]; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index e682125..39e45d5 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -36,6 +36,7 @@ nuContWaitMesgBuf = 0x800BE190; nuContDataMutexQ = 0x800E9BF0; nuContDataMutexBuf = 0x800BE194; nuContCallBack = 0x800A9FF8; +nuContStatus = 0x800C4B38; // size:0x10 type:u32 nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -771,7 +772,6 @@ __MENU_INDEX = 0x801BA94C; __GLOBAL_WITH__inc_menu_timer = 0x8018FB20; -__GLOBAL_CONT_STATUS = 0x800C4B38; // size:0x10 type:u32 __set_fp_8008A660 = 0x8008A660; diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c index dd48ac2..912bac1 100644 --- a/src/_ob_prized_reading.c +++ b/src/_ob_prized_reading.c @@ -21,8 +21,8 @@ u8 nuContMgrInit(void) { var_v1 = 0; obStackMain = 0; for(; var_v1 < MAXCONTROLLERS; var_v1++) { - if (__GLOBAL_CONT_STATUS[var_v1].errno == 0) { - if ((__GLOBAL_CONT_STATUS[var_v1].type & CONT_TYPE_MASK) == CONT_TYPE_NORMAL) { + if (nuContStatus[var_v1].errno == 0) { + if ((nuContStatus[var_v1].type & CONT_TYPE_MASK) == CONT_TYPE_NORMAL) { var_a1 |= var_a0; obStackMain += 1; } @@ -71,7 +71,7 @@ s32 __real_read_controller(void) { var_v0 = osContStartQuery(&nuSiMesgQ); if (var_v0 == 0) { osRecvMesg(&nuSiMesgQ, NULL, OS_MESG_BLOCK); - osContGetQuery(__GLOBAL_CONT_STATUS); + osContGetQuery(nuContStatus); return 0; } else { return var_v0;