fix record mixing merge conflicts

2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
@@ -9,6 +9,8 @@

 void sub_80FA5E4(s16 id, s16 x, s16 y);
 void sub_80FA794(s16 x, s16 y);
+void sub_80FB00C(void);
+void sub_80FB074(void);
 void overworld_poison_effect(void);
 bool8 sub_80FADE4(u16, u8);