ref: 76fe7c5aa1b93a6d03280ad54f411e351dd0abc2
parent: 27e1d3fabfad60c58e14276c2a8ff59f9f4259e9
parent: e44d0a22285abe6aaed77f2446f797498a025b34
author: yenatch <[email protected]>
date: Wed Aug 21 10:04:06 EDT 2013
Merge remote-tracking branch 'kanzure/master' into merge-kanzure-again Conflicts: wram.asm