summaryrefslogtreecommitdiff
path: root/include/menu.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-18 16:58:14 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-18 16:58:14 +0100
commitcb229f56e8951e3f9efc35516447a54e18e8fef0 (patch)
tree656599caae716c6cc8e81121f2b1cd061927b99e /include/menu.h
parentc3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff)
parent6a674e1e83db097d7a31a3786d12e42987f09f70 (diff)
fix pokeblock conflicts
Diffstat (limited to 'include/menu.h')
-rw-r--r--include/menu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/menu.h b/include/menu.h
index e5e69160a..124303570 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -32,7 +32,7 @@ int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u
bool8 free_temp_tile_data_buffers_if_possible(void);
u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
-s8 sub_8198C58(void);
+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, const struct TextColor *color, s8 speed, const u8 *str);