diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
tree | 8793240342d37104610f34756f6fee9db706ee8f /include/battle_party_menu.h | |
parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/battle_party_menu.h')
-rw-r--r-- | include/battle_party_menu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index 71bd2cf51..200b0c653 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -4,6 +4,7 @@ extern u8 unk_2000000[]; #define EWRAM_1609D unk_2000000[0x1609D] -void SetUpBattlePokemonMenu(u8); +void HandleBattlePartyMenu(u8); +bool8 SetUpBattlePartyMenu(void); #endif |