From 7c4f99560812cd5a8eedb124a9bc99c3f4243438 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 21 May 2017 11:37:35 +0200
Subject: Remove duplicate strings.h declarations

---
 src/battle_setup.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0753fba70..61b9bb1e9 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -23,6 +23,7 @@
 #include "species.h"
 #include "starter_choose.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "trainer.h"
@@ -45,8 +46,6 @@ EWRAM_DATA u8 *gTrainerCannotBattleSpeech = NULL;
 EWRAM_DATA u8 *gTrainerBattleScriptReturnAddress = NULL;
 EWRAM_DATA u8 *gTrainerBattleEndScript = NULL;
 
-extern u8 gOtherText_CancelWithTerminator[];
-
 extern u16 gBattleTypeFlags;
 extern u16 gScriptLastTalked;
 extern u8 gUnknown_02024D26;
@@ -1169,12 +1168,12 @@ void PlayTrainerEncounterMusic(void)
 }
 
 //Returns an empty string if a null pointer was passed, otherwise returns str
-u8 *SanitizeString(u8 *str)
+u8 *SanitizeString(const u8 *str)
 {
     if (str)
-        return str;
+        return (u8 *) str;
     else
-        return gOtherText_CancelWithTerminator;
+        return (u8 *) gOtherText_CancelWithTerminator;
 }
 
 u8 *sub_808281C(void)
-- 
cgit v1.2.3


From 6f2cd1e2da53cb0c4a4f4465d8ad72532050174d Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 21 May 2017 13:25:26 +0200
Subject: Add data2 header

---
 src/battle_setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 61b9bb1e9..a70157a43 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -2,6 +2,7 @@
 #include "battle_setup.h"
 #include "asm.h"
 #include "battle.h"
+#include "data2.h"
 #include "event_data.h"
 #include "field_control_avatar.h"
 #include "field_map_obj_helpers.h"
@@ -34,7 +35,6 @@ extern void (*gUnknown_0300485C)(void);
 
 extern struct Pokemon gEnemyParty[];
 extern struct Pokemon gPlayerParty[];
-extern struct Trainer gTrainers[];
 
 EWRAM_DATA u16 gTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent = 0;
@@ -752,7 +752,7 @@ u8 GetWildBattleTransition(void)
 
 u8 GetTrainerBattleTransition(void)
 {
-    struct Trainer *trainer;
+    const struct Trainer *trainer;
     u8 minPartyCount;
     u8 flashVar;
     u8 level;
-- 
cgit v1.2.3