Merge branch 'master' into mail

2017-10-13 11:16:34 -04:00
parent 74c59af856 52db3ad5aa
commit e24f3808f4
94 changed files with 13841 additions and 20563 deletions
@@ -30,5 +30,6 @@ void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
 void sub_8086230(void);
 void c2_exit_to_overworld_2_switch(void);
 bool32 sub_8087598(void);
+void c2_exit_to_overworld_1_continue_scripts_restart_music(void);

 #endif //GUARD_ROM4_H