diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
| commit | 092462d83dcbbacf21c03252d760732617d45da5 (patch) | |
| tree | 19e8620b02fccaa9f5c4b9693d2103761e438959 /include | |
| parent | e396bcdb7229645f4a4893b8e3c1d364a0e7930c (diff) | |
| parent | 26ca9acfa5858f1caaa67f2a5e0509a6b47ee644 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/menu.h | 1 | ||||
| -rw-r--r-- | include/money.h | 6 | ||||
| -rw-r--r-- | include/text.h | 2 | ||||
| -rw-r--r-- | include/text_window.h | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/menu.h b/include/menu.h index 99ff35adb..6a6e2e828 100644 --- a/include/menu.h +++ b/include/menu.h @@ -34,5 +34,6 @@ 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, struct TextColor *color, s8 speed, const u8 *str); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); +void sub_810F4D8(u8 windowId, bool32 someBool); #endif // GUARD_MENU_H diff --git a/include/money.h b/include/money.h index 5c7c1c984..48b15db76 100644 --- a/include/money.h +++ b/include/money.h @@ -8,9 +8,9 @@ void AddMoney(u32* moneyPtr, u32 toAdd); void RemoveMoney(u32* moneyPtr, u32 toSub); bool8 IsEnoughForCostInVar0x8005(void); void SubtractMoneyFromVar0x8005(void); -void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed); -void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed); -void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount); +void PrintMoneyAmountInMoneyBoxInMoneyBox(u8 windowId, int amount, u8 speed); +void PrintMoneyAmountInMoneyBox(u8 windowId, u8 x, u8 y, int amount, u8 speed); +void PrintMoneyAmountInMoneyBoxInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount); void ChangeAmountInMoneyBox(int amount); void DrawMoneyBox(int amount, u8 x, u8 y); void HideMoneyBox(void); diff --git a/include/text.h b/include/text.h index 61ab8cecd..7853598f8 100644 --- a/include/text.h +++ b/include/text.h @@ -192,7 +192,7 @@ extern u8 gStringVar4[]; void SetFontsPointer(const struct FontInfo *fonts); void DeactivateAllTextPrinters(void); -u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); +u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); void RunTextPrinters(void); bool16 IsTextPrinterActive(u8 id); diff --git a/include/text_window.h b/include/text_window.h index da3fb301e..3514296c1 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -18,5 +18,6 @@ void rbox_fill_rectangle(u8 windowId); const u16* stdpal_get(u8 id); const u16* GetOverworldTextboxPalettePtr(void); void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset); +void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette); #endif // GUARD_TEXT_WINDOW_H |