Merge pull request #138 from jiangzhengwenjz/battle

battle (4th take)
2019-11-19 10:58:44 -05:00
parent 83cba31033 63f8834b6b
commit 89dc26755a
48 changed files with 8241 additions and 18696 deletions
@@ -31,10 +31,10 @@
 #include "wild_encounter.h"
 #include "help_system.h"
 #include "party_menu.h"
-#include "unk_8159F40.h"
 #include "pokemon_storage_system.h"
 #include "save.h"
 #include "link.h"
+#include "quest_log_815A008.h"
 #include "quest_log_8150454.h"
 #include "quest_log.h"
 #include "new_menu_helpers.h"