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

Rename `func_8007AB7C` to `obSendUnpackMesg`

This commit is contained in:
gijs 2023-10-19 19:30:19 +02:00
parent a5afbd93be
commit a34eed808c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker_scripts/symbols/addr.txt
View File

@ -3,6 +3,8 @@ obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0
obGetCurrentTime = 0x8009C7CC; // rom:0x2CBCC obGetCurrentTime = 0x8009C7CC; // rom:0x2CBCC
obGetCurrentTimeF = 0x8007FD10; // rom:0x10110 obGetCurrentTimeF = 0x8007FD10; // rom:0x10110
obSendUnpackMesg = 0x8007AB7C; // rom:0xAF7C
fchar = 0x800AEA80; // rom:0x3EE80 fchar = 0x800AEA80; // rom:0x3EE80
_Printf = 0x80099BE0; // rom:0x29FE0 _Printf = 0x80099BE0; // rom:0x29FE0
_Putfld = 0x8009A160; // rom:0x2A560 _Putfld = 0x8009A160; // rom:0x2A560

18
src/_ob_rabid_jar.c
View File

@ -448,24 +448,24 @@ INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007A80C);
INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007AB30); INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007AB30);
/* AF7C 8007AB7C */ /* AF7C 8007AB7C */
void func_8007AB7C(OBUnpackMesg* arg0) { void obSendUnpackMesg(OBUnpackMesg* msg) {
arg0->format = 1; msg->format = 1;
osSendMesg(&MQ_800AF320, arg0, 1); osSendMesg(&MQ_800AF320, msg, 1);
} }
INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007ABAC); INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007ABAC);
/* B030 8007AC30 */ /* B030 8007AC30 */
void UnpackProc(void) { void UnpackProc(void) {
OBUnpackMesg *pack = NULL; OBUnpackMesg *msg = NULL;
while(1) { while(1) {
osRecvMesg(&MQ_800AF320, (OSMesg)&pack, 1); osRecvMesg(&MQ_800AF320, (OSMesg)&msg, 1);
if (pack->format == 1) { if (msg->format == 1) {
Unpack(pack->field_0x10, pack->field_0xc); Unpack(msg->field_0x10, msg->field_0xc);
osSendMesg(pack->queue, pack, OS_MESG_BLOCK); osSendMesg(msg->queue, msg, OS_MESG_BLOCK);
} else { } else {
osSyncPrintf("UnpackProc: no supported format %d\n", pack->format); osSyncPrintf("UnpackProc: no supported format %d\n", msg->format);
} }
} }
} }