Phlosioneer 0a7b97ee06 Merge branch 'master' into multiplayer-stuff		2019-02-18 01:19:16 -05: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	Clean up mistakes and bad formatting	2019-02-18 01:03:44 -05:00