From 9f4caad10f47ba9af5a028010ec64b4573ccd3e0 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 5 Feb 2020 17:49:51 +1000
Subject: [PATCH] Fix warnings

---
 Makefile                       | 2 +-
 src/game/cheats.c              | 1 +
 src/game/chr/chraicommands.c   | 1 +
 src/game/game_00b200.c         | 1 +
 src/game/game_00c490.c         | 1 +
 src/game/game_015470.c         | 1 +
 src/game/game_097a50.c         | 1 +
 src/game/game_0b0420.c         | 1 +
 src/game/game_0cf150.c         | 1 +
 src/game/game_0d4690.c         | 1 +
 src/game/game_0dcdb0.c         | 1 +
 src/game/game_0f09f0.c         | 1 +
 src/game/game_102240.c         | 1 +
 src/game/game_107fb0.c         | 1 +
 src/game/game_10ccd0.c         | 1 +
 src/game/game_111600.c         | 1 +
 src/game/game_129900.c         | 1 +
 src/game/game_1668e0.c         | 1 +
 src/game/game_176d70.c         | 5 +++--
 src/game/game_187770.c         | 1 +
 src/game/game_1999b0.c         | 1 +
 src/game/game_19c990.c         | 1 +
 src/game/game_1a3340.c         | 1 +
 src/include/game/game_0b28d0.h | 2 +-
 src/include/game/game_176d70.h | 2 +-
 25 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3b938eda1..fc43b008b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ ifeq ($(RELEASE),final)
     RELEASE_CFLAGS := -DBETA=0 -DREL1=0 -DFINAL=1
 endif
 
-CFLAGS := $(VERSION_CFLAGS) $(RELEASE_CFLAGS) -DPIRACYCHECKS=1 -Wo,-loopunroll,0 -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -woff 819,820,852,821 -signed -I src/include -mips2
+CFLAGS := $(VERSION_CFLAGS) $(RELEASE_CFLAGS) -DPIRACYCHECKS=1 -Wo,-loopunroll,0 -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -woff 649,819,820,821,838,852 -signed -I src/include -mips2
 
 C_FILES := $(shell find src -name '*.c')
 O_FILES := $(patsubst %.c, %.o, $(C_FILES))
