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

data/maps/Route7/scripts.inc

@@ -1,6 +1,6 @@
-Route7_MapScripts:: @ 8167FBB
+Route7_MapScripts::
 	.byte 0
 
-Route7_EventScript_UndergroundPathSign:: @ 8167FBC
+Route7_EventScript_UndergroundPathSign::
 	msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN
 	end

data/maps/Route7/text.inc

@@ -1,4 +1,4 @@
-Route7_Text_UndergroundPathSign:: @ 8184097
+Route7_Text_UndergroundPathSign::
     .string "UNDERGROUND PATH\n"
     .string "CELADON CITY - LAVENDER TOWN$"