diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-19 16:58:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-19 16:58:51 -0500 |
commit | 407c49820e1e64ff6deb4480b6ff9aceb0a3b085 (patch) | |
tree | 3d98eec0219fa3332fcb9fe808c5fbd91b3ca64f /src/battle_controller_pokedude.c | |
parent | 055e5d2bbff31a98bcdffec0d7392e7ce77bcd46 (diff) | |
parent | c365f58833d60606b2a759b190b1f35f09f7ee66 (diff) |
Merge pull request #233 from PikalaxALT/item_menu
item_menu
Diffstat (limited to 'src/battle_controller_pokedude.c')
-rw-r--r-- | src/battle_controller_pokedude.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 86da27ee3..d8ebe5ba4 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -23,6 +23,7 @@ #include "battle_interface.h" #include "battle_message.h" #include "reshow_battle_screen.h" +#include "teachy_tv.h" #include "constants/songs.h" #include "constants/items.h" #include "constants/moves.h" @@ -733,15 +734,15 @@ static void OpenBagAndChooseItem(void) FreeAllWindowBuffers(); switch (gSpecialVar_0x8004) { - case 1: + case TTVSCR_STATUS: default: - callbackId = 7; + callbackId = ITEMMENULOCATION_TTVSCR_STATUS; break; - case 3: - callbackId = 8; + case TTVSCR_CATCHING: + callbackId = ITEMMENULOCATION_TTVSCR_CATCHING; break; } - sub_810B108(callbackId); + InitPokedudeBag(callbackId); } } |