diff --git a/src/game/cheats.c b/src/game/cheats.c
index 735dc5505..2a18fceb2 100644
--- a/src/game/cheats.c
+++ b/src/game/cheats.c
@@ -14,6 +14,7 @@
 #include "game/game_129900.h"
 #include "game/game_16cfa0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 
 u32 cheatIsUnlocked(s32 cheat_id)
 {
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index a35c103cb..3615272fc 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -14,6 +14,7 @@
 #include "game/data/data_020df0.h"
 #include "types.h"
 #include "game/chr/chraicommands.h"
+#include "game/lang.h"
 #include "library/library_0e9d0.h"
 #include "library/library_12dc0.h"
 #include "library/library_16110.h"
diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c
index fc547e8dd..a70a4e98c 100644
--- a/src/game/game_00b200.c
+++ b/src/game/game_00b200.c
@@ -12,6 +12,7 @@
 #include "game/game_16cfa0.h"
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
+#include "game/lang.h"
 
 GLOBAL_ASM(
 glabel func0f00b200
diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c
index 3bf78a1e6..9b18b53e9 100644
--- a/src/game/game_00c490.c
+++ b/src/game/game_00c490.c
@@ -27,6 +27,7 @@
 #include "game/game_176d70.h"
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 #include "library/library_16110.h"
 
diff --git a/src/game/game_015470.c b/src/game/game_015470.c
index 343373884..6cfa8ac4c 100644
--- a/src/game/game_015470.c
+++ b/src/game/game_015470.c
@@ -28,6 +28,7 @@
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
+#include "game/lang.h"
 
 const u32 var7f1a83b0[] = {0x459c4000};
 const u32 var7f1a83b4[] = {0x00000000};
diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c
index eeab2dbe2..83471abf5 100644
--- a/src/game/game_097a50.c
+++ b/src/game/game_097a50.c
@@ -30,6 +30,7 @@
 #include "game/game_187770.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const char var7f1ab890[] = "rontime";
diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c
index d6865d782..d19d79a62 100644
--- a/src/game/game_0b0420.c
+++ b/src/game/game_0b0420.c
@@ -18,6 +18,7 @@
 #include "game/game_176d70.h"
 #include "game/game_187770.h"
 #include "game/game_197600.h"
+#include "game/lang.h"
 
 const u32 var7f1acdd0[] = {0x3dcccccd};
 const u32 var7f1acdd4[] = {0x3dcccccd};
diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c
index bc26c0d7b..7ee1ac16f 100644
--- a/src/game/game_0cf150.c
+++ b/src/game/game_0cf150.c
@@ -18,6 +18,7 @@
 #include "game/pdoptions.h"
 #include "game/game_157db0.h"
 #include "game/game_16cfa0.h"
+#include "game/lang.h"
 
 const u32 var7f1ada80[] = {0xc6ea6000};
 const u32 var7f1ada84[] = {0x3dcccccd};
diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c
index 7b9e54e0d..c21c78272 100644
--- a/src/game/game_0d4690.c
+++ b/src/game/game_0d4690.c
@@ -18,6 +18,7 @@
 #include "game/game_1668e0.h"
 #include "game/game_16cfa0.h"
 #include "game/game_176d70.h"
+#include "game/lang.h"
 
 const u32 var7f1adba0[] = {0x74786d75};
 const u32 var7f1adba4[] = {0x6c000000};
diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c
index f40231911..420e67d83 100644
--- a/src/game/game_0dcdb0.c
+++ b/src/game/game_0dcdb0.c
@@ -24,6 +24,7 @@
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const char var7f1ade80[] = "%s%s%4.2fX";
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index c9e616838..b4d16fa8a 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -31,6 +31,7 @@
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 #include "library/library_16110.h"
 
diff --git a/src/game/game_102240.c b/src/game/game_102240.c
index a4a6f2705..a47b15191 100644
--- a/src/game/game_102240.c
+++ b/src/game/game_102240.c
@@ -27,6 +27,7 @@
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 
 const char var7f1b2cf0[] = "%s\n";
 const char var7f1b2cf4[] = "%s: %s\n";
diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index 93a2d30a5..b4abcb72e 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -17,6 +17,7 @@
 #include "game/game_176d70.h"
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
+#include "game/lang.h"
 
 const char var7f1b2f00[] = "%s-";
 const char var7f1b2f04[] = "==:==";
diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c
index edee64761..f81a2e379 100644
--- a/src/game/game_10ccd0.c
+++ b/src/game/game_10ccd0.c
@@ -29,6 +29,7 @@
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 
 const char var7f1b3860[] = "%s: %s\n";
 const char var7f1b3868[] = "%s: %s\n";
diff --git a/src/game/game_111600.c b/src/game/game_111600.c
index bac25da10..2103fb2b4 100644
--- a/src/game/game_111600.c
+++ b/src/game/game_111600.c
@@ -12,6 +12,7 @@
 #include "game/game_111600.h"
 #include "game/game_16cfa0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 
 GLOBAL_ASM(
 glabel func0f111600
diff --git a/src/game/game_129900.c b/src/game/game_129900.c
index ba5f0b165..a128a279a 100644
--- a/src/game/game_129900.c
+++ b/src/game/game_129900.c
@@ -30,6 +30,7 @@
 #include "game/game_16cfa0.h"
 #include "game/game_176d70.h"
 #include "game/game_187770.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const char var7f1b5570[] = "ecol";
diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c
index 1de6ee719..ddc057120 100644
--- a/src/game/game_1668e0.c
+++ b/src/game/game_1668e0.c
@@ -56,6 +56,7 @@
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const char var7f1b76f0[] = "-mgfx";
diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 60b9c7943..096cdb09e 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -33,6 +33,7 @@
 #include "game/game_187770.h"
 #include "game/game_197600.h"
 #include "game/game_1999b0.h"
+#include "game/lang.h"
 #include "library/library_0e9d0.h"
 #include "library/library_12dc0.h"
 #include "library/library_233c0.h"
@@ -10762,13 +10763,13 @@ glabel func0f181800
 /*  f181898:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-bool scenarioCtcCallback2c(f32 arg0, s32 arg1, s32 arg2, struct prop *prop, f32 *arg4)
+bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, f32 *arg4)
 {
 	struct chrdata *chr = prop->chr;
 	s32 index = teamGetIndex(chr->team);
 
 	if (g_ScenarioData.ctc.unk18[g_ScenarioData.ctc.unk08[index]].unk02 > 0) {
-		*arg4 = func0f0b69d0(arg0, arg1, arg2, prop,
+		*arg4 = func0f0b69d0(arg0, pos, arg2, prop,
 				&g_ScenarioData.ctc.unk18[g_ScenarioData.ctc.unk08[index]].unk04[0],
 				g_ScenarioData.ctc.unk18[g_ScenarioData.ctc.unk08[index]].unk02);
 		return true;
diff --git a/src/game/game_187770.c b/src/game/game_187770.c
index 22dd65914..414e62f82 100644
--- a/src/game/game_187770.c
+++ b/src/game/game_187770.c
@@ -31,6 +31,7 @@
 #include "game/game_187770.h"
 #include "game/game_197600.h"
 #include "game/game_1999b0.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n";
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 518f65f40..6f442538a 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -20,6 +20,7 @@
 #include "game/game_187770.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const u32 var7f1b90a0[] = {0x3d4ccccd};
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index c1aabf38e..86c62905a 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -28,6 +28,7 @@
 #include "game/game_16cfa0.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
+#include "game/lang.h"
 #include "library/library_12dc0.h"
 
 const u32 var7f1b9210[] = {0x7f19caa8};
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index 3838df05d..90fb05b20 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -22,6 +22,7 @@
 #include "game/game_187770.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
+#include "game/lang.h"
 
 const char var7f1b97d0[] = "\n";
 const char var7f1b97d4[] = "\n";
diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h
index 31793d6b2..0c9781330 100644
--- a/src/include/game/game_0b28d0.h
+++ b/src/include/game/game_0b28d0.h
@@ -67,7 +67,7 @@ u32 func0f0b656c(void);
 u32 func0f0b65a8(void);
 u32 func0f0b65f8(void);
 u32 func0f0b6764(void);
-f32 func0f0b69d0(f32 arg0, s32 arg1, s32 arg2, struct prop *prop, s16 *arg4, s16 arg5);
+f32 func0f0b69d0(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, s16 *arg4, s16 arg5);
 f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop);
 u32 func0f0b72dc(void);
 u32 func0f0b77cc(void);
diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h
index a2c39d778..f8487667f 100644
--- a/src/include/game/game_176d70.h
+++ b/src/include/game/game_176d70.h
@@ -103,7 +103,7 @@ s32 scenarioCtcRadar(s32 value);
 bool scenarioCtcRadar2(s32 *displaylist, struct prop *prop);
 bool scenarioCtcHighlight(struct prop *prop, u32 *colour);
 u32 func0f181800(void);
-bool scenarioCtcCallback2c(f32 arg0, s32 arg1, s32 arg2, struct prop *prop, f32 *arg4);
+bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, f32 *arg4);
 s32 scenarioCtcGetMaxTeams(void);
 bool scenarioCtcIsRoomHighlighted(s16 room);
 void scenarioCtcCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);