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

data/maps/SSAnne_B1F_Room1/scripts.inc

@@ -1,12 +1,12 @@
-SSAnne_B1F_Room1_MapScripts:: @ 8160D47
+SSAnne_B1F_Room1_MapScripts::
 	.byte 0
 
-SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48
+SSAnne_B1F_Room1_EventScript_Barny::
 	trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat
 	msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F
+SSAnne_B1F_Room1_EventScript_Phillip::
 	trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat
 	msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SSAnne_B1F_Room1/text.inc

@@ -1,26 +1,26 @@
-SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6
+SSAnne_B1F_Room1_Text_PhillipIntro::
     .string "Matey, you're walking the plank if\n"
     .string "you lose!$"
 
-SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123
+SSAnne_B1F_Room1_Text_PhillipDefeat::
     .string "Argh!\n"
     .string "Beaten by a kid!$"
 
-SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A
+SSAnne_B1F_Room1_Text_PhillipPostBattle::
     .string "When we're out at sea, jellyfish\n"
     .string "POKéMON sometimes drift by.$"
 
-SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177
+SSAnne_B1F_Room1_Text_BarnyIntro::
     .string "Hello, stranger!\p"
     .string "I can't tell if you're from the seas\n"
     .string "or mountains, but stop and chat.\p"
     .string "All my POKéMON are from the sea.$"
 
-SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF
+SSAnne_B1F_Room1_Text_BarnyDefeat::
     .string "Darn!\n"
     .string "I let that one get away!$"
 
-SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E
+SSAnne_B1F_Room1_Text_BarnyPostBattle::
     .string "I was going to make you my\n"
     .string "assistant, too!$"