summaryrefslogtreecommitdiff
path: root/include/recorded_battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-20 10:49:21 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-20 10:49:21 +0200
commitb65da491a97e77ed2aa122ab7342c7fb94d35606 (patch)
tree02e7c17f29426d6bca7bae4d133e1462dc81c355 /include/recorded_battle.h
parent9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff)
parentae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff)
merge with master, fix conflicts
Diffstat (limited to 'include/recorded_battle.h')
-rw-r--r--include/recorded_battle.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 65ad998e6..6b80e220f 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -3,6 +3,7 @@
extern u32 gRecordedBattleRngSeed;
+void sub_8184DA4(u8 arg0);
void sub_8185F84(void);
void sub_8184E58(void);
void RecordedBattle_SetBankAction(u8 bank, u8 action);
@@ -15,5 +16,7 @@ u8 MoveRecordedBattleToSaveData(void);
void sub_818603C(u8);
void sub_8185FD0(void);
void sub_8186444(void);
+void sub_8185EB8(void);
+u8 sub_81850DC(u8 *arg0);
#endif // GUARD_RECORDED_BATTLE_H