From a1b2080b26aacdbbb984d039e9c3fdcfd769a32d Mon Sep 17 00:00:00 2001
From: Arceveti <73617174+Arceveti@users.noreply.github.com>
Date: Sat, 11 Sep 2021 10:58:54 -0700
Subject: [PATCH] Fix build & build warnings

---
 include/eu_translation.h         | 7 +------
 src/engine/level_script.c        | 2 +-
 src/game/crash_screen.c          | 2 +-
 src/game/ingame_menu.c           | 2 +-
 src/game/object_list_processor.c | 2 ++
 src/menu/file_select.c           | 4 ++--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/eu_translation.h b/include/eu_translation.h
index 90f62ff4..ab04abfb 100644
--- a/include/eu_translation.h
+++ b/include/eu_translation.h
@@ -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[];
diff --git a/src/engine/level_script.c b/src/engine/level_script.c
index 4d76ee82..239e79f5 100644
--- a/src/engine/level_script.c
+++ b/src/engine/level_script.c
@@ -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);
diff --git a/src/game/crash_screen.c b/src/game/crash_screen.c
index f412496e..2b85b42a 100644
--- a/src/game/crash_screen.c
+++ b/src/game/crash_screen.c
@@ -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));
 
diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
index 7d3175b6..46966786 100644
--- a/src/game/ingame_menu.c
+++ b/src/game/ingame_menu.c
@@ -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]);
diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c
index d9818895..cb66d761 100644
--- a/src/game/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -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)) {
diff --git a/src/menu/file_select.c b/src/menu/file_select.c
index 7f7dfb9e..aa9f2a44 100644
--- a/src/menu/file_select.c
+++ b/src/menu/file_select.c
@@ -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 };