diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-08 16:01:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 16:01:56 -0400 |
| commit | 0816046a73902d513d45a6bc7ab5986384411b5b (patch) | |
| tree | 0981cc30f2360f9c70b6b58f189525bef0a0381f /src/option_menu.c | |
| parent | f75c048434d5dc7538e628206c29a0730404db81 (diff) | |
| parent | 4672e05560da3f49a9fdb6be1b1a5fa73e8adccd (diff) | |
Merge pull request #346 from luckytyphlosion/master
Match (almost) all of pokemon_summary_screen.c
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 383f21ae1..f011bc1ec 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -3,7 +3,6 @@ #include "scanline_effect.h" #include "text_window_graphics.h" #include "menu.h" -#include "menu_helpers.h" #include "task.h" #include "overworld.h" #include "help_system.h" @@ -12,6 +11,9 @@ #include "field_fadetransition.h" #include "gba/m4a_internal.h" +// can't include the one in menu_helpers.h since Task_OptionMenu needs bool32 for matching +bool32 MenuHelpers_CallLinkSomething(void); + // Menu items enum { @@ -369,7 +371,7 @@ static void Task_OptionMenu(u8 taskId) sOptionMenuPtr->loadState++; break; case 2: - if (MenuHelpers_CallLinkSomething() == TRUE) + if (((bool32)MenuHelpers_CallLinkSomething()) == TRUE) break; switch (OptionMenu_ProcessInput()) { |