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

# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm

maps/Route26.asm

@@ -32,29 +32,29 @@ TrainerCooltrainermGaven3:
 	end_if_just_battled
 	opentext
 	checkflag ENGINE_GAVEN
-	iftrue UnknownScript_0x1a4d79
+	iftrue .WantsBattle
 	checkcellnum PHONE_COOLTRAINERM_GAVEN
-	iftrue UnknownScript_0x1a4dcb
+	iftrue .NumberAccepted
 	checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x1a4d62
-	writetext UnknownText_0x1a4fe4
+	iftrue .AskedAlready
+	writetext CooltrainermGavenAfterText
 	buttonsound
 	setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x1a4dbf
-	jump UnknownScript_0x1a4d65
+	scall .AskNumber1
+	jump .AskForNumber
 
-UnknownScript_0x1a4d62:
-	scall UnknownScript_0x1a4dc3
-UnknownScript_0x1a4d65:
+.AskedAlready:
+	scall .AskNumber2
+.AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERM_GAVEN
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4dd3
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4dcf
+	if_equal PHONE_CONTACTS_FULL, .PhoneFull
+	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
-	scall UnknownScript_0x1a4dc7
-	jump UnknownScript_0x1a4dcb
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x1a4d79:
-	scall UnknownScript_0x1a4dd7
+.WantsBattle:
+	scall .Rematch
 	winlosstext CooltrainermGaven3BeatenText, 0
 	copybytetovar wGavenFightCount
 	if_equal 2, .Fight2
@@ -89,31 +89,31 @@ UnknownScript_0x1a4d79:
 	clearflag ENGINE_GAVEN
 	end
 
-UnknownScript_0x1a4dbf:
+.AskNumber1:
 	jumpstd asknumber1m
 	end
 
-UnknownScript_0x1a4dc3:
+.AskNumber2:
 	jumpstd asknumber2m
 	end
 
-UnknownScript_0x1a4dc7:
+.RegisteredNumber:
 	jumpstd registerednumberm
 	end
 
-UnknownScript_0x1a4dcb:
+.NumberAccepted:
 	jumpstd numberacceptedm
 	end
 
-UnknownScript_0x1a4dcf:
+.NumberDeclined:
 	jumpstd numberdeclinedm
 	end
 
-UnknownScript_0x1a4dd3:
+.PhoneFull:
 	jumpstd phonefullm
 	end
 
-UnknownScript_0x1a4dd7:
+.Rematch:
 	jumpstd rematchm
 	end
 
@@ -136,29 +136,29 @@ TrainerCooltrainerfBeth1:
 	end_if_just_battled
 	opentext
 	checkflag ENGINE_BETH
-	iftrue UnknownScript_0x1a4e35
+	iftrue .WantsBattle
 	checkcellnum PHONE_COOLTRAINERF_BETH
-	iftrue UnknownScript_0x1a4e87
+	iftrue .NumberAccepted
 	checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x1a4e1e
-	writetext UnknownText_0x1a51d9
+	iftrue .AskedAlready
+	writetext CooltrainerfBethAfterText
 	buttonsound
 	setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x1a4e7b
-	jump UnknownScript_0x1a4e21
+	scall .AskNumber1
+	jump .AskForNumber
 
-UnknownScript_0x1a4e1e:
-	scall UnknownScript_0x1a4e7f
-UnknownScript_0x1a4e21:
+.AskedAlready:
+	scall .AskNumber2
+.AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERF_BETH
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4e8f
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4e8b
+	if_equal PHONE_CONTACTS_FULL, .PhoneFull
+	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
-	scall UnknownScript_0x1a4e83
-	jump UnknownScript_0x1a4e87
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x1a4e35:
-	scall UnknownScript_0x1a4e93
+.WantsBattle:
+	scall .Rematch
 	winlosstext CooltrainerfBeth1BeatenText, 0
 	copybytetovar wBethFightCount
 	if_equal 2, .Fight2
@@ -193,31 +193,31 @@ UnknownScript_0x1a4e35:
 	clearflag ENGINE_BETH
 	end
 
-UnknownScript_0x1a4e7b:
+.AskNumber1:
 	jumpstd asknumber1f
 	end
 
-UnknownScript_0x1a4e7f:
+.AskNumber2:
 	jumpstd asknumber2f
 	end
 
-UnknownScript_0x1a4e83:
+.RegisteredNumber:
 	jumpstd registerednumberf
 	end
 
-UnknownScript_0x1a4e87:
+.NumberAccepted:
 	jumpstd numberacceptedf
 	end
 
-UnknownScript_0x1a4e8b:
+.NumberDeclined:
 	jumpstd numberdeclinedf
 	end
 
-UnknownScript_0x1a4e8f:
+.PhoneFull:
 	jumpstd phonefullf
 	end
 
-UnknownScript_0x1a4e93:
+.Rematch:
 	jumpstd rematchf
 	end
 
@@ -290,7 +290,7 @@ CooltrainermGaven3BeatenText:
 	line "tougher!"
 	done
 
-UnknownText_0x1a4fe4:
+CooltrainermGavenAfterText:
 	text "To get to #MON"
 	line "LEAGUE, you have"
 
@@ -350,7 +350,7 @@ CooltrainerfBeth1BeatenText:
 	line "tools of war."
 	done
 
-UnknownText_0x1a51d9:
+CooltrainerfBethAfterText:
 	text "#MON are in-"
 	line "valuable, lifelong"
 	cont "partners."