Merge branch 'master' into continue_union_room

This commit is contained in:
PikalaxALT
2019-03-30 12:41:10 -04:00
26 changed files with 3595 additions and 8781 deletions

View File

@@ -101,5 +101,6 @@ void sub_8198314(void);
void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram);
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed);
void sub_8198C78(void);
void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
#endif // GUARD_MENU_H