diff --git a/include/common.h b/include/common.h index 46440f7..9454509 100644 --- a/include/common.h +++ b/include/common.h @@ -139,7 +139,7 @@ extern OSPiHandle* CART_HANDLE; extern OSMesgQueue MQ_800E7988; -extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS]; +extern OSContPad obContData[MAXCONTROLLERS]; extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index b1e966f..3224b67 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -1023,7 +1023,7 @@ __ROM_0_to_8000 = 0x800A83B8; // rom:0x387B8 romCopy_256 = 0x80074CF0; // rom:0x50F0 -__GLOBAL_CONTROLLER_DATA_COPY = 0x0800AEE78; // size:0x18 +obContData = 0x0800AEE78; // size:0x18 __calls_copy_controller_data = 0x8007297C; diff --git a/src/main.c b/src/main.c index d480deb..d899c02 100644 --- a/src/main.c +++ b/src/main.c @@ -210,7 +210,7 @@ loop_2: var_t0 += 1; var_a2 += 0x10; } while (var_t0 < 4); - bzero(__GLOBAL_CONTROLLER_DATA_COPY, sizeof(__GLOBAL_CONTROLLER_DATA_COPY)); + bzero(obContData, sizeof(obContData)); } void obReadController(u16 __unused) {