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

data/maps/Route1/scripts.inc

@@ -1,7 +1,7 @@
-Route1_MapScripts:: @ 8167EFD
+Route1_MapScripts::
 	.byte 0
 
-Route1_EventScript_MartClerk:: @ 8167EFE
+Route1_EventScript_MartClerk::
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
@@ -22,15 +22,15 @@ Route1_EventScript_MartClerk:: @ 8167EFE
 	release
 	end
 
-Route1_EventScript_AlreadyGotPotion:: @ 8167F48
+Route1_EventScript_AlreadyGotPotion::
 	msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls
 	release
 	end
 
-Route1_EventScript_Boy:: @ 8167F52
+Route1_EventScript_Boy::
 	msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC
 	end
 
-Route1_EventScript_RouteSign:: @ 8167F5B
+Route1_EventScript_RouteSign::
 	msgbox Route1_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/Route1/text.inc

@@ -1,4 +1,4 @@
-Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
+Route1_Text_WorkAtPokeMartTakeSample::
     .string "Hi!\n"
     .string "I work at a POKéMON MART.\p"
     .string "It's part of a convenient chain\n"
@@ -7,22 +7,22 @@ Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
     .string "I know, I'll give you a sample.\n"
     .string "Here you go!$"
 
-Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347
+Route1_Text_ComeSeeUsIfYouNeedPokeBalls::
     .string "Please come see us if you need\n"
     .string "POKé BALLS for catching POKéMON.$"
 
-Route1_Text_PutPotionAway:: @ 8183387
+Route1_Text_PutPotionAway::
     .string "{PLAYER} put the POTION away in\n"
     .string "the BAG's ITEMS POCKET.$"
 
-Route1_Text_CanJumpFromLedges:: @ 81833B9
+Route1_Text_CanJumpFromLedges::
     .string "See those ledges along the road?\p"
     .string "It's a bit scary, but you can jump\n"
     .string "from them.\p"
     .string "You can get back to PALLET TOWN\n"
     .string "quicker that way.$"
 
-Route1_Text_RouteSign:: @ 818343A
+Route1_Text_RouteSign::
     .string "ROUTE 1\n"
     .string "PALLET TOWN - VIRIDIAN CITY$"