diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-10 09:47:12 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-10 09:47:12 -0400 |
commit | dfc83cf28f0040a62ea52fb7ab7783d4e15baded (patch) | |
tree | ad39d622d237df4d97ee6c8c0ba0346aa1a59fd3 /include/strings.h | |
parent | 5efe8f3a0d0db0228fd0980c90013a4602c731b3 (diff) | |
parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) |
Merge branch 'master' into contest
Diffstat (limited to 'include/strings.h')
-rw-r--r-- | include/strings.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/include/strings.h b/include/strings.h index 7a96dc036..e5459c320 100644 --- a/include/strings.h +++ b/include/strings.h @@ -74,6 +74,10 @@ extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_DecorationThrownAway[]; +extern const u8 gText_PokeBalls[]; +extern const u8 gText_Berries[]; +extern const u8 gText_Berry[]; + extern const u8 gText_Desk[]; extern const u8 gText_Chair[]; extern const u8 gText_Plant[]; @@ -336,7 +340,7 @@ extern const u8 gText_Var1DotVar2[]; extern const u8 gText_ThreeMarks[]; extern const u8 gText_FirmSlash[]; -//item menu screen text +// item menu screen text extern const u8 gText_CloseBag[]; extern const u8 gText_ClearTo11Var1Clear5Var2[]; extern const u8 gText_UnkF908Var1Clear7Var2[]; @@ -362,11 +366,11 @@ extern const u8 gText_DepositedVar2Var1s[]; extern const u8 gText_NoRoomForItems[]; extern const u8 gText_ThreeDashes[]; -//party menu text +// party menu text extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; -//birch dex rating text +// birch dex rating text extern const u8 gBirchDexRatingText_LessThan10[]; extern const u8 gBirchDexRatingText_LessThan20[]; extern const u8 gBirchDexRatingText_LessThan30[]; @@ -389,7 +393,7 @@ extern const u8 gBirchDexRatingText_LessThan190[]; extern const u8 gBirchDexRatingText_LessThan200[]; extern const u8 gBirchDexRatingText_DexCompleted[]; -//player pc text +// player pc text extern const u8 gText_WhatWouldYouLike[]; extern const u8 gText_NoMailHere[]; @@ -431,5 +435,15 @@ extern const u8 gText_MoveVar1Where[]; extern const u8 gText_ColorLightShadowDarkGrey[]; extern const u8 gText_ColorBlue[]; +extern const u8 gText_Friend[]; +extern const u8 gText_Tristan[]; +extern const u8 gText_Philip[]; +extern const u8 gText_Dennis[]; +extern const u8 gText_Roberto[]; +extern const u8 gText_FiveMarks[]; + +extern const u8 gText_TotalRecordWLD[]; +extern const u8 gText_PlayersBattleResults[]; +extern const u8 gText_WinLoseDraw[]; #endif //GUARD_STRINGS_H |