ref: c60da440b619508df369e406b6b3353811f2f627
parent: 0bdfbd87624fa41068ccbdda669a328877e4055a
parent: b5268ab9207f02574abe8d6f5407e25f4a86365a
author: IIMarckus <iimarckus@gmail.com>
date: Fri Nov 1 16:15:09 EDT 2013
Merge branch 'master' of https://github.com/Sanky/pokered Conflicts: main.asm