diff options
author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /src/battle/battle_message.c | |
parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) |
Merge branch 'master' into decompile_data
Diffstat (limited to 'src/battle/battle_message.c')
-rw-r--r-- | src/battle/battle_message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index fb045c8a7..6faa3ace3 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -762,7 +762,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, BATTLE_STRUCT->unk1605E) break; case 35: // lanette pc - if (FlagGet(SYS_PC_LANETTE)) + if (FlagGet(FLAG_SYS_PC_LANETTE)) toCpy = BattleText_Lanette; else toCpy = BattleText_Someone; |