battle labels merge with master

2018-02-09 00:43:07 +01:00
parent 9df5e16343 387dbf48d0
commit bce01bc518
137 changed files with 40431 additions and 35066 deletions
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -1,6 +1,8 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
+#include "constants/pokemon.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"