Merge branch 'master' into link

This commit is contained in:
scnorton
2018-01-18 12:53:31 -05:00
3620 changed files with 632656 additions and 52484 deletions
+6 -1
View File
@@ -4,6 +4,9 @@
#include "text.h"
#include "window.h"
#define MENU_NOTHING_CHOSEN -2
#define MENU_B_PRESSED -1
struct MenuAction
{
const u8 *text;
@@ -33,7 +36,9 @@ void copy_decompressed_tile_data_to_vram_autofree(u8 arg0, const void *arg1, boo
s8 ProcessMenuInputNoWrap_(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
void sub_8197DF8(u8 windowId, bool8 copyToVram);
#endif // GUARD_MENU_H