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

data/maps/FourIsland_PokemonCenter_1F/scripts.inc

@@ -1,27 +1,27 @@
-FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA
+FourIsland_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
+FourIsland_PokemonCenter_1F_OnTransition::
 	setrespawn SPAWN_FOUR_ISLAND
 	end
 
-FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9
+FourIsland_PokemonCenter_1F_EventScript_Nurse::
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02
+FourIsland_PokemonCenter_1F_EventScript_Man::
 	msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC
 	end
 
-FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B
+FourIsland_PokemonCenter_1F_EventScript_Woman::
 	msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC
 	end
 
-FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14
+FourIsland_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC
 	end

data/maps/FourIsland_PokemonCenter_1F/text.inc

@@ -1,5 +1,5 @@
 @ The 5 texts below are supposed to be in FourIsland_House1
-Text_BodySlamTeach:: @ 81A3505
+Text_BodySlamTeach::
     .string "Ready?\n"
     .string "Boing!\p"
     .string "We're having a BODY SLAM match\n"
@@ -9,28 +9,28 @@ Text_BodySlamTeach:: @ 81A3505
     .string "How about I teach BODY SLAM to\n"
     .string "a POKéMON of yours instead?$"
 
-Text_BodySlamDeclined:: @ 81A35C7
+Text_BodySlamDeclined::
     .string "Come again!\n"
     .string "Boing!$"
 
-Text_BodySlamWhichMon:: @ 81A35DA
+Text_BodySlamWhichMon::
     .string "Which POKéMON wants to learn how\n"
     .string "to BODY SLAM?$"
 
-Text_BodySlamTaught:: @ 81A3609
+Text_BodySlamTaught::
     .string "Boioing!$"
 
-FourIsland_House1_Text_FatMan:: @ 81A3612
+FourIsland_House1_Text_FatMan::
     .string "それ　ぼよーん！\n"
     .string "おまえ　おもいなあー！$"
 
-FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627
+FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave::
     .string "There's a rare kind of ICE POKéMON\n"
     .string "that lives in the cave.\p"
     .string "We get a lot of visitors hoping to\n"
     .string "see that POKéMON.$"
 
-FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697
+FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore::
     .string "Oh? A POKéMON EGG?\n"
     .string "…I have no idea.\p"
     .string "…Oh, wait. The DAY-CARE people\n"
@@ -38,7 +38,7 @@ FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697
     .string "They said that they'd found EGGS\n"
     .string "before on their property.$"
 
-FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734
+FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived::
     .string "What's this?\p"
     .string "The new POKéMON JOURNAL hasn't\n"
     .string "arrived on this island?$"