garak 2c14d6ee6c fix merge conflicts

2018-12-03 16:58:28 -05:00

..

battle_frontier_held_items.inc

.s -> .inc

2016-11-01 08:29:13 -07:00

battle_frontier_mons.inc

begin batle tower data

2018-12-02 23:22:42 -05:00

battle_frontier_trainer_mons.inc

.s -> .inc

2016-11-01 08:29:13 -07:00

battle_frontier_trainers.inc

add more consistent names

2018-12-02 22:36:09 -05:00