From 6d413974a45278721bb77f095cc534109ab62656 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Feb 2021 09:25:26 +1000 Subject: [PATCH] Attempt to decompile func0000d0a0 --- src/gvars/gvars.c | 18 +++--------------- src/include/gvars/gvars.h | 6 +++--- src/lib/lib_0d0a0.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 4b44f4fd2..fb71ed9b7 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -7358,15 +7358,8 @@ u32 var80094dd8 = 0; u32 var80094ddc = 0; u32 var80094de0 = 0; u32 var80094de4 = 0; -u32 var80094de8 = 0; -u32 var80094dec = 0; -u32 var80094df0 = 0; -u32 var80094df4 = 0; -u32 var80094df8 = 0; -u32 var80094dfc = 0; -u32 var80094e00 = 0; -u32 var80094e04 = 0; -u32 var80094e08 = 0; +u8 var80094de8[0x20] = {0}; +OSMesg var80094e08 = NULL; u32 var80094e0c = 0; u32 var80094e10 = 0; u32 var80094e14 = 0; @@ -7398,12 +7391,7 @@ u32 var80094e78 = 0; u32 var80094e7c = 0; u32 var80094e80 = 0; u32 var80094e84 = 0; -u32 var80094e88 = 0; -u32 var80094e8c = 0; -u32 var80094e90 = 0; -u32 var80094e94 = 0; -u32 var80094e98 = 0; -u32 var80094e9c = 0; +OSMesgQueue var80094e88 = {0}; u32 var80094ea0 = 0; u32 var80094ea4 = 0; u32 var80094ea8 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 30542eb84..327e3d1b5 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -393,9 +393,9 @@ extern OSMesgQueue g_FaultMesgQueue; extern OSMesg g_FaultMesg; extern u32 var80094ae0; extern u32 var80094ae8; -extern u32 var80094de8; -extern u32 var80094e08; -extern u32 var80094e88; +extern u8 var80094de8[0x20]; +extern OSMesg var80094e08; +extern OSMesgQueue var80094e88; extern u32 var80094ea0; extern u32 var80094ea4; extern u32 var80094ea8; diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index 72a73fde9..a4832a976 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -43,6 +43,20 @@ glabel func0000d0a0 /* d0f4: 00000000 */ nop ); +// Mismatch: The store to var80094ae0 is done differently. +//void func0000d0a0(void) +//{ +// s32 i; +// +// for (i = 0; i < ARRAYCOUNT(var80094de8); i++) { +// var80094de8[i] = 0; +// } +// +// var80094ae0 = 0; +// +// osCreateMesgQueue(&var80094e88, &var80094e08, 0x20); +//} + GLOBAL_ASM( glabel func0000d0f8 /* d0f8: 27bdffa8 */ addiu $sp,$sp,-88