summaryrefslogtreecommitdiff
path: root/include/menu.h
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-08-12 12:54:07 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-08-12 12:54:07 -0700
commit2dd5fc23d4d34890e17a412ae9ad80e23c7aa50d (patch)
treef537d11172aca6f048cd8612a85f84c2482208a8 /include/menu.h
parenta000eb4f3619c1df9326961b3afe8a4392c05827 (diff)
Prepare learn_move for merge
Diffstat (limited to 'include/menu.h')
-rw-r--r--include/menu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/menu.h b/include/menu.h
index 4cc43dd4c..5dfd99c64 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -46,7 +46,7 @@ void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
u8 GetMenuCursorPos(void);
s8 ProcessMenuInput(void);
-s8 ProcessMenuInputNoWrapAround(void);
+s8 Menu_ProcessInputNoWrapAround(void);
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void);
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
@@ -54,7 +54,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void);
struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
-s8 ProcessMenuInputNoWrap_(void);
+s8 Menu_ProcessInputNoWrap_(void);
s8 ProcessMenuInput_other(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);