Merge branch 'master' into heal_location

2017-11-01 23:37:41 -04:00
parent 1b499670bd 63210c0789
commit 9cfdc8b7e8
94 changed files with 20013 additions and 61089 deletions
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -3,5 +3,6 @@

 bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_81B58A8(void);
+void DoWallyTutorialBagMenu(void);

 #endif // GUARD_PARTY_MENU_H