Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm

data/text/unused_gen1_trainer_names.asm

@@ -3,50 +3,50 @@ Gen1TrainerClassNames: ; 50a42
 	dw .Youngster
 	dw .BugCatcher
 	dw .Lass
-	dw OTClassName ; sailor
+	dw wOTClassName ; sailor
 	dw .JrTrainerM
 	dw .JrTrainerF
 	dw .Pokemaniac
 	dw .SuperNerd
-	dw OTClassName ; hiker
-	dw OTClassName ; biker
+	dw wOTClassName ; hiker
+	dw wOTClassName ; biker
 	dw .Burglar
 	dw .Engineer
 	dw .Jack
-	dw OTClassName ; fisher
+	dw wOTClassName ; fisher
 	dw .Swimmer
-	dw OTClassName ; cue ball
-	dw OTClassName ; gambler
+	dw wOTClassName ; cue ball
+	dw wOTClassName ; gambler
 	dw .Beauty
-	dw OTClassName ; psychic
+	dw wOTClassName ; psychic
 	dw .Rocker
 	dw .Juggler
-	dw OTClassName ; tamer
-	dw OTClassName ; bird keeper
+	dw wOTClassName ; tamer
+	dw wOTClassName ; bird keeper
 	dw .Blackbelt
-	dw OTClassName ; rival1
+	dw wOTClassName ; rival1
 	dw .ProfOak
 	dw .Chief
 	dw .Scientist
-	dw OTClassName ; giovanni
+	dw wOTClassName ; giovanni
 	dw .Rocket
 	dw .CooltrainerM
 	dw .CooltrainerF
-	dw OTClassName ; bruno
-	dw OTClassName ; brock
-	dw OTClassName ; misty
-	dw OTClassName ; lt.surge
-	dw OTClassName ; erika
-	dw OTClassName ; koga
-	dw OTClassName ; blaine
-	dw OTClassName ; sabrina
-	dw OTClassName ; gentleman
-	dw OTClassName ; rival2
-	dw OTClassName ; rival3
-	dw OTClassName ; lorelei
-	dw OTClassName ; channeler
-	dw OTClassName ; agatha
-	dw OTClassName ; lance
+	dw wOTClassName ; bruno
+	dw wOTClassName ; brock
+	dw wOTClassName ; misty
+	dw wOTClassName ; lt.surge
+	dw wOTClassName ; erika
+	dw wOTClassName ; koga
+	dw wOTClassName ; blaine
+	dw wOTClassName ; sabrina
+	dw wOTClassName ; gentleman
+	dw wOTClassName ; rival2
+	dw wOTClassName ; rival3
+	dw wOTClassName ; lorelei
+	dw wOTClassName ; channeler
+	dw wOTClassName ; agatha
+	dw wOTClassName ; lance
 
 .Youngster:    db "たんパン@"
 .BugCatcher:   db "むしとり@"