From 1e91eb4794435208ae3946067e8721f8e7f13284 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Fri, 29 Oct 2021 09:05:25 -0400
Subject: [PATCH] Fix more warnings by better definining some variables

---
 include/PR/os_message.h |  2 +-
 src/camera.c            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/PR/os_message.h b/include/PR/os_message.h
index 6e07dfa4..6d549a66 100644
--- a/include/PR/os_message.h
+++ b/include/PR/os_message.h
@@ -55,7 +55,7 @@ typedef void *	OSMesg;
  * Structure for message queue
  */
 typedef struct OSMesgQueue_s {
-	//24 bytes?
+	//24 bytes? 30 maybe?
 	OSThread	*mtqueue;	/* Queue to store threads blocked
 					   on empty mailboxes (receive) */
 	OSThread	*fullqueue;	/* Queue to store threads blocked
diff --git a/src/camera.c b/src/camera.c
index eecdaeca..831734ab 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -116,7 +116,7 @@ s32 D_80120D1C;
 s32 D_80120D20[2];
 s32 D_80120D28[6];
 s32 D_80120D40[6];
-u16 *perspNorm[6];
+u16 perspNorm[12];
 Mtx *D_80120D70[6];
 s32 D_80120D88[6];
 Mtx D_80120DA0[5];
@@ -128,8 +128,8 @@ Matrix D_80120FE0;
 Matrix D_80121020;
 Matrix D_80121060;
 Matrix D_801210A0;
-OSMesgQueue *D_801210E0[6];
-OSMesg *D_801210F8;
+OSMesgQueue D_801210E0;
+OSMesg D_801210F8;
 OSMesg D_801210FC;
 OSContStatus status;
 s32 D_80121108[2]; //Padding?
@@ -166,7 +166,7 @@ void func_80065EA0(void) {
     if ((D_B0000578 & 0xFFFF) != 0x8965) {
         D_800DD060 = 1;
     }
-    guPerspectiveF(D_80120EE0, perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
+    guPerspectiveF(D_80120EE0, perspNorm[10], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
     func_8006F870(D_80120EE0, D_80120FE0);
     gCurCamFOV = CAMERA_DEFAULT_FOV;
 }
@@ -201,13 +201,13 @@ f32 get_current_camera_fov(void) {
 void update_camera_fov(f32 camFieldOfView) {
     if (CAMERA_MIN_FOV < camFieldOfView && camFieldOfView < CAMERA_MAX_FOV && camFieldOfView != gCurCamFOV) {
         gCurCamFOV = camFieldOfView;
-        guPerspectiveF(D_80120EE0, &perspNorm[5], camFieldOfView, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
+        guPerspectiveF(D_80120EE0, &perspNorm[10], camFieldOfView, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
         func_8006F870(D_80120EE0, D_80120FE0);
     }
 }
 
 void func_80066194(void) {
-    guPerspectiveF(D_80120EE0, &perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
+    guPerspectiveF(D_80120EE0, &perspNorm[10], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
     func_8006F870(D_80120EE0, D_80120FE0);
 }