Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	data/super_palettes.asm
	data/title_mons.asm
	data/trades.asm
	data/trainer_parties.asm
	engine/intro.asm
	engine/menu/bills_pc.asm
	engine/menu/pokedex.asm
	engine/oak_speech2.asm
	engine/titlescreen.asm
	main.asm
	text.asm
	text/credits_text.asm
	text/maps/blues_house.asm
	text/maps/celadon_city.asm
	text/maps/celadon_dept_store_4f.asm
	text/maps/celadon_dept_store_roof.asm
	text/maps/cerulean_badge_house.asm
	text/maps/cerulean_city.asm
	text/maps/cerulean_gym.asm
	text/maps/copycats_house_1f.asm
	text/maps/fan_club.asm
	text/maps/fighting_dojo.asm
	text/maps/hall_of_fame.asm
	text/maps/mt_moon_1f.asm
	text/maps/mt_moon_b2f.asm
	text/maps/museum_1f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym_2.asm
	text/maps/pokemon_tower_7f.asm
	text/maps/reds_house_1f.asm
	text/maps/route_10.asm
	text/maps/route_14.asm
	text/maps/route_22.asm
	text/maps/route_3.asm
	text/maps/route_8.asm
	text/maps/saffron_gym.asm
	text/maps/ss_anne_7.asm
	text/maps/vermilion_gym_2.asm
	text/maps/viridian_forest.asm
	text/maps/viridian_forest_entrance.asm
	text/maps/viridian_gym.asm
	text/maps/viridian_mart.asm