Merge branch 'master' into doc-union

1 files changed, 14 insertions, 14 deletions

diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index e7967046d..bc9e7c25f 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_NURSE, 1
 .set LOCALID_LANETTE, 4
 
-FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
+FallarborTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
+FallarborTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_FALLARBOR_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
+FallarborTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -19,15 +19,15 @@ FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8200BEF
+FallarborTown_PokemonCenter_1F_EventScript_Girl::
 	msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8200BF8
+FallarborTown_PokemonCenter_1F_EventScript_ExpertM::
 	msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
+FallarborTown_PokemonCenter_1F_EventScript_Lanette::
 	lock
 	faceplayer
 	msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT
@@ -37,26 +37,26 @@ FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
 	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8200C28
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth::
 	applymovement LOCALID_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth
 	waitmovement 0
 	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest::
 	applymovement LOCALID_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest
 	waitmovement 0
 	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExited::
 	playse SE_SLIDING_DOOR
 	removeobject LOCALID_LANETTE
 	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth:
 	walk_right
 	walk_down
 	walk_down
@@ -71,7 +71,7 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:
 	walk_down
 	walk_down
 	walk_left
@@ -84,7 +84,7 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
+FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:
 	.string "Oh, hello.\n"
 	.string "You are?\p"
 	.string "Okay, your name's {PLAYER}{KUN}.\n"
@@ -101,13 +101,13 @@ FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
 	.string "If you could, please visit me at home.\n"
 	.string "My house is on ROUTE 114.$"
 
-FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown: @ 8200E22
+FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:
 	.string "I wonder what POKéMON looked like\n"
 	.string "long, long ago?\p"
 	.string "Maybe the FOSSIL MANIAC at the edge\n"
 	.string "of town will know.$"
 
-FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees: @ 8200E8B
+FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:
 	.string "In the fields of FALLARBOR, we plant\n"
 	.string "seedlings of hardy trees that thrive\l"
 	.string "even in volcanic ash.$"