Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

1 files changed, 9 insertions, 9 deletions

diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 81c88a15e..84c5c2ea2 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -14,16 +14,16 @@ u8 sub_81850D0(void);
 u8 sub_81850DC(u8 *arg0);
 void sub_81851A8(u8 *arg0);
 bool32 CanCopyRecordedBattleSaveData(void);
-u32 MoveRecordedBattleToSaveData(void);
+bool32 MoveRecordedBattleToSaveData(void);
 void PlayRecordedBattle(void (*CB2_After)(void));
 u8 GetRecordedBattleFrontierFacility(void);
-u8 sub_8185EAC(void);
+u8 GetRecordedBattleFronterBrainSymbol(void);
 void RecordedBattle_SaveParties(void);
 u8 GetActiveBattlerLinkPlayerGender(void);
 void sub_8185F84(void);
 void sub_8185F90(u16 arg0);
 u8 sub_8185FAC(void);
-u8 GetBattleStyleInRecordedBattle(void);
+u8 GetBattleSceneInRecordedBattle(void);
 u8 GetTextSpeedInRecordedBattle(void);
 void RecordedBattle_CopyBattlerMoves(void);
 void sub_818603C(u8 arg0);
@@ -31,11 +31,11 @@ u32 GetAiScriptsInRecordedBattle(void);
 void sub_8186444(void);
 bool8 sub_8186450(void);
 void sub_8186468(u8 *dst);
-u8 sub_818649C(void);
-u8 sub_81864A8(void);
-u8 sub_81864B4(void);
-u8 sub_81864C0(void);
-void sub_81864CC(void);
-u16 *sub_81864E0(void);
+u8 GetRecordedBattleRecordMixFriendClass(void);
+u8 GetRecordedBattleApprenticeId(void);
+u8 GetRecordedBattleRecordMixFriendLanguage(void);
+u8 GetRecordedBattleApprenticeLanguage(void);
+void RecordedBattle_SaveBattleOutcome(void);
+u16 *GetRecordedBattleEasyChatSpeech(void);
 
 #endif // GUARD_RECORDED_BATTLE_H