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/start_menu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index 37d361c0b..c95c8b3f0 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -21,6 +21,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "trainer_card.h"
 
@@ -54,10 +55,8 @@ EWRAM_DATA static u8 sNumStartMenuActions = 0;
 EWRAM_DATA static u8 sCurrentStartMenuActions[10] = {0};
 
 //Text strings
-extern u8 gSystemText_Saving[];
 extern u8 gSaveText_PlayerSavedTheGame[];
 extern u8 gSaveText_DontTurnOff[];
-extern u8 gSystemText_SaveErrorExchangeBackup[];
 extern u8 gSaveText_ThereIsAlreadyAFile[];
 extern u8 gSaveText_ThereIsADifferentFile[];
 extern u8 gSaveText_WouldYouLikeToSave[];
@@ -113,7 +112,7 @@ static u8 SaveCallback1(void);
 static u8 SaveCallback2(void);
 static void sub_807160C(void);
 static u8 RunSaveDialogCallback(void);
-static void DisplaySaveMessageWithCallback(u8 *ptr, u8 (*func)(void));
+static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void));
 static void Task_SaveDialog(u8 taskId);
 static void sub_8071700(void);
 static void HideSaveDialog(void);
@@ -517,7 +516,7 @@ void InitSaveDialog(void)
     CreateTask(Task_SaveDialog, 0x50);
 }
 
-static void DisplaySaveMessageWithCallback(u8 *ptr, u8 (*func)(void))
+static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void))
 {
     StringExpandPlaceholders(gStringVar4, ptr);
     MenuDisplayMessageBox();
-- 
cgit v1.2.3


From d35dc5bd698b8e359669ac0e5bc74b2df0e58bd8 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 21 May 2017 12:46:28 +0200
Subject: Add strings2.h

---
 src/start_menu.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index c95c8b3f0..fb9013f7c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -22,6 +22,7 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "strings.h"
+#include "strings2.h"
 #include "task.h"
 #include "trainer_card.h"
 
@@ -60,17 +61,6 @@ extern u8 gSaveText_DontTurnOff[];
 extern u8 gSaveText_ThereIsAlreadyAFile[];
 extern u8 gSaveText_ThereIsADifferentFile[];
 extern u8 gSaveText_WouldYouLikeToSave[];
-extern u8 gOtherText_SafariStock[];
-extern u8 SystemText_Pokedex[];
-extern u8 SystemText_Pokemon[];
-extern u8 SystemText_BAG[];
-extern u8 SystemText_Pokenav[];
-extern u8 SystemText_Player[];
-extern u8 SystemText_Save[];
-extern u8 SystemText_Option[];
-extern u8 SystemText_Exit[];
-extern u8 SystemText_Retire[];
-extern u8 SystemText_Player[];
 
 static u8 StartMenu_PokedexCallback(void);
 static u8 StartMenu_PokemonCallback(void);
-- 
cgit v1.2.3