Merge branch 'master' into link

2018-01-18 12:53:31 -05:00
parent 3c2b1731ee 24e0edee9f
commit c6ff1a6ce3
3620 changed files with 632656 additions and 52484 deletions
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -16,5 +16,6 @@ void sub_8197434(u8 a0, u8 a1);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
 u8 GetPlayerTextSpeed(void);
+void sub_81978B0(u16 arg0);

 #endif // GUARD_NEW_MENU_HELPERS_H