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

Rename `_ob_dull_silver.c` to `nucontpakmgr.c` 

Rename `func_8008A6A0` to `nuContPakMgrInit`
Rename `func_8008A6C0` to `nuContPakMgrRemove`
Rename `D_800AA040` to `nuContPakCallBack`
This commit is contained in:
gijs 2023-10-21 18:09:21 +02:00
parent 30721ffd6c
commit d4b40689b4
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common.h
View File

@ -137,7 +137,6 @@ extern OSMesgQueue MQ_800E7988;
extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS]; extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS];
extern u8 D_800AA040;
extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers); extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers);
extern u8 SP_THREAD_800BE1C0[1]; extern u8 SP_THREAD_800BE1C0[1];

3
linker_scripts/symbols/addr.txt
View File

@ -41,6 +41,7 @@ nuContNum = 0x800C6D60;
nuContDataLockKey = 0x800C4B30; nuContDataLockKey = 0x800C4B30;
nuContData = 0x0800C4BF0; // size:0x18 nuContData = 0x0800C4BF0; // size:0x18
nuContReadFunc = 0x800A9FE0; nuContReadFunc = 0x800A9FE0;
nuContPakCallBack = 0x800AA040;
nuBoot = 0x8007F880; nuBoot = 0x8007F880;
nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@ -90,6 +91,8 @@ nuContDataOpen = 0x8008A37C;
nuContDataGetAll = 0x8008A600; nuContDataGetAll = 0x8008A600;
nuContRetrace = 0x8008A47C; nuContRetrace = 0x8008A47C;
nuContReadFuncSet = 0x8008A660; nuContReadFuncSet = 0x8008A660;
nuContPakMgrInit = 0x8008A6A0;
nuContPakMgrRemove = 0x8008A6C0;
obCurrentTime = 0x800C47D0; obCurrentTime = 0x800C47D0;

2
splat.yaml
View File

@ -131,7 +131,7 @@ segments:
- [0x1AA00, c, "nu/nucontdatagetall"] - [0x1AA00, c, "nu/nucontdatagetall"]
- [0x1AA40, c, "nu/nucontqueryread"] - [0x1AA40, c, "nu/nucontqueryread"]
- [0x1AA60, c, "nu/nucontreadfuncset"] - [0x1AA60, c, "nu/nucontreadfuncset"]
- [0x1AAA0, c, "_ob_dull_silver"] - [0x1AAA0, c, "nu/nucontpakmgr"]
- [0x1AD10, asm] - [0x1AD10, asm]
- [0x1AFD0, asm] - [0x1AFD0, asm]
- [0x1B030, asm] - [0x1B030, asm]

28
src/_ob_dull_silver.c
View File

@ -1,28 +0,0 @@
#include "common.h"
#include "nu/nusys.h"
void func_8008A6A0(void) {
nuSiCallBackAdd(&D_800AA040);
}
void func_8008A6C0(void) {
nuSiCallBackRemove(&D_800AA040);
}
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A6E0);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A730);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A758);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A798);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A850);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A890);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8BC);
INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8E8);

28
src/nu/nucontpakmgr.c Normal file
View File

@ -0,0 +1,28 @@
#include "common.h"
#include "nu/nusys.h"
void nuContPakMgrInit(void) {
nuSiCallBackAdd(&nuContPakCallBack);
}
void nuContPakMgrRemove(void) {
nuSiCallBackRemove(&nuContPakCallBack);
}
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A6E0);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A730);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A758);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A798);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A850);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A890);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A8BC);
INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A8E8);