Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig

# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
#	src/data/pokemon/form_species_table_pointers.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h

sound/direct_sound_data.inc

@@ -3986,7 +3986,7 @@ Cry_Spectrier::
 	.align 2
 Cry_Calyrex::
 	.incbin "sound/direct_sound_samples/cries/calyrex.bin"
-/*	
+/*
 	.align 2
 Cry_Wyrdeer::
 	.incbin "sound/direct_sound_samples/cries/wyrdeer.bin"