diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
| commit | d84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch) | |
| tree | c5ba0778afca66a91f71815cd53fe9abef1bdac6 /src/main_menu.c | |
| parent | ad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff) | |
| parent | c3cfd6065825ec8ddd5e1782998071518efaa322 (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index e6e29d942..504c1bd33 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -23,7 +23,7 @@ #include "palette.h" #include "pokeball.h" #include "pokedex.h" -#include "pokemon_3.h" +#include "pokemon.h" #include "random.h" #include "rtc.h" #include "save.h" @@ -38,6 +38,7 @@ #include "text_window.h" #include "title_screen.h" #include "window.h" +#include "mystery_gift.h" /* * Main menu state machine @@ -525,7 +526,7 @@ enum ACTION_OPTION, ACTION_MYSTERY_GIFT, ACTION_MYSTERY_EVENTS, - ACTION_UNKNOWN, // TODO: change when rom_8011DC0 decompiled + ACTION_EREADER, ACTION_INVALID }; @@ -1033,7 +1034,7 @@ static void Task_HandleMainMenuAPressed(u8 taskId) } else { - action = ACTION_UNKNOWN; + action = ACTION_EREADER; } break; case 3: @@ -1082,8 +1083,8 @@ static void Task_HandleMainMenuAPressed(u8 taskId) SetMainCallback2(CB2_InitMysteryEventMenu); DestroyTask(taskId); break; - case ACTION_UNKNOWN: - SetMainCallback2(sub_801867C); + case ACTION_EREADER: + SetMainCallback2(c2_ereader); DestroyTask(taskId); break; case ACTION_INVALID: |