DizzyEggg 842e379a7b Merge branch 'master' into battle_engine_v2		2019-02-23 22:50:46 +01:00
..
map.json	Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields	2019-02-16 16:56:41 -06:00
scripts.inc	New feature - battle 2 vs 1 opponent	2019-01-27 20:54:34 +01:00