dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

Browse Source
This commit is contained in:
Slawter666
2018-11-12 14:14:50 +00:00
parent be33878b94 65f053fd89
commit 1b895ff52c
258 changed files with 80987 additions and 87448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallclock.c
+6 -6
View File
@@ -68,13 +68,13 @@ enum
// 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,
@@ -83,7 +83,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] =
.baseBlock = 512
},
{
.priority = 2,
.bg = 2,
.tilemapLeft = 24,
.tilemapTop = 16,
.width = 6,
@@ -95,7 +95,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] =
};
static const struct WindowTemplate gUnknown_085B21F4 =
{
.priority = 0,
.bg = 0,
.tilemapLeft = 24,
.tilemapTop = 9,
.width = 5,
@@ -803,7 +803,7 @@ static void Task_SetClock3(u8 taskId)
static void Task_SetClock4(u8 taskId)
{
switch (Menu_ProcessInputNoWrap_())
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
case 0: //YES
PlaySE(SE_SELECT);