diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
| commit | 956090b05f678db9f43d567131d6d43ce11806ec (patch) | |
| tree | 0f8318bf22c1e6f049772fd0846af6db14e86349 /include/strings.h | |
| parent | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (diff) | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/strings.h b/include/strings.h index eda1c55e4..a1912fb32 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2514,11 +2514,11 @@ extern const u8 gText_WinsLosses[]; extern const u8 gText_PokemonTrades[]; extern const u8 gText_BerryCrush[]; extern const u8 gText_UnionTradesAndBattles[]; -extern const u8 gText_Var1DarkGreyShadowLightGrey[]; +extern const u8 gText_NumPokeblocks[]; extern const u8 gText_PokeblocksWithFriends[]; extern const u8 gText_WonContestsWFriends[]; -extern const u8 gText_WSlashStraightSlash[]; -extern const u8 gText_Var1DarkLightGreyBP[]; +extern const u8 gText_WinsStraight[]; +extern const u8 gText_NumBP[]; extern const u8 gText_BattleTower[]; extern const u8 gText_BattlePtsWon[]; @@ -2914,8 +2914,11 @@ extern const u8 gText_NumberRegistered[]; extern const u8 gText_NumberOfBattles[]; extern const u8 gText_Unknown[]; extern const u8 gText_TrainerCloseBy[]; +extern const u8 gText_Call[]; +extern const u8 gText_Check[]; +extern const u8 gText_Cancel6[]; -// pokenav_unk_2 +// Pokenav Menu Handler extern const u8 gText_CheckMapOfHoenn[]; extern const u8 gText_CheckPokemonInDetail[]; extern const u8 gText_CallRegisteredTrainer[]; @@ -2932,15 +2935,8 @@ extern const u8 gText_FindToughPokemon[]; extern const u8 gText_ReturnToConditionMenu[]; extern const u8 gText_NoRibbonWinners[]; -// pokenav_unk_4 -extern const u8 gText_Call[]; -extern const u8 gText_Check[]; -extern const u8 gText_Cancel6[]; - -// pokenav_unk_8 +// Pokenav Ribbons extern const u8 gText_NumberF700[]; - -// pokenav_unk_10 extern const u8 gText_RibbonsF700[]; // use_pokeblock |