Map script and color shenanigans

1 files changed, 80 insertions, 80 deletions

diff --git a/maps/Route30.asm b/maps/Route30.asm
index 31a278a75..56f3cf298 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -18,57 +18,57 @@ Route30_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-YoungsterScript_0x1a1673:
+YoungsterJoey_ImportantBattleScript:
 	waitsfx
 	playmusic MUSIC_JOHTO_TRAINER_BATTLE
 	opentext
-	writetext UnknownText_0x1a1806
+	writetext Text_UseTackle
 	pause 30
 	closetext
 	playsound SFX_TACKLE
-	applymovement ROUTE30_MONSTER2, MovementData_0x1a17fe
+	applymovement ROUTE30_MONSTER2, Route30_JoeysRattataAttacksMovement
 	opentext
 	faceplayer
-	writetext UnknownText_0x1a181c
+	writetext Text_ThisIsABigBattle
 	waitbutton
 	spriteface ROUTE30_YOUNGSTER1, UP
 	closetext
 	playsound SFX_TACKLE
-	applymovement ROUTE30_MONSTER1, MovementData_0x1a1802
+	applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
 	special RestartMapMusic
 	end
 
 TrainerYoungsterJoey:
-	trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, YoungsterJoey1Script
+	trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script
 
-YoungsterJoey1Script:
+.Script:
 	writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
 	end_if_just_battled
 	opentext
 	checkflag ENGINE_JOEY
-	iftrue UnknownScript_0x1a16e0
+	iftrue .Rematch
 	checkcellnum PHONE_YOUNGSTER_JOEY
-	iftrue UnknownScript_0x1a178f
+	iftrue .NumberAccepted
 	checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x1a16c9
-	writetext UnknownText_0x1a18c2
+	iftrue .AskAgain
+	writetext YoungsterJoey1AfterText
 	buttonsound
 	setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x1a1783
-	jump UnknownScript_0x1a16cc
+	scall .AskNumber1
+	jump .RequestNumber
 
-UnknownScript_0x1a16c9:
-	scall UnknownScript_0x1a1787
-UnknownScript_0x1a16cc:
+.AskAgain:
+	scall .AskNumber2
+.RequestNumber:
 	askforphonenumber PHONE_YOUNGSTER_JOEY
-	if_equal $1, UnknownScript_0x1a1797
-	if_equal $2, UnknownScript_0x1a1793
+	if_equal $1, .PhoneFull
+	if_equal $2, .NumberDeclined
 	trainertotext YOUNGSTER, JOEY1, $0
-	scall UnknownScript_0x1a178b
-	jump UnknownScript_0x1a178f
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x1a16e0:
-	scall UnknownScript_0x1a179b
+.Rematch:
+	scall .RematchStd
 	winlosstext YoungsterJoey1BeatenText, 0
 	copybytetovar wJoeyFightCount
 	if_equal 4, .Fight4
@@ -126,150 +126,150 @@ UnknownScript_0x1a16e0:
 	returnafterbattle
 	clearflag ENGINE_JOEY
 	checkevent EVENT_JOEY_HP_UP
-	iftrue UnknownScript_0x1a176f
+	iftrue .GiveHPUp
 	checkevent EVENT_GOT_HP_UP_FROM_JOEY
-	iftrue UnknownScript_0x1a176e
-	scall UnknownScript_0x1a17a6
+	iftrue .done
+	scall .RematchGift
 	verbosegiveitem HP_UP
-	iffalse UnknownScript_0x1a179f
+	iffalse .PackFull
 	setevent EVENT_GOT_HP_UP_FROM_JOEY
-	jump UnknownScript_0x1a178f
+	jump .NumberAccepted
 
-UnknownScript_0x1a176e:
+.done:
 	end
 
-UnknownScript_0x1a176f:
+.GiveHPUp:
 	opentext
-	writetext UnknownText_0x1a1bc0
+	writetext YoungsterJoeyText_GiveHPUpAfterBattle
 	waitbutton
 	verbosegiveitem HP_UP
-	iffalse UnknownScript_0x1a179f
+	iffalse .PackFull
 	clearevent EVENT_JOEY_HP_UP
 	setevent EVENT_GOT_HP_UP_FROM_JOEY
-	jump UnknownScript_0x1a178f
+	jump .NumberAccepted
 
-UnknownScript_0x1a1783:
+.AskNumber1:
 	jumpstd asknumber1m
 	end
 
-UnknownScript_0x1a1787:
+.AskNumber2:
 	jumpstd asknumber2m
 	end
 
-UnknownScript_0x1a178b:
+.RegisteredNumber:
 	jumpstd registerednumberm
 	end
 
-UnknownScript_0x1a178f:
+.NumberAccepted:
 	jumpstd numberacceptedm
 	end
 
-UnknownScript_0x1a1793:
+.NumberDeclined:
 	jumpstd numberdeclinedm
 	end
 
-UnknownScript_0x1a1797:
+.PhoneFull:
 	jumpstd phonefullm
 	end
 
-UnknownScript_0x1a179b:
+.RematchStd:
 	jumpstd rematchm
 	end
 
-UnknownScript_0x1a179f:
+.PackFull:
 	setevent EVENT_JOEY_HP_UP
 	jumpstd packfullm
 	end
 
-UnknownScript_0x1a17a6:
+.RematchGift:
 	jumpstd rematchgiftm
 	end
 
 TrainerYoungsterMikey:
-	trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, YoungsterMikeyScript
+	trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
 
-YoungsterMikeyScript:
+.Script:
 	end_if_just_battled
 	opentext
-	writetext UnknownText_0x1a197d
+	writetext YoungsterMikeyAfterText
 	waitbutton
 	closetext
 	end
 
 TrainerBug_catcherDon:
