Fix various warnings

20 files changed, 41 insertions, 58 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 4822cd585..0174c794f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -448,7 +448,6 @@ u8 GetWildBattleTransition(void)
 u8 GetTrainerBattleTransition(void)
 {
     struct Trainer *trainer;
-    u8 trainerClass;
     u8 partyCount;
     u8 flashVar;
     u8 level;
diff --git a/src/blend_palette.c b/src/blend_palette.c
index c9503388f..843c50ac1 100644
--- a/src/blend_palette.c
+++ b/src/blend_palette.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "blend_palette.h"
 #include "palette.h"
 
 void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
diff --git a/src/coins.c b/src/coins.c
index c07a0c7c7..87d96f2bb 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -29,7 +29,6 @@ void PrintCoins(s32 a, u8 b, u8 c, u8 d)
     u8 string[16];
     u8 *ptr;
     u8 r1;
-    u8 r6;
     u8 foo;
     
     ConvertIntToDecimalString(string, a);
diff --git a/src/decompress.c b/src/decompress.c
index 7f8ed9271..ebfd78ffb 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -107,7 +107,7 @@ void sub_800D378(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s
     DrawSpindaSpots(f, g, dest, r7);
 }
 
-static void Unused_LZDecompressWramIndirect(const void **src, void *dest)
+void Unused_LZDecompressWramIndirect(const void **src, void *dest)
 {
     LZ77UnCompWram(*src, dest);
 }
diff --git a/src/field_camera.c b/src/field_camera.c
index b9a813bdf..c55d8e2a3 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -427,7 +427,7 @@ void CameraUpdate(void)
     gUnknown_03004898 -= r8;
 }
 
-static void camera_move_and_redraw(int a, int b)
+void camera_move_and_redraw(int a, int b)
 {
     CameraMove(a, b);
     UpdateFieldObjectsForCameraUpdate(a, b);
diff --git a/src/field_door.c b/src/field_door.c
index da57988ca..ff0537c42 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -186,7 +186,7 @@ static s8 cur_mapdata_get_door_x2_at(struct DoorGraphics *gfx, u32 x, u32 y)
         return gfx->unk2;
 }
 
-static void unref_sub_805869C(u32 x, u32 y)
+void unref_sub_805869C(u32 x, u32 y)
 {
     StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y);
 }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 708544b87..32835a431 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -821,7 +821,7 @@ u8 PlayerGetZCoord(void)
     return gMapObjects[gPlayerAvatar.mapObjectId].elevation;
 }
 
-static void unref_sub_8059790(s16 a, s16 b)
+void unref_sub_8059790(s16 a, s16 b)
 {
     sub_805C058(&gMapObjects[gPlayerAvatar.mapObjectId], a, b);
 }
@@ -874,7 +874,7 @@ u8 GetPlayerAvatarGraphicsIdByStateId(u8 a)
     return GetPlayerAvatarGraphicsIdByStateIdAndGender(a, gPlayerAvatar.gender);
 }
 
