ref: b8dcccd0da7d7eda8f4e480aeb4f87d08d7461b4
parent: d314bdb4fa6061fc8f288bae6c514df54047e79e
parent: 794410352fd92ccf06974763e4b3be0b807641ab
author: PikalaxALT <PikalaxALT@gmail.com>
date: Sun Nov 29 16:57:46 EST 2015
Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming