Fix build & build warnings

This commit is contained in:
Arceveti
2021-09-11 10:58:54 -07:00
parent f34cb5dd3d
commit a1b2080b26
6 changed files with 8 additions and 11 deletions

View File

@@ -3,12 +3,7 @@
// EU changes most text to arrays for each language. This define allows these
// differences to be combined.
#ifdef VERSION_EU
//#define LANGUAGE_ARRAY(cmd) cmd[LANGUAGE_FUNCTION]
#define LANGUAGE_ARRAY(cmd) cmd
#else
#define LANGUAGE_ARRAY(cmd) cmd
#endif
#define LANGUAGE_ARRAY(cmd) cmd
extern void *dialog_table_eu_en[];
extern void *course_name_table_eu_en[];

View File

@@ -307,7 +307,7 @@ static void level_cmd_load_yay0_texture(void) {
sCurrentCmd = CMD_NEXT;
}
static void level_cmd_change_area_skybox(int area, u8 *start, u8 *end) {
static void level_cmd_change_area_skybox(void) {
u8 areaCheck = CMD_GET(s16, 2);
gAreaSkyboxStart[areaCheck-1] = CMD_GET(void *, 4);
gAreaSkyboxEnd[areaCheck-1] = CMD_GET(void *, 8);

View File

@@ -108,7 +108,7 @@ void crash_screen_print(s32 x, s32 y, const char *fmt, ...) {
u32 glyph;
s32 size;
char buf[0x108];
s32 i = 0;
UNUSED s32 i = 0;
memset(buf, 0, sizeof(buf));

View File

@@ -281,7 +281,7 @@ u8 *alloc_ia4_tex_from_i1(u8 *in, s16 width, s16 height) {
void render_generic_char(u8 c) {
void **fontLUT;
void *packedTexture;
void *unpackedTexture;
UNUSED void *unpackedTexture;
fontLUT = segmented_to_virtual(main_font_lut);
packedTexture = segmented_to_virtual(fontLUT[c]);

View File

@@ -387,8 +387,10 @@ s32 unload_deactivated_objects_in_list(struct ObjectNode *objList) {
obj = obj->next;
if ((gCurrentObject->activeFlags & ACTIVE_FLAG_ACTIVE) != ACTIVE_FLAG_ACTIVE) {
#ifdef PUPPYLIGHTS
if (gCurrentObject->oLightID != 0xFFFF)
obj_disable_light(gCurrentObject);
#endif
// Prevent object from respawning after exiting and re-entering the
// area
if (!(gCurrentObject->oFlags & OBJ_FLAG_PERSISTENT_RESPAWN)) {

View File

@@ -116,7 +116,7 @@ s8 sScoreFileCoinScoreMode = 0;
// In EU, if no save file exists, open the language menu so the user can find it.
unsigned char textReturn[][8] = { {TEXT_RETURN}, };
unsigned char textReturn[] = { TEXT_RETURN };
unsigned char textViewScore[] = { TEXT_CHECK_SCORE };
@@ -130,7 +130,7 @@ unsigned char textSoundModes[][8] = { { TEXT_STEREO }, { TEXT_MONO }, { TEXT_HEA
unsigned char textLanguageSelect[][17] = { { TEXT_LANGUAGE_SELECT }};
#endif
unsigned char textSoundSelect[][13] = { { TEXT_SOUND_SELECT },};
unsigned char textSoundSelect[] = { TEXT_SOUND_SELECT };
unsigned char textMarioA[] = { TEXT_FILE_MARIO_A };
unsigned char textMarioB[] = { TEXT_FILE_MARIO_B };