Merge remote-tracking branch 'kanzure/master' into merge-upstream

Conflicts:
	.gitignore
	Makefile
	audio/engine.asm
	audio/sfx_pointers.asm
	battle/effect_commands.asm
	main.asm
	preprocessor.py
CrystalComplete: Export cross-object labels that used globals before