diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /src/berry_pouch.c | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'src/berry_pouch.c')
| -rw-r--r-- | src/berry_pouch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_pouch.c b/src/berry_pouch.c index f6b976ba3..b8b66c0bc 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void) { while (1) { - if (sub_80BF72C() == TRUE) + if ((u8)sub_80BF72C() == TRUE) break; if (RunBerryPouchInit() == TRUE) break; @@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId) { s16 * data = gTasks[taskId].data; s32 menuInput; - if (!gPaletteFade.active && sub_80BF72C() != TRUE) + if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE) { menuInput = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow); @@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId) static void Task_NormalContextMenu_HandleInput(u8 taskId) { s8 input; - if (sub_80BF72C() != TRUE) + if ((u8)sub_80BF72C() != TRUE) { input = Menu_ProcessInputNoWrapAround(); switch (input) |