ref: 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329
parent: 82ffb336a975fe8cf9c3953fc380339feaae65b3
parent: d218d1972a9be5b9d0025a17842239e1fbf5b622
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Mon May 19 06:38:20 EDT 2014
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data Conflicts: main.asm text.asm text/maps/route_22.asm