-static u8 unref_sub_8059888(u8 a)
+u8 unref_sub_8059888(u8 a)
 {
     switch (a)
     {
diff --git a/src/intro.c b/src/intro.c
index 13e35976e..dfc1d6a4c 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -520,8 +520,6 @@ static void task_intro_13(u8 taskId)
 
 static void task_intro_14(u8 taskId)
 {
-    u8 newTaskId;
-    
     REG_WIN0H = 0xF0;
     REG_WIN0V = 0xA0;
     REG_WININ = 0x1C;
diff --git a/src/item.c b/src/item.c
index 84ab4c1c8..3f74b5925 100644
--- a/src/item.c
+++ b/src/item.c
@@ -58,7 +58,7 @@ void CopyItemName(u16 itemId, u8 *string)
 }
 
 //Unreferenced
-static s8 CountUsedBagPocketSlots(u8 pocket)
+s8 CountUsedBagPocketSlots(u8 pocket)
 {
     u8 i;
     
diff --git a/src/link.c b/src/link.c
index 56635def2..d2b5770e9 100644
--- a/src/link.c
+++ b/src/link.c
@@ -41,8 +41,8 @@ extern u16 word_3004858;
 extern u8 gMultiText_LinkError[];
 
 static void InitLinkTestBG(u8, u8, u8, u8);
-static void InitLinkTestBG_Unused(u8, u8, u8, u8);
-static void LinkTestScreen();
+void InitLinkTestBG_Unused(u8, u8, u8, u8);
+void LinkTestScreen();
 static void InitLocalLinkPlayer(void);
 static void VBlankCB_LinkTest(void);
 static void InitLink(void);
@@ -60,15 +60,15 @@ static void LinkCB_BlockSendBegin(void);
 static void LinkCB_BlockSend(void);
 static void LinkCB_BlockSendEnd(void);
 static void sub_8007E04(void);
-static u32 sub_8007E40(void);
+u32 sub_8007E40(void);
 static void SetBlockReceivedFlag(u8);
 static u16 LinkTestCalcBlockChecksum(void *, u16);
 static void PrintHexDigit(u8, u8, u8);
 static void PrintHex(u32, u8, u8, u8);
 static void LinkCB_RequestPlayerDataExchange(void);
 static void Task_PrintTestData(u8);
-static bool8 sub_8008224(void);
-static u8 GetDummy2(void);
+bool8 sub_8008224(void);
+u8 GetDummy2(void);
 static void sub_8008350(void);
 static void sub_800837C(void);
 static void sub_80083E0(void);
@@ -90,8 +90,8 @@ static void DoRecv(void);
 static void DoSend(void);
 static void StopTimer(void);
 static void SendRecvDone(void);
-static void ResetSendBuffer(void);
-static void ResetRecvBuffer(void);
+void ResetSendBuffer(void);
+void ResetRecvBuffer(void);
 
 static struct BlockTransfer sBlockSend;
 static struct BlockTransfer sBlockRecv[MAX_LINK_PLAYERS];
@@ -212,7 +212,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
     }
 }
 
-static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
+void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
 {
     LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
     DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
@@ -223,7 +223,7 @@ static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u
     *gBGControlRegs[bgNum] = (screenBaseBlock << 8) | (charBaseBlock << 2);
 }
 
-static void LinkTestScreen(void)
+void LinkTestScreen(void)
 {
     s32 i;
     ResetSpriteData();
@@ -840,7 +840,7 @@ void sub_8007E24(void)
     gLinkCallback = sub_8007E04;
 }
 
-static u32 sub_8007E40(void)
+u32 sub_8007E40(void)
 {
     return dword_20238BC;
 }
@@ -1025,7 +1025,7 @@ u8 sub_8008218(void)
     return gSavedMultiplayerId;
 }
 
-static bool8 sub_8008224(void)
+bool8 sub_8008224(void)
 {
     s32 count = 0;
     s32 i;
@@ -1072,7 +1072,7 @@ bool8 IsLinkMaster(void)
     return EXTRACT_MASTER(gLinkStatus);
 }
 
-static u8 GetDummy2(void)
+u8 GetDummy2(void)
 {
     return sDummy2;
 }
@@ -1236,7 +1236,7 @@ void CB2_LinkError(void)
 
 static void CB2_PrintErrorMessage(void)
 {
-    u8 array[64]; // unused
+    u8 array[64] __attribute__((unused)); // unused
 
     switch (gMain.state)
     {
@@ -1772,7 +1772,7 @@ static void SendRecvDone(void)
     }
 }
 
-static void ResetSendBuffer(void)
+void ResetSendBuffer(void)
 {
     u8 i;
     u8 j;
@@ -1785,7 +1785,7 @@ static void ResetSendBuffer(void)
             gLink.sendQueue.data[i][j] = 0xEFFF;
 }
 
