battle labels merge with master

This commit is contained in:
DizzyEggg
2018-02-09 00:43:07 +01:00
137 changed files with 40431 additions and 35066 deletions
-1
View File
@@ -4,7 +4,6 @@
.include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc"
.include "constants/battle_move_constants.inc"
.include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"