GriffinR 928cdf2531 Merge branch 'master' into doc-inc2		2019-10-14 19:25:10 -04: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	Merge branch 'master' into doc-inc2	2019-10-14 19:25:10 -04:00