From c167c8161141cf9a73484c9b4be035c2982532a7 Mon Sep 17 00:00:00 2001
From: surskitty <surskitty@gmail.com>
Date: Mon, 15 Jan 2018 23:09:56 -0500
Subject: [PATCH] Fisherman Tully labels

---
 maps/Route42.asm | 76 ++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/maps/Route42.asm b/maps/Route42.asm
index ccf174b17..a8139f9e8 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -36,40 +36,40 @@ Route42SuicuneScript:
 	setmapscene ROUTE_36, $1
 	end
 
-TrainerFisherTully1:
-	trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script
+TrainerFisherTully:
+	trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_TULLY
 	end_if_just_battled
 	opentext
 	checkflag ENGINE_TULLY
-	iftrue UnknownScript_0x1a927f
+	iftrue .WantsBattle
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
-	iftrue UnknownScript_0x1a92dc
+	iftrue .HasWaterStone
 	checkcellnum PHONE_FISHER_TULLY
-	iftrue UnknownScript_0x1a92fd
+	iftrue .NumberAcceptedM
 	checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x1a9268
-	writetext UnknownText_0x1a93ab
+	iftrue .AskedAlready
+	writetext FisherTullyAfterBattleText
 	buttonsound
 	setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x1a92f1
-	jump UnknownScript_0x1a926b
+	scall .AskNumber1M
+	jump .AskForNumber
 
-UnknownScript_0x1a9268:
-	scall UnknownScript_0x1a92f5
-UnknownScript_0x1a926b:
+.AskedAlready:
+	scall .AskNumber2M
+.AskForNumber:
 	askforphonenumber PHONE_FISHER_TULLY
-	if_equal $1, UnknownScript_0x1a9305
-	if_equal $2, UnknownScript_0x1a9301
+	if_equal $1, .PhoneFullM
+	if_equal $2, .NumberDeclinedM
 	trainertotext FISHER, TULLY1, $0
-	scall UnknownScript_0x1a92f9
-	jump UnknownScript_0x1a92fd
+	scall .RegisteredNumberM
+	jump .NumberAcceptedM
 
-UnknownScript_0x1a927f:
-	scall UnknownScript_0x1a9309
-	winlosstext FisherTully1BeatenText, 0
+.WantsBattle:
+	scall .RematchM
+	winlosstext FisherTullyBeatenText, 0
 	copybytetovar wTullyFightCount
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -115,50 +115,50 @@ UnknownScript_0x1a927f:
 	clearflag ENGINE_TULLY
 	end
 
-UnknownScript_0x1a92dc:
-	scall UnknownScript_0x1a930d
+.HasWaterStone:
+	scall .GiftM
 	verbosegiveitem WATER_STONE
-	iffalse UnknownScript_0x1a92ee
+	iffalse .NoRoom
 	clearflag ENGINE_TULLY_HAS_WATER_STONE
 	setevent EVENT_TULLY_GAVE_WATER_STONE
-	jump UnknownScript_0x1a92fd
+	jump .NumberAcceptedM
 
-UnknownScript_0x1a92ee:
-	jump UnknownScript_0x1a9311
+.NoRoom:
+	jump .PackFullM
 
-UnknownScript_0x1a92f1:
+.AskNumber1M:
 	jumpstd asknumber1m
 	end
 
-UnknownScript_0x1a92f5:
+.AskNumber2M:
 	jumpstd asknumber2m
 	end
 
-UnknownScript_0x1a92f9:
+.RegisteredNumberM:
 	jumpstd registerednumberm
 	end
 
-UnknownScript_0x1a92fd:
+.NumberAcceptedM:
 	jumpstd numberacceptedm
 	end
 
-UnknownScript_0x1a9301:
+.NumberDeclinedM:
 	jumpstd numberdeclinedm
 	end
 
-UnknownScript_0x1a9305:
+.PhoneFullM:
 	jumpstd phonefullm
 	end
 
-UnknownScript_0x1a9309:
+.RematchM:
 	jumpstd rematchm
 	end
 
-UnknownScript_0x1a930d:
+.GiftM:
 	jumpstd giftm
 	end
 
-UnknownScript_0x1a9311:
+.PackFullM:
 	jumpstd packfullm
 	end
 
@@ -226,18 +226,18 @@ MovementData_0x1a9356:
 	db $38 ; movement
 	step_end
 
-FisherTully1SeenText:
+FisherTullySeenText:
 	text "Let me demonstrate"
 	line "the power of the"
 	cont "#MON I caught!"
 	done
 
-FisherTully1BeatenText:
+FisherTullyBeatenText:
 	text "What? That's not"
 	line "right."
 	done
 
-UnknownText_0x1a93ab:
+FisherTullyAfterBattleText:
 	text "I want to become"
 	line "the trainer CHAMP"
 
@@ -345,7 +345,7 @@ Route42_MapEventHeader:
 
 .ObjectEvents:
 	db 9
-	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1
+	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
 	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
 	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
 	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1