Make Ruby compile with gcc-8

12 files changed, 10 insertions, 45 deletions

diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 7ebd7dd87..1d69b2c1c 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -467,6 +467,7 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION?
 
         break;
     default:
+        break;
     }
 }
 
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 52911f366..69d47a998 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -1145,7 +1145,8 @@ static void sub_80DF0B8(struct Sprite *sprite)
 
         if (++coeffB > 16)
             coeffB = 16;
-        if (--(s16)coeffA < 0)
+        --coeffA;
+        if ((s16)coeffA < 0)
             coeffA = 0;
 
         REG_BLDALPHA = (coeffB << 8) | coeffA;
diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c
index e191460ea..94bf490c2 100644
--- a/src/battle/anim/heal_bell.c
+++ b/src/battle/anim/heal_bell.c
@@ -76,7 +76,7 @@ void sub_80D1ADC(u8 taskId)
 {
     int i;
     u8 sp[8];
-    void* src;
+    const void* src;
     void* dest;
     void* what;
     sp[0] = IndexOfSpritePaletteTag(0x27DE);
diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c
index 1e559d975..1a58c4daf 100644
--- a/src/battle/anim/musical.c
+++ b/src/battle/anim/musical.c
@@ -291,7 +291,7 @@ void sub_80CECE8(struct Sprite* sprite)
     if (GetBattlerSide(gBattleAnimAttacker) == 1)
     {
         a = gBattleAnimArgs[1]; 
-        (u16)gBattleAnimArgs[1] = -a;
+        *(u16*)&gBattleAnimArgs[1] = -a;
     }
 
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 6e1ddceaf..0ff44a249 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -94,9 +94,7 @@ const struct SpritePalette gUnknown_0820A4D4[] =
 };
 
 extern void c3_0802FDF4(u8);
-extern void sub_80440EC();
 extern void sub_804777C();
-extern u8 GetBattlerSpriteCoord();
 extern u8 IsBankSpritePresent(u8);
 extern u8 sub_8077F68(u8);
 extern u8 sub_8077F7C(u8);
diff --git a/src/battle/battle_anim_80CA710.c b/src/battle/battle_anim_80CA710.c
index 65ccd7c21..75168f083 100644
--- a/src/battle/battle_anim_80CA710.c
+++ b/src/battle/battle_anim_80CA710.c
@@ -6,10 +6,10 @@
 
 // Static RAM declarations
 
-IWRAM_DATA u32 filler_03000724;
-IWRAM_DATA u16 gUnknown_03000728[4];
-IWRAM_DATA u16 gUnknown_03000730[6];
-IWRAM_DATA u32 filler_0300073c;
+BSS_DATA u32 filler_03000724;
+BSS_DATA u16 gUnknown_03000728[4];
+BSS_DATA u16 gUnknown_03000730[6];
+BSS_DATA u32 filler_0300073c;
 
 // Static ROM declarations
 
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 117aeb932..05a6f8ac0 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -55,7 +55,6 @@ extern MainCallback gPreBattleCallback1;
 extern struct MusicPlayerInfo gMPlay_BGM;
 
 extern u8 sub_8077F68();
-extern u8 GetBattlerSubpriority();
 extern u8 GetBattlerPosition(u8);
 extern void BattleLoadOpponentMonSprite(struct Pokemon *, u8);
 extern void sub_8037A74(void);
@@ -64,7 +63,6 @@ extern void sub_8037E30(void);
 extern void sub_80312F0(struct Sprite *);
 extern u8 StartSendOutMonAnimation();
 extern void sub_8032A08();
-extern void sub_8043DB0();
 extern void sub_8037BBC(void);
 extern s32 sub_803FC34(u16);
 extern void sub_8031A6C(u16, u8);
@@ -78,15 +76,12 @@ extern void sub_8010384(struct Sprite *);
 extern void sub_8037B78(void);
 extern u8 sub_8031720();
 extern bool8 mplay_80342A4(u8);
-extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
 extern void BufferStringBattle();
 extern void sub_8037C2C(void);
-extern void sub_8043D84();
 extern void sub_8037B24(void);
-extern void sub_8045A5C();
 extern void sub_8037FAC(void);
 extern void move_anim_start_t2_for_situation();
 extern void dp01t_0F_4_move_anim(void);
@@ -99,7 +94,6 @@ extern void nullsub_47(void);
 extern bool8 IsDoubleBattle(void);
 extern void sub_8037840(void);
 extern void sub_8031B74();
-extern u8 IsBankSpritePresent();
 extern u8 move_anim_start_t3();
 extern void sub_8037FD8(void);
 extern void sub_8037F34(void);
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 0db2f54b4..018fd1bf0 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -58,17 +58,14 @@ extern u8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 
 extern u8 move_anim_start_t3();
-extern u8 IsBankSpritePresent();
 extern void sub_8044CA0(u8);
 extern void sub_8030E38(struct Sprite *);
 extern void StartBattleIntroAnim();
 extern void sub_8047858();
 extern void move_anim_start_t2_for_situation();
