ref: e25a7148d0a78549de4f33fa72d519dcaf660e97
parent: b509b48a7f5a9a80225b9c030d7334b26b521c62
parent: 5d3b958763d48e6049e13b068d2f2d5382cdcad2
author: dannye <corrnondacqb@yahoo.com>
date: Mon Jul 13 20:58:09 EDT 2015
Merge branch 'master' of https://github.com/YamaArashi/pokered Conflicts: engine/town_map.asm