diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /src/battle_message.c | |
parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'src/battle_message.c')
-rw-r--r-- | src/battle_message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 52c0c7af5..4bd6ca5b7 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1907,7 +1907,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.bank, *(&gBattleStruct->field_52)) break; case B_TXT_PC_CREATOR_NAME: // lanette pc - if (FlagGet(SYS_PC_LANETTE)) + if (FlagGet(FLAG_SYS_PC_LANETTE)) toCpy = gText_Lanettes; else toCpy = gText_Someones; |