Merge pull request #475 from surskitty/master

A few map labels

maps/Route25.asm

@@ -26,7 +26,7 @@ Route25_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x19eea0:
+Route25MistyDate1Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
@@ -39,7 +39,7 @@ UnknownScript_0x19eea0:
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19efed
 	opentext
-	writetext UnknownText_0x19f006
+	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	spriteface PLAYER, DOWN
@@ -52,7 +52,7 @@ UnknownScript_0x19eea0:
 	special RestartMapMusic
 	end
 
-UnknownScript_0x19eee0:
+Route25MistyDate2Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
@@ -65,7 +65,7 @@ UnknownScript_0x19eee0:
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19eff4
 	opentext
-	writetext UnknownText_0x19f006
+	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	spriteface PLAYER, UP
@@ -155,32 +155,32 @@ TrainerSupernerdPat:
 	closetext
 	end
 
-CooltrainerMScript_0x19efac:
+TrainerCooltrainermKevin:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_COOLTRAINERM_KEVIN
-	iftrue UnknownScript_0x19efda
+	iftrue .AfterBattle
 	checkevent EVENT_CLEARED_NUGGET_BRIDGE
-	iftrue UnknownScript_0x19efc7
-	writetext UnknownText_0x19f43b
+	iftrue .AfterNuggetBridge
+	writetext CooltrainermKevinNuggetText
 	buttonsound
 	verbosegiveitem NUGGET
-	iffalse UnknownScript_0x19efde
+	iffalse .NoRoomForNugget
 	setevent EVENT_CLEARED_NUGGET_BRIDGE
-UnknownScript_0x19efc7:
-	writetext UnknownText_0x19f49d
+.AfterNuggetBridge:
+	writetext CooltrainermKevinSeenText
 	waitbutton
 	closetext
-	winlosstext UnknownText_0x19f4fd, 0
+	winlosstext CooltrainermKevinBeatenText, 0
 	loadtrainer COOLTRAINERM, KEVIN
 	startbattle
 	reloadmapafterbattle
 	setevent EVENT_BEAT_COOLTRAINERM_KEVIN
 	opentext
-UnknownScript_0x19efda:
-	writetext UnknownText_0x19f520
+.AfterBattle:
+	writetext CooltrainermKevinAfterBattleText
 	waitbutton
-UnknownScript_0x19efde:
+.NoRoomForNugget:
 	closetext
 	end
 
@@ -237,7 +237,7 @@ MovementData_0x19f000:
 	step LEFT
 	step_end
 
-UnknownText_0x19f006:
+Route25MistyDateText:
 	text "MISTY: Aww! Why"
 	line "did you have to"
 
@@ -384,7 +384,7 @@ SupernerdPatAfterBattleText:
 	line "cheat anymore…"
 	done
 
-UnknownText_0x19f43b:
+CooltrainermKevinNuggetText:
 	text "You took on one"
 	line "more battle than"
 
@@ -395,7 +395,7 @@ UnknownText_0x19f43b:
 	line "win a prize."
 	done
 
-UnknownText_0x19f49d:
+CooltrainermKevinSeenText:
 	text "But after seeing"
 	line "how you battle, I"
 
@@ -406,12 +406,12 @@ UnknownText_0x19f49d:
 	line "me take you on."
 	done
 
-UnknownText_0x19f4fd:
+CooltrainermKevinBeatenText:
 	text "I've never had a"
 	line "battle this good!"
 	done
 
-UnknownText_0x19f520:
+CooltrainermKevinAfterBattleText:
 	text "That was a great"
 	line "battle!"
 
@@ -439,8 +439,8 @@ Route25_MapEvents:
 
 .CoordEvents:
 	db 2
-	coord_event 42, 6, 1, UnknownScript_0x19eea0
-	coord_event 42, 7, 1, UnknownScript_0x19eee0
+	coord_event 42, 6, 1, Route25MistyDate1Script
+	coord_event 42, 7, 1, Route25MistyDate2Script
 
 .BGEvents:
 	db 2
@@ -458,5 +458,5 @@ Route25_MapEvents:
 	object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
 	object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
 	object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
-	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1
+	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
 	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN

maps/Route26.asm

@@ -34,29 +34,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
@@ -91,31 +91,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
 
@@ -138,29 +138,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
@@ -195,31 +195,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
 
@@ -292,7 +292,7 @@ CooltrainermGaven3BeatenText:
 	line "tougher!"
 	done
 
-UnknownText_0x1a4fe4:
+CooltrainermGavenAfterText:
 	text "To get to #MON"
 	line "LEAGUE, you have"
 
@@ -352,7 +352,7 @@ CooltrainerfBeth1BeatenText:
 	line "tools of war."
 	done
 
-UnknownText_0x1a51d9:
+CooltrainerfBethAfterText:
 	text "#MON are in-"
 	line "valuable, lifelong"
 	cont "partners."