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

data/maps/SSAnne_1F_Room6/scripts.inc

@@ -1,7 +1,7 @@
-SSAnne_1F_Room6_MapScripts:: @ 8160DF2
+SSAnne_1F_Room6_MapScripts::
 	.byte 0
 
-SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3
+SSAnne_1F_Room6_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO
@@ -13,7 +13,7 @@ SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3
 	release
 	end
 
-SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18
+SSAnne_1F_Room6_EventScript_DeclineHeal::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale
@@ -21,7 +21,7 @@ SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18
 	release
 	end
 
-SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E
+SSAnne_1F_Room6_EventScript_DeclineHealMale::
 	msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother
 	release
 	end

data/maps/SSAnne_1F_Room6/text.inc

@@ -1,16 +1,16 @@
-SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B
+SSAnne_1F_Room6_Text_TakeAShortRest::
     .string "You look tired. Would you like to\n"
     .string "take a short rest?$"
 
-SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490
+SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed::
     .string "I'm glad to see that everyone is\n"
     .string "looking refreshed and chipper.$"
 
-SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0
+SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother::
     .string "Oh, I'm sorry for fussing over you.\n"
     .string "You look like my little brother…$"
 
-SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515
+SSAnne_1F_Room6_Text_SorryYouLookLikeMySister::
     .string "Oh, I'm sorry for fussing over you.\n"
     .string "You look like my little sister…$"