From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Oct 2018 02:24:57 -0500 Subject: Fix LZ compressed data alignment --- src/wallclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wallclock.c') diff --git a/src/wallclock.c b/src/wallclock.c index 6bcfa1717..d6b2b5d50 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -57,7 +57,7 @@ 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[] = -- cgit v1.2.3 From b252bd029279b6f28518c59df1ba03caf44d756f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 00:53:07 +0200 Subject: Window priority to window bg --- src/wallclock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/wallclock.c') diff --git a/src/wallclock.c b/src/wallclock.c index d6b2b5d50..947b7f103 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -60,10 +60,10 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite); 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, -- cgit v1.2.3 From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 5 Nov 2018 14:45:54 -0600 Subject: r5/r6 swap on sub_80E2578 --- src/wallclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wallclock.c') diff --git a/src/wallclock.c b/src/wallclock.c index 6bcfa1717..ffa74cd50 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -792,7 +792,7 @@ static void Task_SetClock3(u8 taskId) static void Task_SetClock4(u8 taskId) { - switch (Menu_ProcessInputNoWrap_()) + switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: PlaySE(SE_SELECT); -- cgit v1.2.3