Merge branch 'master' into heal_location

2017-11-02 07:59:29 -04:00
parent 6543d7f2d6 af197ccd3b
commit ab3b8cd51a
55 changed files with 17065 additions and 11647 deletions
--- a/include/menu.h
+++ b/include/menu.h
@@ -21,6 +21,7 @@ void PrintMenuTable(u8 idx, u8 nstrs, const struct MenuAction *strs);
 void InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 idx, u8 nstrs,u8);
 u8 GetMenuCursorPos(void);
 s8 ProcessMenuInput(void);
+s8 ProcessMenuInputNoWrapAround(void);
 void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
 void reset_temp_tile_data_buffers(void);
 int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u16 offset, u8 mode);