Fix warnings

This commit is contained in:
Ryan Dwyer 2020-02-05 17:49:51 +10:00
parent 5fa623cea3
commit 9f4caad10f
25 changed files with 27 additions and 5 deletions

View File

@ -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))

View File

@ -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)
{

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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};

View File

@ -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";

View File

@ -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};

View File

@ -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};

View File

@ -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};

View File

@ -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";

View File

@ -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"

View File

@ -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";

View File

@ -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[] = "==:==";

View File

@ -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";

View File

@ -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

View File

@ -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";

View File

@ -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";

View File

@ -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;

View File

@ -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";

View File

@ -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};

View File

@ -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};

View File

@ -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";

View File

@ -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);

View File

@ -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);