-extern void sub_8043D84();
 extern void BufferStringBattle();
 extern void sub_8031F24(void);
 extern void sub_80326EC();
-extern void DoMoveAnim();
 extern void sub_80324BC();
 extern u8 sub_8031720();
 extern u8 mplay_80342A4();
@@ -83,21 +80,10 @@ extern u8 StartSendOutMonAnimation();
 extern void sub_80312F0(struct Sprite *);
 extern u8 CreateInvisibleSpriteWithCallback();
 extern void BattleLoadPlayerMonSprite();
-extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 GetBattlerSubpriority();
 extern void nullsub_10();
-extern void sub_8045A5C();
-extern void sub_804777C();
-extern void sub_8043DFC();
-//extern s16 sub_8045C78();
-extern void sub_80440EC();
-extern void HandleLowHpMusicChange();
 extern void nullsub_9(u16);
-extern void sub_8043DB0();
-extern void move_anim_start_t4();
 extern void c3_0802FDF4(u8);
-extern void sub_8031F88();
 extern void c2_8011A1C(void);
 
 // this file's functions
@@ -327,7 +313,7 @@ void sub_811DCA0(void)
             sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], 0);
             sub_804777C(gActiveBattler);
             sub_8043DFC(gHealthboxIDs[gActiveBattler]);
-            (s8)ewram17810[4].unk9 &= ~1;
+            ewram17810[4].unk9 = (s8)ewram17810[4].unk9 & ~1;
             gBattleBankFunc[gActiveBattler] = sub_811DBC0;
         }
     }
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 15e077e92..8717f7f82 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -59,15 +59,12 @@ extern bool8 gDoingBattleAnim;
 extern u16 gUnknown_02024DE8;
 extern u8 gUnknown_02024E68[];
 extern MainCallback gPreBattleCallback1;
-extern void (*const gOpponentBufferCommands[])(void);
 extern struct MusicPlayerInfo gMPlay_SE1;
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBattleExecBuffer;
 
-extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 GetBattlerSubpriority();
 extern void sub_8033018(void);
 extern void BattleLoadOpponentMonSprite();
 extern u8 GetBattlerPosition(u8);
@@ -76,7 +73,6 @@ extern void sub_80333D4(void);
 extern void sub_80312F0(struct Sprite *);
 extern u8 StartSendOutMonAnimation();
 extern void sub_8032A08();
-extern void sub_8043DB0();
 extern void sub_8033160(void);
 extern u8 get_trainer_class_pic_index(void);
 extern void sub_80313A0(struct Sprite *);
@@ -91,7 +87,6 @@ extern void sub_803311C(void);
 extern void sub_8010384(struct Sprite *);
 extern bool8 mplay_80342A4(u8);
 extern u8 sub_8031720();
-extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
@@ -100,8 +95,6 @@ extern void sub_80331D0(void);
 extern void AI_TrySwitchOrUseItem(void);
 extern u8 GetBattlerAtPosition(u8);
 extern void sub_80330C8(void);
-extern void sub_8043D84();
-extern void sub_8045A5C();
 void sub_8033494(void);
 extern void move_anim_start_t2_for_situation();
 extern void bx_blink_t7(void);
@@ -113,7 +106,6 @@ extern void nullsub_45(void);
 extern void sub_8031B74();
 extern bool8 IsDoubleBattle(void);
 extern void sub_8032E2C(void);
-extern u8 IsBankSpritePresent();
 extern u8 move_anim_start_t3();
 extern void sub_80334C0(void);
 
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 5d7a8955c..5dde153e6 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -106,7 +106,6 @@ extern void sub_802E460(void);
 extern void b_link_standby_message(void);
 extern void sub_802D18C(void);
 extern void sub_802DF18(void);
-extern void BufferStringBattle();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index e547c4a3c..1722925f3 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -45,10 +45,8 @@ extern void LoadPlayerTrainerBankSprite();
 extern u8 GetBattlerSubpriority();
 extern void sub_80313A0(struct Sprite *);
 extern void sub_810BADC(void);
-extern void sub_8045A5C();
 extern void StartBattleIntroAnim();
 extern void sub_804777C();
-extern void sub_8043DFC();
 extern bool8 move_anim_start_t3();
 
 #if ENGLISH
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index fa8b2a63b..9be426187 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -64,9 +64,7 @@ extern void Emitcmd35(u8, u16);
 
 extern void nullsub_14(void);
 extern void PrepareBagForWallyTutorial(void);
-extern void sub_8045A5C();
 extern void sub_804777C();
-extern void sub_8043DFC();
 extern bool8 IsDoubleBattle(void);
 extern void c3_0802FDF4(u8);
 extern void PlayerHandlecmd1(void);
@@ -75,11 +73,9 @@ extern u8 GetBattlerPosition(u8);
 extern void sub_80313A0(struct Sprite *);
 extern u8 GetBattlerAtPosition(u8);
 extern u8 sub_8031720();
-extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
-extern void BufferStringBattle();
 extern u8 GetBattlerSide(u8);
 extern void sub_80304A8(void);
 extern void sub_8047858();