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

data/maps/Route4/scripts.inc

@@ -1,17 +1,17 @@
-Route4_MapScripts:: @ 8167F8A
+Route4_MapScripts::
 	.byte 0
 
-Route4_EventScript_Unused:: @ 8167F8B
+Route4_EventScript_Unused::
 	end
 
-Route4_EventScript_Woman:: @ 8167F8C
+Route4_EventScript_Woman::
 	msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC
 	end
 
-Route4_EventScript_MtMoonSign:: @ 8167F95
+Route4_EventScript_MtMoonSign::
 	msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN
 	end
 
-Route4_EventScript_RouteSign:: @ 8167F9E
+Route4_EventScript_RouteSign::
 	msgbox Route4_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/Route4/text.inc

@@ -1,28 +1,28 @@
-Route4_Text_TrippedOverGeodude:: @ 81838D7
+Route4_Text_TrippedOverGeodude::
     .string "Ouch! I tripped over a rocky\n"
     .string "POKéMON, GEODUDE!$"
 
-Route4_Text_CrissyIntro:: @ 8183906
+Route4_Text_CrissyIntro::
     .string "I came to MT. MOON in search of\n"
     .string "mushroom POKéMON.$"
 
-Route4_Text_CrissyDefeat:: @ 8183938
+Route4_Text_CrissyDefeat::
     .string "After all I did to catch them!$"
 
-Route4_Text_CrissyPostBattle:: @ 8183957
+Route4_Text_CrissyPostBattle::
     .string "There might not be any more\n"
     .string "mushrooms here.\p"
     .string "I think I got them all.$"
 
-Route4_Text_MtMoonEntrance:: @ 818399B
+Route4_Text_MtMoonEntrance::
     .string "MT. MOON\n"
     .string "Tunnel Entrance$"
 
-Route4_Text_RouteSign:: @ 81839B4
+Route4_Text_RouteSign::
     .string "ROUTE 4\n"
     .string "MT. MOON - CERULEAN CITY$"
 
-Text_MegaPunchTeach:: @ 81839D5
+Text_MegaPunchTeach::
     .string "A punch of roaring ferocity!\p"
     .string "Packed with destructive power!\p"
     .string "When the chips are down,\n"
@@ -31,22 +31,22 @@ Text_MegaPunchTeach:: @ 81839D5
     .string "Now!\n"
     .string "Let me teach it to your POKéMON!$"
 
-Text_MegaPunchDeclined:: @ 8183A83
+Text_MegaPunchDeclined::
     .string "You'll be back when you understand\n"
     .string "the worth of MEGA PUNCH.$"
 
-Text_MegaPunchWhichMon:: @ 8183ABF
+Text_MegaPunchWhichMon::
     .string "Fine!\n"
     .string "Which POKéMON will learn it?$"
 
-Text_MegaPunchTaught:: @ 8183AE2
+Text_MegaPunchTaught::
     .string "Now, we are comrades in the way of\n"
     .string "punching!\p"
     .string "You should go before you're seen\n"
     .string "by the misguided fool who trains\l"
     .string "only his silly kicking over there.$"
 
-Text_MegaKickTeach:: @ 8183B74
+Text_MegaKickTeach::
     .string "A kick of brutal ferocity!\p"
     .string "Packed with destructive power!\p"
     .string "When you get right down to it,\n"
@@ -55,22 +55,22 @@ Text_MegaKickTeach:: @ 8183B74
     .string "Okay!\n"
     .string "I'll teach it to your POKéMON!$"
 
-Text_MegaKickDeclined:: @ 8183C25
+Text_MegaKickDeclined::
     .string "You'll come crawling back when you\n"
     .string "realize the value of MEGA KICK.$"
 
-Text_MegaKickWhichMon:: @ 8183C68
+Text_MegaKickWhichMon::
     .string "All right!\n"
     .string "Which POKéMON wants to learn it?$"
 
-Text_MegaKickTaught:: @ 8183C94
+Text_MegaKickTaught::
     .string "Now, we are soul mates in the way\n"
     .string "of kicking!\p"
     .string "You should run before you're seen\n"
     .string "by the deluded nitwit who trains\l"
     .string "only simple punching over there.$"
 
-Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26
+Route4_Text_PeopleLikeAndRespectBrock::
     .string "Oh, wow, that's the BOULDERBADGE!\n"
     .string "You got it from BROCK, didn't you?\p"
     .string "BROCK is cool. He's not just tough.\n"