Resolve compile warnings in modern

2019-07-18 20:46:00 -04:00
parent 7fd327d632
commit 20863ac85b
17 changed files with 430 additions and 412 deletions
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -72,6 +72,9 @@ extern const u8 *const gBattlescriptsForUsingItem[];
 extern const u8 *const gBattlescriptsForSafariActions[];

 // this file's functions
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static void CB2_InitBattleInternal(void);
 static void CB2_PreInitMultiBattle(void);
 static void CB2_PreInitIngamePlayerPartnerBattle(void);
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -245,7 +245,7 @@ static void CableCarMainCallback_Setup(void)
 {
    u16 imebak;
    u8 i = 0;
-    int sizeOut = 0;
+    u32 sizeOut = 0;

    switch (gMain.state)
    {
--- a/src/item.c
+++ b/src/item.c
@@ -18,6 +18,9 @@
 extern u16 gUnknown_0203CF30[];

 // this file's functions
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
 static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);

--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -127,7 +127,7 @@ void sub_81ABAE0(void);
 u8 sub_81AB1F0(u8);
 void sub_81AC23C(u8);
 void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu*);
-void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a);
+void PrintItemQuantityPlusGFX(u8 rboxId, s32 item_index_in_pocket, u8 a);
 void ItemMenu_UseOutOfBattle(u8 taskId);
 void ItemMenu_Toss(u8 taskId);
 void ItemMenu_Register(u8 taskId);
@@ -830,7 +830,7 @@ void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu *unused)
    }
 }

-void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a)
+void PrintItemQuantityPlusGFX(u8 rboxId, s32 item_index_in_pocket, u8 a)
 {
    u16 itemId;
    u16 itemQuantity;
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1820,7 +1820,7 @@ static bool8 AllocPartyMenuBg(void)

 static bool8 AllocPartyMiscGfx(void)
 {
-    int sizeout;
+    u32 sizeout;

    switch (gUnknown_0203CEC4->data[0])
    {
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -464,6 +464,9 @@ EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0;
 EWRAM_DATA static bool8 sCanOnlyMove = 0;

 // This file's functions.
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
 static void Cb2_EnterPSS(u8 boxOption);
 static u8 GetCurrentBoxOption(void);
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -64,16 +64,16 @@ static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide);
 static void HideLeftHeaderSprites(bool32 isOnRightSide);
 static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide);
 static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide);
-static void MoveLeftHeader(struct Sprite *sprite, int startX, int endX, int duration);
+static void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration);
 static void SpriteCB_MoveLeftHeader(struct Sprite *sprite);
 static void InitPokenavMainMenuResources(void);
 static void InitHoennMapHeaderSprites(void);
 static void sub_81C7B74(void);
-static u32 LoopedTask_ScrollMenuHeaderDown(int a0);
-static u32 LoopedTask_ScrollMenuHeaderUp(int a0);
+static u32 LoopedTask_ScrollMenuHeaderDown(s32 a0);
+static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0);
 static void sub_81C7BF8(u32 a0);
 static void SpriteCB_SpinningPokenav(struct Sprite* sprite);
-static u32 LoopedTask_InitPokenavMenu(int a0);
+static u32 LoopedTask_InitPokenavMenu(s32 a0);

 const u16 gSpinningPokenavPaletteData[] = INCBIN_U16("graphics/pokenav/icon2.gbapal");
 const u32 gSpinningPokenavGfx[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz");
@@ -360,7 +360,7 @@ bool32 WaitForPokenavShutdownFade(void)
    return TRUE;
 }

-static u32 LoopedTask_InitPokenavMenu(int a0)
+static u32 LoopedTask_InitPokenavMenu(s32 a0)
 {
    struct PokenavMainMenuResources *structPtr;

@@ -440,7 +440,7 @@ bool32 MainMenuLoopedTaskIsBusy(void)
    return IsLoopedTaskActive(structPtr->currentTaskId);
 }

