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

data/maps/ThreeIsland_Port/scripts.inc

@@ -1,13 +1,13 @@
-ThreeIsland_Port_MapScripts:: @ 8168789
+ThreeIsland_Port_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_Port_OnTransition
 	.byte 0
 
-ThreeIsland_Port_OnTransition:: @ 816878F
+ThreeIsland_Port_OnTransition::
 	clearflag FLAG_SYS_PC_STORAGE_DISABLED
 	setflag FLAG_SEVII_DETOUR_FINISHED
 	end
 
-ThreeIsland_Port_EventScript_Woman:: @ 8168796
+ThreeIsland_Port_EventScript_Woman::
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2
@@ -18,21 +18,21 @@ ThreeIsland_Port_EventScript_Woman:: @ 8168796
 	release
 	end
 
-ThreeIsland_Port_EventScript_WomanLostelleFound:: @ 81687B8
+ThreeIsland_Port_EventScript_WomanLostelleFound::
 	msgbox ThreeIsland_Port_Text_EverythingTurnedOutForBest
 	release
 	end
 
-ThreeIsland_Port_EventScript_WomanBikersGone:: @ 81687C2
+ThreeIsland_Port_EventScript_WomanBikersGone::
 	msgbox ThreeIsland_Port_Text_ThankGoodnessBikersGone
 	release
 	end
 
-ThreeIsland_Port_EventScript_Biker1:: @ 81687CC
+ThreeIsland_Port_EventScript_Biker1::
 	msgbox ThreeIsland_Port_Text_WereKantoRiderFederation, MSGBOX_NPC
 	end
 
-ThreeIsland_Port_EventScript_Biker2:: @ 81687D5
+ThreeIsland_Port_EventScript_Biker2::
 	lock
 	msgbox ThreeIsland_Port_Text_ForkOverMoney
 	release

data/maps/ThreeIsland_Port/text.inc

@@ -1,25 +1,25 @@
-ThreeIsland_Port_Text_WereKantoRiderFederation:: @ 818A261
+ThreeIsland_Port_Text_WereKantoRiderFederation::
     .string "We're the KANTO RIDER FEDERATION!\n"
     .string "Vroom! Vavavavooom! Vroom!\p"
     .string "My bike's wimpy, so I have to\n"
     .string "make exhaust noises myself!$"
 
-ThreeIsland_Port_Text_ForkOverMoney:: @ 818A2D8
+ThreeIsland_Port_Text_ForkOverMoney::
     .string "Hey, hey, lady!\n"
     .string "Fork over some spending money!$"
 
-ThreeIsland_Port_Text_IllCallThePolice:: @ 818A307
+ThreeIsland_Port_Text_IllCallThePolice::
     .string "Aiyeeh!\p"
     .string "Wh-who are you?!\n"
     .string "I… I'll call the police!$"
 
-ThreeIsland_Port_Text_ThankGoodnessBikersGone:: @ 818A339
+ThreeIsland_Port_Text_ThankGoodnessBikersGone::
     .string "Those BIKERS…\n"
     .string "Are they gone?\p"
     .string "Oh, thank goodness!\n"
     .string "They certainly had me terrified!$"
 
-ThreeIsland_Port_Text_EverythingTurnedOutForBest:: @ 818A38B
+ThreeIsland_Port_Text_EverythingTurnedOutForBest::
     .string "Those BIKERS ran off, and\n"
     .string "LOSTELLE was found safe.\p"
     .string "Everything turned out for the best!$"