diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
| commit | 607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch) | |
| tree | 8894b0b686adc29286d078500932306fabbc2973 /include/menu.h | |
| parent | 663ecd00145da49fda7d2509d629d737ea633cd8 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into battle_refactor
Diffstat (limited to 'include/menu.h')
| -rw-r--r-- | include/menu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/menu.h b/include/menu.h index 124303570..e5f705cae 100644 --- a/include/menu.h +++ b/include/menu.h @@ -35,7 +35,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs 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); +void AddTextPrinterParameterized2(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); |