Merge branch 'block-fastpokemap'