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

data/maps/SSAnne_1F_Room1/scripts.inc

@@ -1,6 +1,6 @@
-SSAnne_1F_Room1_MapScripts:: @ 8160BDB
+SSAnne_1F_Room1_MapScripts::
 	.byte 0
 
-SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC
+SSAnne_1F_Room1_EventScript_Gentleman::
 	msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC
 	end

data/maps/SSAnne_1F_Room1/text.inc

@@ -1,4 +1,4 @@
-SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B
+SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent::
     .string "Ssh…!\n"
     .string "I'm a GLOBAL POLICE agent.\p"
     .string "I'm on the trail of TEAM ROCKET.\n"