-static u32 LoopedTask_ScrollMenuHeaderDown(int a0)
+static u32 LoopedTask_ScrollMenuHeaderDown(s32 a0)
 {
    switch (a0)
    {
@@ -461,7 +461,7 @@ static u32 LoopedTask_ScrollMenuHeaderDown(int a0)
    }
 }

-static u32 LoopedTask_ScrollMenuHeaderUp(int a0)
+static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0)
 {
    if (ChangeBgY(0, 384, 2) <= 0)
    {
@@ -637,7 +637,7 @@ _081C7AAE:\n\
    .syntax divided");
 }

-void sub_81C7AC0(int a0)
+void sub_81C7AC0(s32 a0)
 {
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

@@ -708,7 +708,7 @@ static void sub_81C7BF8(u32 windowId)

 static void InitPokenavMainMenuResources(void)
 {
-    int i;
+    s32 i;
    u8 spriteId;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

@@ -758,13 +758,13 @@ void ResumeSpinningPokenavSprite(void)

 static void InitHoennMapHeaderSprites(void)
 {
-    int i, spriteId;
+    s32 i, spriteId;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

    LoadCompressedSpriteSheet(&sPokenavHoennMapLeftHeaderSpriteSheet);
    AllocSpritePalette(1);
    AllocSpritePalette(2);
-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
    {
        spriteId = CreateSprite(&sPokenavLeftHeaderHoennMapSpriteTemplate, 0, 0, 1);
        structPtr->leftHeaderSprites[i] = &gSprites[spriteId];
@@ -859,10 +859,10 @@ void sub_81C7FC4(u32 arg0, bool32 arg1)

 void sub_81C7FDC(void)
 {
-    int i;
+    s32 i;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
    {
        structPtr->leftHeaderSprites[i]->invisible = TRUE;
        structPtr->submenuLeftHeaderSprites[i]->invisible = TRUE;
@@ -881,7 +881,7 @@ bool32 sub_81C8010(void)

 static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

    if (!isOnRightSide)
@@ -889,7 +889,7 @@ static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
    else
        start = 256, end = 160;

-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
    {
        structPtr->leftHeaderSprites[i]->pos1.y = startY;
        MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
@@ -898,7 +898,7 @@ static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)

 static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

    if (!isOnRightSide)
@@ -906,7 +906,7 @@ static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
    else
        start = 256, end = 192;

-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
    {
        structPtr->submenuLeftHeaderSprites[i]->pos1.y = startY;
        MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
@@ -915,7 +915,7 @@ static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)

 static void HideLeftHeaderSprites(bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

    if (!isOnRightSide)
@@ -923,7 +923,7 @@ static void HideLeftHeaderSprites(bool32 isOnRightSide)
    else
        start = 192, end = 256;

-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
    {
        MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
    }
@@ -931,7 +931,7 @@ static void HideLeftHeaderSprites(bool32 isOnRightSide)

 static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
 {
-    int start, end, i;
+    s32 start, end, i;
    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);

    if (!isOnRightSide)
@@ -939,13 +939,13 @@ static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
    else
        start = 192, end = 256;

-    for (i = 0; i < (int)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
    {
        MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
    }
 }

-static void MoveLeftHeader(struct Sprite *sprite, int startX, int endX, int duration)
+static void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration)
 {
    sprite->pos1.x = startX;
    sprite->data[0] = startX * 16;
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_unk_3.c
@@ -34,7 +34,7 @@ static u32 sub_81CABFC(struct Pokenav3Struct *);
 static u32 sub_81CAC04(struct Pokenav3Struct *);
 static u32 sub_81CACB8(struct Pokenav3Struct *);
 static u32 sub_81CACF8(struct Pokenav3Struct *);
-static u32 sub_81CAD20(int);
+static u32 sub_81CAD20(s32);
 static bool32 sub_81CB1D0(void);

 extern const u8 gUnknown_08622508[];
@@ -190,7 +190,7 @@ static u32 sub_81CACF8(struct Pokenav3Struct *state)
    return 0;
 }

-static u32 sub_81CAD20(int taskState)
+static u32 sub_81CAD20(s32 taskState)
 {
    int i, j;
    struct Pokenav3Struct *state = GetSubstructPtr(5);
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -50,7 +50,7 @@ struct Pokenav4Struct
 };

 static bool32 sub_81CB310(void);
-static u32 sub_81CB324(int);
+static u32 sub_81CB324(s32);
 static void sub_81CBBB8(void);
 static void sub_81CBC1C(void);
 static void sub_81CC2B4(void);
@@ -156,7 +156,7 @@ static bool32 sub_81CB310(void)
    return IsLoopedTaskActive(state->unk4);
 }

-static u32 sub_81CB324(int taskState)
+static u32 sub_81CB324(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -229,7 +229,7 @@ static u32 sub_81CB324(int taskState)
    }
 }

-u32 sub_81CB510(int taskState)
+u32 sub_81CB510(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -266,7 +266,7 @@ u32 sub_81CB510(int taskState)
    return 4;
 }

-u32 sub_81CB588(int taskState)
+u32 sub_81CB588(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -303,7 +303,7 @@ u32 sub_81CB588(int taskState)
    return 4;
 }

-u32 sub_81CB600(int taskState)
+u32 sub_81CB600(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -340,7 +340,7 @@ u32 sub_81CB600(int taskState)
    return 4;
 }

-u32 sub_81CB678(int taskState)
+u32 sub_81CB678(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -377,7 +377,7 @@ u32 sub_81CB678(int taskState)
    return 4;
 }

-u32 sub_81CB6F0(int taskState)
+u32 sub_81CB6F0(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -396,7 +396,7 @@ u32 sub_81CB6F0(int taskState)
    return 4;
 }

-u32 sub_81CB734(int taskState)
+u32 sub_81CB734(s32 taskState)
 {
    struct Pokenav4Struct *state;
    u16 var0;
@@ -408,7 +408,7 @@ u32 sub_81CB734(int taskState)
    return 4;
 }

-u32 sub_81CB75C(int taskState)
+u32 sub_81CB75C(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -427,7 +427,7 @@ u32 sub_81CB75C(int taskState)
    return 4;
 }

-u32 sub_81CB7A0(int taskState)
+u32 sub_81CB7A0(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -459,7 +459,7 @@ u32 sub_81CB7A0(int taskState)
    return 4;
 }

-u32 sub_81CB824(int taskState)
+u32 sub_81CB824(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -485,7 +485,7 @@ u32 sub_81CB824(int taskState)
    return 4;
 }

-u32 sub_81CB888(int taskState)
+u32 sub_81CB888(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    u32 result = 0;
@@ -549,7 +549,7 @@ u32 sub_81CB888(int taskState)
    return result;
 }

-u32 sub_81CB93C(int taskState)
+u32 sub_81CB93C(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -578,7 +578,7 @@ u32 sub_81CB93C(int taskState)
    return 4;
 }

-u32 sub_81CB9C8(int taskState)
+u32 sub_81CB9C8(s32 taskState)
 {
    int index;
    int var0;
@@ -617,7 +617,7 @@ u32 sub_81CB9C8(int taskState)
    return 4;
 }

-u32 sub_81CBA68(int taskState)
+u32 sub_81CBA68(s32 taskState)
 {
    struct Pokenav4Struct *state = GetSubstructPtr(6);
    switch (taskState)
@@ -643,7 +643,7 @@ u32 sub_81CBA68(int taskState)
    return 4;
 }

-u32 sub_81CBAD4(int taskState)
+u32 sub_81CBAD4(s32 taskState)
 {
    int index;
    int var0;
@@ -682,7 +682,7 @@ u32 sub_81CBAD4(int taskState)
    return 4;
 }

-u32 sub_81CBB74(int taskState)
+u32 sub_81CBB74(s32 taskState)
 {
    switch (taskState)
    {
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_unk_5.c
@@ -42,8 +42,8 @@ struct CityZoomPic
 static u32 sub_81CC568(struct Pokenav5Struct *);
 static u32 sub_81CC5B4(struct Pokenav5Struct *);
 static u32 sub_81CC5DC(struct Pokenav5Struct *);
-static u32 sub_81CC6F4(int);
-static u32 sub_81CCD34(int);
+static u32 sub_81CC6F4(s32);
+static u32 sub_81CCD34(s32);
 static bool32 sub_81CC6BC(void);
 static void sub_81CC9EC(void);
 static void sub_81CC9C0(void);
@@ -202,7 +202,7 @@ static bool8 sub_81CC6D0(void)
    return gSaveBlock2Ptr->regionMapZoom == 1;
 }

-static u32 sub_81CC6F4(int taskState)
+static u32 sub_81CC6F4(s32 taskState)
 {
    int var0;
    struct RegionMap *regionMap;
@@ -518,7 +518,7 @@ static bool32 sub_81CCD24(void)
    return FuncIsActiveLoopedTask(sub_81CCD34);
 }

-static u32 sub_81CCD34(int taskState)
+static u32 sub_81CCD34(s32 taskState)
 {
    struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
    if (taskState < (int)ARRAY_COUNT(gUnknown_08623118))
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -71,7 +71,7 @@ static EWRAM_DATA struct SecretBaseRegistryMenu *sRegistryMenu = NULL;

 static void Task_ShowSecretBaseRegistryMenu(u8 taskId);
 static void BuildRegistryMenuItems(u8 taskId);
-static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu);
+static void RegistryMenu_OnCursorMove(s32 unused, bool8 flag, struct ListMenu *menu);
 static void FinalizeRegistryMenu(u8 taskId);
 static void AddRegistryMenuScrollArrows(u8 taskId);
 static void HandleRegistryMenuInput(u8 taskId);
@@ -932,7 +932,7 @@ static void BuildRegistryMenuItems(u8 taskId)
    gMultiuseListMenuTemplate.maxShowed = data[3];
 }

-static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu)
+static void RegistryMenu_OnCursorMove(s32 unused, bool8 flag, struct ListMenu *menu)
 {
    if (flag != TRUE)
        PlaySE(SE_SELECT);
--- a/src/shop.c
+++ b/src/shop.c
@@ -87,8 +87,8 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId);
 static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId);
 static void Task_HandleShopMenuBuy(u8 taskId);
 static void Task_HandleShopMenuSell(u8 taskId);
-static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list);
-static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y);
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list);
+static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y);

 static const struct YesNoFuncTable sShopPurchaseYesNoFuncs =
 {
@@ -521,7 +521,7 @@ static void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *nam
    menuItem->id = item;
 }

