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

data/maps/SixIsland_Mart/scripts.inc

@@ -1,7 +1,7 @@
-SixIsland_Mart_MapScripts:: @ 8171E65
+SixIsland_Mart_MapScripts::
 	.byte 0
 
-SixIsland_Mart_EventScript_Clerk:: @ 8171E66
+SixIsland_Mart_EventScript_Clerk::
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
@@ -13,7 +13,7 @@ SixIsland_Mart_EventScript_Clerk:: @ 8171E66
 	end
 
 	.align 2
-SixIsland_Mart_Items:: @ 8171E8C
+SixIsland_Mart_Items::
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_FULL_RESTORE
 	.2byte ITEM_MAX_POTION
@@ -26,6 +26,6 @@ SixIsland_Mart_Items:: @ 8171E8C
 	release
 	end
 
-SixIsland_Mart_EventScript_Picnicker:: @ 8171EA0
+SixIsland_Mart_EventScript_Picnicker::
 	msgbox SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter, MSGBOX_NPC
 	end

data/maps/SixIsland_Mart/text.inc

@@ -1,4 +1,4 @@
-SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA
+SixIsland_Mart_Text_AgathaOldestEverEliteFourMember::
     .string "Play with POKéMON lots and live\n"
     .string "a long life!\p"
     .string "Take AGATHA, for example.\p"
@@ -6,7 +6,7 @@ SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA
     .string "oldest-ever ELITE FOUR member.\p"
     .string "She spurs me to do bigger things.$"
 
-SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter:: @ 81A4271
+SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter::
     .string "I should buy some MAIL and write\n"
     .string "him a letter…$"