diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-06 11:44:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 11:44:14 -0600 |
| commit | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (patch) | |
| tree | 490f5c185053db27730eefe1f6764b406d4adfb2 /include/menu.h | |
| parent | ccc5d27fcb8647225656b06a60a7d79ad0fa299f (diff) | |
| parent | 9afe7a896e7bf9257d3c73c8fb592f0b9243d520 (diff) | |
Merge pull request #377 from DizzyEggg/render_text
Match Render text and attempt to clean up
Diffstat (limited to 'include/menu.h')
| -rw-r--r-- | include/menu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/menu.h b/include/menu.h index 175eabc07..842f33c0b 100644 --- a/include/menu.h +++ b/include/menu.h @@ -26,15 +26,15 @@ u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); void NewMenuHelpers_DrawDialogueFrame(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); -u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); +u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); -u8 GetPlayerTextSpeed(void); +u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); -void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16)); +void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); @@ -82,7 +82,7 @@ void sub_819A344(u8 a0, u8 *dest, u8 color); void RemoveMapNamePopUpWindow(void); u8 GetMapNamePopUpWindowId(void); u8 AddMapNamePopUpWindow(void); -void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing); +void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); |