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/wallclock.c | |
parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) |
Merge remote-tracking branch 'pret/master' into script_menu
Diffstat (limited to 'src/wallclock.c')
-rw-r--r-- | src/wallclock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallclock.c b/src/wallclock.c index ffa74cd50..60a5fae07 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -57,13 +57,13 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite); // rodata -static const u8 sUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz"); +static const u32 sUnknown_085B1F58[] = INCBIN_U32("graphics/wallclock/graphics_85b1f58.4bpp.lz"); static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal"); -static const struct WindowTemplate gUnknown_085B21DC[] = +static const struct WindowTemplate gUnknown_085B21DC[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 3, .tilemapTop = 17, .width = 24, @@ -72,7 +72,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] = .baseBlock = 512 }, { - .priority = 2, + .bg = 2, .tilemapLeft = 24, .tilemapTop = 16, .width = 6, @@ -84,7 +84,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] = }; static const struct WindowTemplate gUnknown_085B21F4 = { - .priority = 0, + .bg = 0, .tilemapLeft = 24, .tilemapTop = 9, .width = 5, |