recorded battle merge conflicts fix

2017-11-17 19:34:55 +01:00
parent 3e1f3d0e1e a98c6bf210
commit d0245cf8d2
2890 changed files with 157210 additions and 15752 deletions
--- 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;