-static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list)
+static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list)
 {
    const u8 *description;
    if (onInit != TRUE)
@@ -550,7 +550,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s
    BuyMenuPrint(2, description, 3, 1, 0, 0);
 }

-static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
+static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y)
 {
    u8 x;

--- a/src/trade.c
+++ b/src/trade.c
@@ -158,6 +158,9 @@ static EWRAM_DATA struct {
    /*0xFE*/ u8 unk_FE;
 } *gUnknown_020322A0 = {NULL};

+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static bool32 sub_8077260(void);
 static void sub_80773D0(void);
 static void sub_807811C(void);
@@ -2779,7 +2782,7 @@ static void sub_8079398(void)
    }
 }

-static void DisplayMessageAndContinueTask(void)
+static void Wait2SecondsAndCreateYesNoMenu(void)
 {
    gUnknown_0203229C->unk_A8++;

@@ -2918,7 +2921,7 @@ static void sub_80795AC(void)
            sub_80781C8();
            break;
        case 14:
-            DisplayMessageAndContinueTask();
+            Wait2SecondsAndCreateYesNoMenu();
            break;
        case 15:
            sub_8079034();
--- a/src/tv.c
+++ b/src/tv.c
@@ -69,7 +69,9 @@ EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
 EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};

 // Static ROM declarations
-
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 void ClearPokemonNews(void);
 u8 GetTVChannelByShowType(u8 kind);
 u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void);