GriffinR d8f5e73bb7 Merge branch 'master' into doc-inc		2019-10-07 17:37:04 -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-inc	2019-10-07 17:37:04 -04:00