diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /include/pokemon_menu.h | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'include/pokemon_menu.h')
| -rw-r--r-- | include/pokemon_menu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h index 57a313d89..099c3a3bc 100644 --- a/include/pokemon_menu.h +++ b/include/pokemon_menu.h @@ -34,18 +34,19 @@ enum }; extern u8 gLastFieldPokeMenuOpened; -extern void (*gUnknown_03005CE4)(void); +extern void (*gPostMenuFieldCallback)(void); void HandleDefaultPartyMenu(u8 taskID); void sub_808B5B4(u32 taskID); void sub_8089A70(void); void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order); void DoPokemonMenu_Switch(u8 taskID); -void FieldCallback_Teleport(void); +void FieldCallback_PrepareFadeInFromMenu(void); void sub_808AD58(void); void sub_808B020(void); void sub_808B0C0(u8 taskID); void sub_808B508(u8); void sub_808B564(void); +void debug_sub_80986AC(void); #endif // GUARD_POKEMON_MENU_H |