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

# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm

maps/Route36NationalParkGate.asm

@@ -307,13 +307,13 @@ YoungsterScript_0x6ad06:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad14
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b399
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad14:
+.StillCompeting:
 	writetext UnknownText_0x6b3c4
 	waitbutton
 	closetext
@@ -323,13 +323,13 @@ YoungsterScript_0x6ad1a:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad28
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b40f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad28:
+.StillCompeting:
 	writetext UnknownText_0x6b440
 	waitbutton
 	closetext
@@ -339,13 +339,13 @@ RockerScript_0x6ad2e:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad3c
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b462
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad3c:
+.StillCompeting:
 	writetext UnknownText_0x6b496
 	waitbutton
 	closetext
@@ -355,13 +355,13 @@ PokefanMScript_0x6ad42:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad50
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b4da
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad50:
+.StillCompeting:
 	writetext UnknownText_0x6b50a
 	waitbutton
 	closetext
@@ -371,13 +371,13 @@ YoungsterScript_0x6ad56:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad64
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b54e
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad64:
+.StillCompeting:
 	writetext UnknownText_0x6b57c
 	waitbutton
 	closetext
@@ -387,13 +387,13 @@ YoungsterScript_0x6ad6a:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad78
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b5b0
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad78:
+.StillCompeting:
 	writetext UnknownText_0x6b5dd
 	waitbutton
 	closetext
@@ -403,13 +403,13 @@ LassScript_0x6ad7e:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ad8c
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b64b
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad8c:
+.StillCompeting:
 	writetext UnknownText_0x6b698
 	waitbutton
 	closetext
@@ -419,13 +419,13 @@ YoungsterScript_0x6ad92:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6ada0
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b6b8
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ada0:
+.StillCompeting:
 	writetext UnknownText_0x6b6e9
 	waitbutton
 	closetext
@@ -435,13 +435,13 @@ YoungsterScript_0x6ada6:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6adb4
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b71b
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6adb4:
+.StillCompeting:
 	writetext UnknownText_0x6b740
 	waitbutton
 	closetext
@@ -451,13 +451,13 @@ YoungsterScript_0x6adba:
 	faceplayer
 	opentext
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	iffalse UnknownScript_0x6adc8
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b76f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6adc8:
+.StillCompeting:
 	writetext UnknownText_0x6b7af
 	waitbutton
 	closetext