Merge remote-tracking branch 'kanzure/master' into battle-animations

Conflicts:
	pokemontools/wram.py
gfx: 1bpp-to-png option