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/menu_helpers.c | |
parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) |
fix conflicts
Diffstat (limited to 'src/menu_helpers.c')
-rw-r--r-- | src/menu_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 06e7bb08b..f17bff0d0 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -125,17 +125,17 @@ bool8 MenuHelpers_LinkSomething(void) return FALSE; } -bool8 sub_80BF72C(void) +bool32 sub_80BF72C(void) { if (!MenuHelpers_LinkSomething()) return FALSE; else - return sub_8058244(); + return (u8)sub_8058244(); } bool8 sub_80BF748(void) { - if (sub_80BF72C() == TRUE) + if ((u8)sub_80BF72C() == TRUE) return TRUE; else if (sub_800B270() != TRUE) return FALSE; |