Working on identifying variables and cleaning up warnings continues

include/PR/os_message.h

@@ -55,7 +55,7 @@ typedef void *	OSMesg;
  * Structure for message queue
  */
 typedef struct OSMesgQueue_s {
-	//24 bytes? 30 maybe?
+	// sizeof = 0x18 or 24 bytes
 	OSThread	*mtqueue;	/* Queue to store threads blocked
 					   on empty mailboxes (receive) */
 	OSThread	*fullqueue;	/* Queue to store threads blocked

include/sched.h

@@ -69,7 +69,7 @@ typedef struct SCClient_s {
     OSMesgQueue         *msgQ;  /* where to send the frame msg  */
 } OSScClient;
 
-/* 0x7C8 bytes */
+/* 0x7C8 bytes - Side note, I'm seeing 0x288 now... */
 typedef struct {
   /* 0x00 */  OSScMsg     retraceMsg;
   /* 0x20 */  OSScMsg     prenmiMsg;

src/audio.c

@@ -10,6 +10,7 @@
 #include "asset_loading.h"
 #include "audio_internal.h"
 #include "unknown_003260.h"
+#include "sched.h"
 
 /************ .data ************/
 
@@ -93,7 +94,7 @@ u32 D_80115F88;
 
 /******************************/
 
-void audio_init(u32 arg0) {
+void audio_init(OSSched *arg0) {
     s32 iCnt;
     ALSynConfig synth_config;
     s32 *reg_s2;

src/audio.h

@@ -3,6 +3,7 @@
 
 #include "types.h"
 #include "audio_internal.h"
+#include "sched.h"
 
 extern ALSeqPlayer* gMusicPlayer;
 extern ALSeqPlayer* gSndFxPlayer;
@@ -62,7 +63,7 @@ void alCSPStop(ALCSPlayer *seqp); //lib/src/al/unknown_0C91A0.c
 void func_80063B44(u32 arg0, u8 arg1); //lib/src/al/unknown_0646F0.c
 s32  alCSPGetState(ALCSPlayer *seqp); //lib/src/unknown_0C8650.c
 
-void audio_init(u32 arg0);
+void audio_init(OSSched *arg0);
 void func_80000890(u8 arg0);
 void func_80000968(s32 arg0);
 void func_80000B18(void);

src/unknown_003260.c

@@ -81,7 +81,7 @@ const char D_800E4B80[] = "WARNING: Attempt to stop NULL sound aborted\n";
 #if 1
 GLOBAL_ASM("asm/non_matchings/unknown_003260/audioNewThread.s")
 #else
-void audioNewThread(ALSynConfig *c, OSPri p, s32 arg2) {
+void audioNewThread(ALSynConfig *c, OSPri p, OSSched *arg2) {
     u32 *reg_v0;
     void *reg_s0;
     u32 tmp_size;

src/unknown_003260.h

@@ -6,6 +6,7 @@
 #include "audio_internal.h"
 #include "asset_sections.h"
 #include "libultra_internal.h"
+#include "sched.h"
 
 #define AL_SNDP_PLAY_EVT (1 << 0)
 #define AL_SNDP_STOP_EVT (1 << 1)
@@ -118,7 +119,7 @@ u16 func_80004A3C(u8 arg0);
 // Non Matching
 ALMicroTime  _sndpVoiceHandler(void *node);
 void func_80004668(ALBank *bnk, s16 sndIndx, u8, s32);
-void audioNewThread(ALSynConfig *c, OSPri p, s32 arg2);
+void audioNewThread(ALSynConfig *c, OSPri p, OSSched *arg2);
 void func_80004A60(u8, u16); //Could be s32, s32
 
 #endif

src/unknown_06B2B0.c

@@ -104,6 +104,7 @@ FadeTransition D_800DD3FC = FADE_TRANSITION(0, FADE_COLOR_WHITE, 20, -1);
 s32 D_800DD404 = 12;
 FadeTransition D_800DD408 = FADE_TRANSITION(0, FADE_COLOR_WHITE, 30, -1);
 // Unused?
+// CAR / HOV / PLN - So this is vehicle type?
 char *D_800DD410[3] = {
     D_800E713C, D_800E7140, D_800E7144
 };
@@ -140,8 +141,8 @@ s32 *gHudTriangles[2];
 s32 gCurrHudTris;
 s32 D_80121230[8];
 s8 D_80121250[16];
-OSSched *D_80121260;
-s32 D_80121268[2208]; //Padding
+OSSched D_80121260; // 0x288 / 648 bytes
+s8 D_80121268[8192]; // 0x2000 / 8192 bytes Padding?
 s32 D_801234E8;
 s32 D_801234EC;
 s32 D_801234F0;
@@ -168,11 +169,7 @@ s32 gCurrNumHudTrisPerPlayer;
 s32 gCurrNumHudVertsPerPlayer;
 OSScClient *D_80123538[3];
 OSMesg D_80123544[1];
-OSMesgQueue *D_80123548;
-// These values are almost definitely the values in the OSMesgQueue above
-// I just haven't figured out how to do it properly yet.
-s32 D_8012354C;
-s32 D_80123550[4];
+OSMesgQueue D_80123548;
 s32 D_80123560[8];
 
 /******************************/