diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/daycare.c | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
Diffstat (limited to 'src/daycare.c')
| -rw-r--r-- | src/daycare.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/daycare.c b/src/daycare.c index c80a8b743..2356b36f5 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -63,7 +63,7 @@ EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0}; static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = { - .priority = 0, + .bg = 0, .tilemapLeft = 15, .tilemapTop = 1, .width = 14, @@ -1206,17 +1206,17 @@ static void GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *dest) static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y) { - struct TextSubPrinter printer; + struct TextPrinterTemplate printer; - printer.current_text_offset = text; + printer.currentChar = text; printer.windowId = windowId; printer.fontId = 1; printer.x = x; printer.y = y; printer.currentX = x; printer.currentY = y; - printer.fontColor_l = 0; - gTextFlags.flag_1 = 0; + printer.unk = 0; + gTextFlags.useAlternateDownArrow = 0; printer.letterSpacing = 0; printer.lineSpacing = 1; printer.fgColor = 2; |