-static void ResetRecvBuffer(void)
+void ResetRecvBuffer(void)
 {
     u8 i;
     u8 j;
diff --git a/src/pokedex.c b/src/pokedex.c
index aa832a681..54fa5912c 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -170,7 +170,6 @@ void sub_808C0B8(void)
 void ClearPokedexView(struct PokedexView *pokedexView)
 {
     u16 i;
-    struct UnknownStruct3 *p;
     
     for(i = 0; i <= 385; i++)
     {
@@ -1732,7 +1731,6 @@ void sub_808E6BC(void)
 u8 sub_808E71C(void)
 {
     u16 r2;
-    u16 r3;
     u16 r4 = gPokedexView->selectedPokemon;
     
     if((gMain.newKeys & DPAD_UP) && r4)
@@ -2177,8 +2175,6 @@ void sub_808F168(struct Sprite *sprite)
         
         if(gPokedexView->menuIsOpen != 0 && gPokedexView->menuY == r1)
         {
-            u8 data2;
-            
             sprite->invisible = 0;
             sprite->pos2.y = gPokedexView->menuCursorPos * 16;
             sprite->pos2.x = gSineTable[(u8)sprite->data2] / 64;
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 3971e08dd..7ee413a18 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -200,7 +200,7 @@ void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level,
         do
         {
             personality = Random32();
-            actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | personality & 0x3) % 28);
+            actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 28);
         }
         while (nature != GetNatureFromPersonality(personality)
             || gender != GetGenderFromSpeciesAndPersonality(species, personality)
@@ -422,7 +422,6 @@ void CalculateMonStats(struct Pokemon *mon)
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
     s32 level = GetLevelFromMonExp(mon);
     s32 newMaxHP;
-    u8 nature;
 
     SetMonData(mon, MON_DATA_LEVEL, (u8 *)&level);
 
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 11c00dbe2..21f386f2d 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -61,7 +61,6 @@ static u32 GetMonSize(u16 species, u16 b)
     u64 unk0;
     u32 r7;
     u32 var;
-    struct UnknownStruct *s;
     
     r7 = sub_8090D54(SpeciesToNationalPokedexNum(species), 0);
     var = TranslateBigMonSizeTableIndex(b);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 8051b0cb0..ef77966c6 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1697,7 +1697,7 @@ bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 sub_8067B48()
+static bool8 sub_8067B48()
 {
     if (!FieldEffectActiveListContains(gUnknown_0202E8BC))
         return TRUE;
@@ -1775,7 +1775,7 @@ bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 IsDoorAnimationStopped()
+static bool8 IsDoorAnimationStopped()
 {
     if (!FieldIsDoorAnimationRunning())
         return TRUE;
diff --git a/src/sprite.c b/src/sprite.c
index 78a8608ad..b468b3f0a 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -61,10 +61,8 @@ static void ClearSpriteCopyRequests(void);
 static void ResetOamMatrices(void);
 static void ResetSprite(struct Sprite *sprite);
 static s16 AllocSpriteTiles(u16 tileCount);
-static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
+u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
 static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, struct SpriteFrameImage *images);
-static void CopyFromSprites(u8 *dest);
-static void CopyToSprites(u8 *src);
 static void ResetAllSprites(void);
 static void BeginAnim(struct Sprite *sprite);
 static void ContinueAnim(struct Sprite *sprite);
@@ -786,7 +784,7 @@ static s16 AllocSpriteTiles(u16 tileCount)
     return start;
 }
 
-static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op)
+u8 SpriteTileAllocBitmapOp(u16 bit, u8 op)
 {
     u8 index = bit / 8;
     u8 shift = bit % 8;
@@ -855,7 +853,7 @@ void RequestSpriteCopy(u8 *src, u8 *dest, u16 size)
     }
 }
 
-static void CopyFromSprites(u8 *dest)
+void CopyFromSprites(u8 *dest)
 {
     u32 i;
     u8 *src = (u8 *)gSprites;
@@ -867,7 +865,7 @@ static void CopyFromSprites(u8 *dest)
     }
 }
 
-static void CopyToSprites(u8 *src)
+void CopyToSprites(u8 *src)
 {
     u32 i;
     u8 *dest = (u8 *)gSprites;
diff --git a/src/start_menu.c b/src/start_menu.c
index ee941b715..69f561144 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -76,7 +76,6 @@ static void BuildStartMenuActions_Link(void);
 static void DisplaySafariBallsWindow(void);
 static bool32 PrintStartMenuItemsMultistep(s16 *a, u32 b);
 static bool32 InitStartMenuMultistep(s16 *a, s16 *b);
-static void sub_8071230(void);
 static void Task_StartMenu(u8 taskId);
 static u8 StartMenu_InputProcessCallback(void);
 static u8 SaveCallback1(void);
diff --git a/src/text.c b/src/text.c
index c632a4fa6..fb7c085a2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1918,7 +1918,7 @@ static void MultistepLoadFont_LoadGlyph(struct Window *win, u16 startOffset, u8
     }
 }
 
-static void EmptyFunc(void)
+void EmptyFunc(void)
 {
 }
 
@@ -3662,7 +3662,6 @@ void ConvertInternationalString(u8 *s, u8 language)
     if (language == CHARSET_JAPANESE)
     {
         u8 i;
-        u8 length;
 
         StripExtCtrlCodes(s);
         i = StringLength(s);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index a04ad4359..560e8ece3 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -81,7 +81,7 @@ static void sub_809323C(void);
 static void sub_8093254(void);
 static void sub_80932AC(Callback callBack);
 static void sub_80932E4(u8 arg1, Callback callBack);
-static void sub_8093324(void);
+void sub_8093324(void);
 static void nullsub_60(u8);
 static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal);
 static u8 sub_80934F4(struct TrainerCard *);
@@ -91,7 +91,7 @@ static void sub_8093598(void);
 static void sub_80935EC(void);
 static void sub_8093610(void);
 static void sub_8093688(void);
