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

data/maps/SevenIsland/scripts.inc

@@ -1,19 +1,19 @@
-SevenIsland_MapScripts:: @ 8167EB3
+SevenIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_OnTransition
 	.byte 0
 
-SevenIsland_OnTransition:: @ 8167EB9
+SevenIsland_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND
 	end
 
-SevenIsland_EventScript_IslandSign:: @ 8167EBD
+SevenIsland_EventScript_IslandSign::
 	msgbox SevenIsland_Text_IslandSign, MSGBOX_SIGN
 	end
 
-SevenIsland_EventScript_OldWoman:: @ 8167EC6
+SevenIsland_EventScript_OldWoman::
 	msgbox SevenIsland_Text_IslandsMadeInSevenDays, MSGBOX_NPC
 	end
 
-SevenIsland_EventScript_Scientist:: @ 8167ECF
+SevenIsland_EventScript_Scientist::
 	msgbox SevenIsland_Text_IslandVirtuallyUntouched, MSGBOX_NPC
 	end

data/maps/SevenIsland/text.inc

@@ -1,4 +1,4 @@
-Text_SwordsDanceTeach:: @ 8182F01
+Text_SwordsDanceTeach::
     .string "Not many people come out here.\p"
     .string "If I train here, I'm convinced that\n"
     .string "I'll get stronger and stronger.\p"
@@ -6,22 +6,22 @@ Text_SwordsDanceTeach:: @ 8182F01
     .string "How would you like to learn a move\n"
     .string "like that? It's SWORDS DANCE.$"
 
-Text_SwordsDanceDeclined:: @ 8182FC1
+Text_SwordsDanceDeclined::
     .string "Well, that's fine, too.$"
 
-Text_SwordsDanceWhichMon:: @ 8182FD9
+Text_SwordsDanceWhichMon::
     .string "All right, pick which POKéMON\n"
     .string "I should teach it to.$"
 
-Text_SwordsDanceTaught:: @ 818300D
+Text_SwordsDanceTaught::
     .string "If only we could keep getting\n"
     .string "stronger and stronger, eh?$"
 
-SevenIsland_Text_IslandSign:: @ 8183046
+SevenIsland_Text_IslandSign::
     .string "SEVEN ISLAND\n"
     .string "Quest Island of Infinity$"
 
-SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C
+SevenIsland_Text_IslandsMadeInSevenDays::
     .string "These islands are called the SEVII\n"
     .string "ISLANDS because there are seven.\p"
     .string "…Or at least that's what the young\n"
@@ -30,7 +30,7 @@ SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C
     .string "named because they are said to\l"
     .string "have been made in seven days.$"
 
-SevenIsland_Text_IslandVirtuallyUntouched:: @ 8183143
+SevenIsland_Text_IslandVirtuallyUntouched::
     .string "This island has been left virtually\n"
     .string "untouched in its natural state.\p"
     .string "It could be a little difficult to\n"