merge bike with master, fix conflicts

1 files changed, 51 insertions, 6 deletions

diff --git a/include/strings.h b/include/strings.h
index e3650bc63..5521d828b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,45 +1,62 @@
 #ifndef GUARD_STRINGS_H
 #define GUARD_STRINGS_H
 
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-
 extern const u8 gText_FromSpace[];
+
 extern const u8 gText_Lv50[];
 extern const u8 gText_OpenLevel[];
+
 extern const u8 gText_Mom[];
 extern const u8 gText_Dad[];
+
 extern const u8 gText_Cool[];
 extern const u8 gText_Beauty[];
 extern const u8 gText_Cute[];
 extern const u8 gText_Smart[];
 extern const u8 gText_Tough[];
+
 extern const u8 gText_Single[];
 extern const u8 gText_Double[];
+
+extern const u8 gText_Spicy[];
+extern const u8 gText_Dry[];
+extern const u8 gText_Sweet[];
+extern const u8 gText_Bitter[];
+extern const u8 gText_Sour[];
+
+extern const u8 gText_StowCase[];
+extern const u8 gText_LvVar1[];
+
 extern const u8 gText_Spicy2[];
 extern const u8 gText_Dry2[];
 extern const u8 gText_Sweet2[];
 extern const u8 gText_Bitter2[];
 extern const u8 gText_Sour2[];
+
 extern const u8 gText_Excellent[];
 extern const u8 gText_VeryGood[];
 extern const u8 gText_Good[];
 extern const u8 gText_SoSo[];
 extern const u8 gText_Bad[];
 extern const u8 gText_TheWorst[];
+
 extern const u8 gText_Slots[];
 extern const u8 gText_Roulette[];
 extern const u8 gText_Jackpot[];
+
 extern const u8 gText_First[];
 extern const u8 gText_Second[];
 extern const u8 gText_Third[];
+
 extern const u8 gText_NoDecorations[];
 extern const u8 gText_NoDecorationsInUse[];
+
 extern const u8 gText_Exit[];
 extern const u8 gText_Cancel[];
+
+extern const u8 gText_ThrowAwayVar1[];
+extern const u8 gText_Var1ThrownAway[];
+
 extern const u8 gText_Color161Shadow161[];
 extern const u8 gText_GoBackPrevMenu[];
 extern const u8 gText_CantPlaceInRoom[];
@@ -56,12 +73,14 @@ extern const u8 gText_NoDecorationHere[];
 extern const u8 gText_DecorationWillBeDiscarded[];
 extern const u8 gText_CantThrowAwayInUse[];
 extern const u8 gText_DecorationThrownAway[];
+
 extern const u8 gText_Desk[];
 extern const u8 gText_Chair[];
 extern const u8 gText_Plant[];
 extern const u8 gText_Ornament[];
 extern const u8 gText_Mat[];
 extern const u8 gText_Poster[];
+
 extern const u8 gText_PutOutSelectedDecorItem[];
 extern const u8 gText_StoreChosenDecorInPC[];
 extern const u8 gText_ThrowAwayUnwantedDecors[];
@@ -92,4 +111,30 @@ extern const u8 gText_Draw[];
 extern const u8 gText_Loss[];
 extern const u8 gText_Win[];
 
+extern const u8 gText_Var1AteTheVar2[];
+extern const u8 gText_Var1HappilyAteVar2[];
+extern const u8 gText_Var1DisdainfullyAteVar2[];
+
+extern const u8 gText_RedPokeblock[];
+extern const u8 gText_BluePokeblock[];
+extern const u8 gText_PinkPokeblock[];
+extern const u8 gText_GreenPokeblock[];
+extern const u8 gText_YellowPokeblock[];
+extern const u8 gText_PurplePokeblock[];
+extern const u8 gText_IndigoPokeblock[];
+extern const u8 gText_BrownPokeblock[];
+extern const u8 gText_LiteBluePokeblock[];
+extern const u8 gText_OlivePokeblock[];
+extern const u8 gText_GrayPokeblock[];
+extern const u8 gText_BlackPokeblock[];
+extern const u8 gText_WhitePokeblock[];
+extern const u8 gText_GoldPokeblock[];
+
+extern const u8 gMenuText_Use[];
+extern const u8 gMenuText_Toss[];
+extern const u8 gMenuText_Give[];
+extern const u8 gMenuText_Give2[];
+
+extern const u8 gText_Cancel2[];
+
 #endif //GUARD_STRINGS_H