-static void sub_80936D4(void);
+void sub_80936D4(void);
 static void sub_80937A4(void);
 static void sub_80937BC(void);
 static void sub_80937D8(void);
@@ -106,13 +106,13 @@ static void sub_80939DC(u8 taskId);
 static void sub_8093A28(void);
 static u8 sub_8093A48(void);
 static void sub_8093A68(u8 taskId);
-static void sub_8093D7C(void);
+void sub_8093D7C(void);
 static void sub_8093DAC(void);
 static void sub_8093DC8(void);
 static void sub_8093DEC(void);
 static void sub_8093E04(void);
 static void sub_8093E28(void);
-static void sub_8093EA0(void);
+void sub_8093EA0(void);
 static void sub_8093EF8(void);
 static void sub_8093F14(void);
 static void sub_8093F48(void);
@@ -142,7 +142,7 @@ static void TrainerCard_Back_PrintLinkPokeblocks_Label(void);
 static void TrainerCard_Back_PrintLinkPokeblocks(void);
 static void TrainerCard_Back_PrintPokemonTrades_Label(void);
 static void TrainerCard_Back_PrintPokemonTrades(void);
-static void unref_sub_8094588(u16 left, u16 top);
+void unref_sub_8094588(u16 left, u16 top);
 
 void sub_8093110(Callback arg1) {
     sub_80932AC(arg1);
@@ -253,7 +253,7 @@ static void sub_80932E4(u8 arg1, Callback callBack) {
     StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32) callBack);
 }
 
-static void sub_8093324(void) {
+void sub_8093324(void) {
     u8 taskId = FindTaskIdByFunc(nullsub_60);
     struct Task *task = &gTasks[taskId];
     unk_2000000.var_1 = task->data[TD_0];
@@ -592,7 +592,7 @@ _080936D0: .4byte 0x02000000\n\
 
 #endif
 
-static void sub_80936D4(void) {
+void sub_80936D4(void) {
     unk_2000000.var_7 = FALSE;
     unk_2000000.var_8 = FALSE;
     unk_2000000.var_9 = FALSE;
@@ -1338,7 +1338,7 @@ bool8 sub_8093D50(void) {
 }
 
 __attribute__((naked))
-static void sub_8093D7C(void) {
+void sub_8093D7C(void) {
     asm(".syntax unified\n\
 	ldr r1, _08093DA0 @ =gUnknown_03004DE0\n\
 	ldr r0, _08093DA4 @ =REG_VCOUNT\n\
@@ -1471,7 +1471,7 @@ _08093E9C: .4byte 0x80000200\n\
     .syntax divided\n");
 }
 
-static void sub_8093EA0(void) {
+void sub_8093EA0(void) {
     LoadPalette(gUnknown_083B5EF8[unk_2000000.var_2], 0, 48 * 2);
     LoadPalette(gBadgesPalette, 48, 16 * 2);
     LoadPalette(gUnknown_083B5F4C, 64, 16 * 2);
@@ -2016,7 +2016,7 @@ static void TrainerCard_Back_PrintPokemonTrades(void) {
     MenuPrint_RightAligned(buffer, 28, 9);
 }
 
-static void unref_sub_8094588(u16 left, u16 top) {
+void unref_sub_8094588(u16 left, u16 top) {
     u8 *text = gOtherText_Boy;
 
     if (gSaveBlock2.playerGender == FEMALE) {
diff --git a/src/truck_scene.c b/src/truck_scene.c
index 4e45bd165..64eca498c 100644
--- a/src/truck_scene.c
+++ b/src/truck_scene.c
@@ -12,8 +12,6 @@ extern s8 gTruckCamera_HorizontalTable[];
 
 s32 GetTruckCameraBobbingY(int a1)
 {
-    s32 result;
-
     if (!(a1 % 120))
         return -1;
     else if ((a1 % 10) <= 4)
@@ -24,8 +22,6 @@ s32 GetTruckCameraBobbingY(int a1)
 
 s32 GetTruckBoxMovement(int a1) // for the box movement?
 {
-    s32 result;
-    
     if (!((a1 + 120) % 180))
         return -1;
 
diff --git a/src/weather.c b/src/weather.c
index c16faaed8..520185441 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -192,7 +192,7 @@ void sub_807CB10(void) {
 					v4 += v11;
 					dunno = v4 - v9;
 					if (dunno > 0) {
-						v4 -= dunno + ((u16)dunno >> 15) >> 1;
+						v4 -= (dunno + ((u16)dunno >> 15)) >> 1;
 					}
 					v1[v6][v2] = v4 >> 8;
 					if (v1[v6][v2] > 0x1f) {