-	trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, Bug_catcherDonScript
+	trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, .Script
 
-Bug_catcherDonScript:
+.Script:
 	end_if_just_battled
 	opentext
-	writetext UnknownText_0x1a1a1c
+	writetext Bug_catcherDonAfterText
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x1a17d2:
+Route30YoungsterScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x1a17e0
-	writetext UnknownText_0x1a1a6a
+	iftrue .CompletedEggQuest
+	writetext Route30YoungsterText_DirectionsToMrPokemonsHouse
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1a17e0:
-	writetext UnknownText_0x1a1a94
+.CompletedEggQuest:
+	writetext Route30YoungsterText_EveryoneIsBattling
 	waitbutton
 	closetext
 	end
 
-CooltrainerFScript_0x1a17e6:
-	jumptextfaceplayer UnknownText_0x1a1ac4
+Route30CooltrainerFScript:
+	jumptextfaceplayer Route30CooltrainerFText
 
 MapRoute30Signpost0Script:
-	jumptext UnknownText_0x1a1b0b
+	jumptext Route30MapSignText
 
 MapRoute30Signpost1Script:
-	jumptext UnknownText_0x1a1b34
+	jumptext Route30DirectionsToMrPokemonsHouseSignText
 
 MapRoute30Signpost2Script:
-	jumptext UnknownText_0x1a1b55
+	jumptext Route30MrPokemonsHouseSignText
 
 MapRoute30Signpost3Script:
-	jumptext UnknownText_0x1a1b66
+	jumptext Route30TrainerTipsSignText
 
 Route30Antidote:
 	itemball ANTIDOTE
 
-FruitTreeScript_0x1a17f7:
+Route30FruitTree1:
 	fruittree FRUITTREE_ROUTE_30_1
 
-FruitTreeScript_0x1a17f9:
+Route30FruitTree2:
 	fruittree FRUITTREE_ROUTE_30_2
 
 Route30HiddenPotion:
 	dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION
 	
 
-MovementData_0x1a17fe:
+Route30_JoeysRattataAttacksMovement:
 	fix_facing
 	big_step_up
 	big_step_down
 	step_end
 
-MovementData_0x1a1802:
+Route30_MikeysRattataAttacksMovement:
 	fix_facing
 	big_step_down
 	big_step_up
 	step_end
 
-UnknownText_0x1a1806:
+Text_UseTackle:
 	text "Go, RATTATA!"
 
 	para "TACKLE!"
 	done
 
-UnknownText_0x1a181c:
+Text_ThisIsABigBattle:
 	text "What? This is a"
 	line "big battle!"
 	cont "Leave me alone!"
@@ -290,7 +290,7 @@ YoungsterJoey1BeatenText:
 	line "Doggone it!"
 	done
 
-UnknownText_0x1a18c2:
+YoungsterJoey1AfterText:
 	text "Do I have to have"
 	line "more #MON in"
 
@@ -315,7 +315,7 @@ YoungsterMikeyBeatenText:
 	line "I won before."
 	done
 
-UnknownText_0x1a197d:
+YoungsterMikeyAfterText:
 	text "Becoming a good"
 	line "trainer is really"
 	cont "tough."
@@ -336,7 +336,7 @@ Bug_catcherDonBeatenText:
 	line "strong!"
 	done
 
-UnknownText_0x1a1a1c:
+Bug_catcherDonAfterText:
 	text "I ran out of #"
 	line "BALLS while I was"
 	cont "catching #MON."
@@ -345,19 +345,19 @@ UnknownText_0x1a1a1c:
 	line "some more…"
 	done
 
-UnknownText_0x1a1a6a:
+Route30YoungsterText_DirectionsToMrPokemonsHouse:
 	text "MR.#MON's"
 	line "house? It's a bit"
 	cont "farther ahead."
 	done
 
-UnknownText_0x1a1a94:
+Route30YoungsterText_EveryoneIsBattling:
 	text "Everyone's having"
 	line "fun battling!"
 	cont "You should too!"
 	done
 
-UnknownText_0x1a1ac4:
+Route30CooltrainerFText:
 	text "I'm not a trainer."
 
 	para "But if you look"
@@ -365,23 +365,23 @@ UnknownText_0x1a1ac4:
 	cont "prepare to battle."
 	done
 
-UnknownText_0x1a1b0b:
+Route30MapSignText:
 	text "ROUTE 30"
 
 	para "VIOLET CITY -"
 	line "CHERRYGROVE CITY"
 	done
 
-UnknownText_0x1a1b34:
+Route30DirectionsToMrPokemonsHouseSignText:
 	text "MR.#MON'S HOUSE"
 	line "STRAIGHT AHEAD!"
 	done
 
-UnknownText_0x1a1b55:
+Route30MrPokemonsHouseSignText:
 	text "MR.#MON'S HOUSE"
 	done
 
-UnknownText_0x1a1b66:
+Route30TrainerTipsSignText:
 	text "TRAINER TIPS"
 
 	para "No stealing other"
@@ -392,7 +392,7 @@ UnknownText_0x1a1b66:
 	cont "wild #MON!"
 	done
 
-UnknownText_0x1a1bc0:
+YoungsterJoeyText_GiveHPUpAfterBattle:
 	text "I lost again…"
 	line "Gee, you're tough!"
 
@@ -429,14 +429,14 @@ Route30_MapEventHeader:
 
 .PersonEvents:
 	db 11
-	person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE
+	person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
 	person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
 	person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
 	person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1
-	person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a17d2, -1
+	person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1
 	person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
 	person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f7, -1
-	person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f9, -1
-	person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a17e6, -1
+	person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree1, -1
+	person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree2, -1
+	person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
 	person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE