diff options
author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /src/secret_base.c | |
parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'src/secret_base.c')
-rw-r--r-- | src/secret_base.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 6291051a6..d88d2c66a 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -10,6 +10,7 @@ #include "main.h" #include "map_constants.h" #include "map_name_popup.h" +#include "menu.h" #include "metatile_behavior.h" #include "palette.h" #include "pokemon.h" @@ -835,7 +836,11 @@ u8 *sub_80BC190(u8 *dest, u8 arg1) { // 80bc190 str = StringCopyN(dest, gSaveBlock1.secretBases[arg1].sbr_field_2, local1); str[0] = EOS; +#if ENGLISH return StringAppend(dest, gOtherText_PlayersBase); +#elif GERMAN + return de_sub_8073174(dest, gOtherText_PlayersBase); +#endif } u8 *GetSecretBaseMapName(u8 *dest) { |