diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/daycare.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
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; |