Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

data/maps/Route9/scripts.inc

@@ -1,6 +1,6 @@
-Route9_MapScripts:: @ 8167FCF
+Route9_MapScripts::
 	.byte 0
 
-Route9_EventScript_RouteSign:: @ 8167FD0
+Route9_EventScript_RouteSign::
 	msgbox Route9_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/Route9/text.inc

@@ -1,106 +1,106 @@
-Route9_Text_AliciaIntro:: @ 81847B7
+Route9_Text_AliciaIntro::
     .string "You have POKéMON with you!\n"
     .string "You're mine!$"
 
-Route9_Text_AliciaDefeat:: @ 81847DF
+Route9_Text_AliciaDefeat::
     .string "You deceived me…$"
 
-Route9_Text_AliciaPostBattle:: @ 81847F0
+Route9_Text_AliciaPostBattle::
     .string "The tunnel coming up is pitch-black\n"
     .string "inside.\p"
     .string "You'll need FLASH to get through\n"
     .string "there.$"
 
-Route9_Text_ChrisIntro:: @ 8184844
+Route9_Text_ChrisIntro::
     .string "Who's that walking there with those\n"
     .string "good-looking POKéMON?$"
 
-Route9_Text_ChrisDefeat:: @ 818487E
+Route9_Text_ChrisDefeat::
     .string "Out like a light!$"
 
-Route9_Text_ChrisPostBattle:: @ 8184890
+Route9_Text_ChrisPostBattle::
     .string "Keep walking!$"
 
-Route9_Text_DrewIntro:: @ 818489E
+Route9_Text_DrewIntro::
     .string "I'm taking the ROCK TUNNEL to\n"
     .string "go to LAVENDER…$"
 
-Route9_Text_DrewDefeat:: @ 81848CC
+Route9_Text_DrewDefeat::
     .string "Can't measure up…$"
 
-Route9_Text_DrewPostBattle:: @ 81848DE
+Route9_Text_DrewPostBattle::
     .string "Are you off to ROCK TUNNEL, too?$"
 
-Route9_Text_CaitlinIntro:: @ 81848FF
+Route9_Text_CaitlinIntro::
     .string "Don't you dare patronize me!$"
 
-Route9_Text_CaitlinDefeat:: @ 818491C
+Route9_Text_CaitlinDefeat::
     .string "No!\n"
     .string "You're too much.$"
 
-Route9_Text_CaitlinPostBattle:: @ 8184931
+Route9_Text_CaitlinPostBattle::
     .string "You're obviously talented.\n"
     .string "Good luck to you!$"
 
-Route9_Text_JeremyIntro:: @ 818495E
+Route9_Text_JeremyIntro::
     .string "Bwahaha!\n"
     .string "Great! I was bored, eh!$"
 
-Route9_Text_JeremyDefeat:: @ 818497F
+Route9_Text_JeremyDefeat::
     .string "Keep it coming, eh!\p"
     .string "Oh wait.\n"
     .string "I'm out of POKéMON!$"
 
-Route9_Text_JeremyPostBattle:: @ 81849B0
+Route9_Text_JeremyPostBattle::
     .string "You sure had guts standing up to\n"
     .string "me there, eh?$"
 
-Route9_Text_BriceIntro:: @ 81849DF
+Route9_Text_BriceIntro::
     .string "Hahaha!\n"
     .string "Aren't you a little toughie!$"
 
-Route9_Text_BriceDefeat:: @ 8184A04
+Route9_Text_BriceDefeat::
     .string "What's that?$"
 
-Route9_Text_BricePostBattle:: @ 8184A11
+Route9_Text_BricePostBattle::
     .string "Hahaha!\n"
     .string "Kids should be tough!$"
 
-Route9_Text_BrentIntro:: @ 8184A2F
+Route9_Text_BrentIntro::
     .string "I got up early every day to raise\n"
     .string "my POKéMON from cocoons!$"
 
-Route9_Text_BrentDefeat:: @ 8184A6A
+Route9_Text_BrentDefeat::
     .string "WHAT?\p"
     .string "What a total waste of time!$"
 
-Route9_Text_BrentPostBattle:: @ 8184A8C
+Route9_Text_BrentPostBattle::
     .string "I have to collect more than bugs\n"
     .string "to get stronger…$"
 
-Route9_Text_AlanIntro:: @ 8184ABE
+Route9_Text_AlanIntro::
     .string "Hahahaha!\n"
     .string "Bring it on!$"
 
-Route9_Text_AlanDefeat:: @ 8184AD5
+Route9_Text_AlanDefeat::
     .string "Hahahaha!\n"
     .string "You beat me fair!$"
 
-Route9_Text_AlanPostBattle:: @ 8184AF1
+Route9_Text_AlanPostBattle::
     .string "Hahahaha!\n"
     .string "Us hearty guys always laugh!$"
 
-Route9_Text_ConnerIntro:: @ 8184B18
+Route9_Text_ConnerIntro::
     .string "Go, my super BUG POKéMON!$"
 
-Route9_Text_ConnerDefeat:: @ 8184B32
+Route9_Text_ConnerDefeat::
     .string "My bugs…$"
 
-Route9_Text_ConnerPostBattle:: @ 8184B3B
+Route9_Text_ConnerPostBattle::
     .string "If you don't like BUG POKéMON,\n"
     .string "you bug me!$"
 
-Route9_Text_RouteSign:: @ 8184B66
+Route9_Text_RouteSign::
     .string "ROUTE 9\n"
     .string "CERULEAN CITY - ROCK TUNNEL$"