Remove address comments

1 files changed, 70 insertions, 70 deletions

diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index d904fb9eb..2b974035a 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,13 +1,13 @@
 .set LOCALID_BRINEY, 11
 .set LOCALID_WANDAS_BF_OUTSIDE, 21
 
-Route116_MapScripts:: @ 81F2C0C
+Route116_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
-Route116_OnTransition: @ 81F2C1C
+Route116_OnTransition:
 	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -17,22 +17,22 @@ Route116_OnTransition: @ 81F2C1C
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos::
 	setobjectxyperm LOCALID_WANDAS_BF_OUTSIDE, 38, 10
 	return
 
-Route116_OnLoad: @ 81F2C4F
+Route116_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_OnFrame: @ 81F2C66
+Route116_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_WandasBoyfriend:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
@@ -41,17 +41,17 @@ Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	release
 	end
 
-Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
+Route116_EventScript_BoyfriendGruntLeftTunnel::
 	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
+Route116_EventScript_BoyfriendGruntInTunnel::
 	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_DevonEmployee:: @ 81F2CA2
+Route116_EventScript_DevonEmployee::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
@@ -59,7 +59,7 @@ Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall::
 	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem ITEM_REPEAT_BALL
 	compare VAR_RESULT, FALSE
@@ -80,27 +80,27 @@ Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	release
 	end
 
-Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
+Route116_EventScript_DevonEmployeeExit::
 	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
+Route116_EventScript_DevonEmployeeExitEast::
 	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
+Route116_EventScript_TryGiveRepeatBallAgain::
 	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
 	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
+Route116_EventScript_NoRoomForRepeatBall::
 	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_DevonEmployeeExit: @ 81F2D43
+Route116_Movement_DevonEmployeeExit:
 	walk_left
 	walk_left
 	walk_left
@@ -111,7 +111,7 @@ Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast:
 	walk_down
 	walk_left
 	walk_left
@@ -124,27 +124,27 @@ Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_RouteSignRustboro:: @ 81F2D57
+Route116_EventScript_RouteSignRustboro::
 	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
+Route116_EventScript_RusturfTunnelSign::
 	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
+Route116_EventScript_TunnelersRestHouseSign::
 	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
+Route116_EventScript_TrainerTipsBToStopEvolution::
 	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
+Route116_EventScript_TrainerTipsBagHasPockets::
 	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_Briney:: @ 81F2D84
+Route116_EventScript_Briney::
 	lock
 	faceplayer
 	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
@@ -152,7 +152,7 @@ Route116_EventScript_Briney:: @ 81F2D84
 	release
 	end
 
-Route116_EventScript_BrineyTrigger:: @ 81F2D95
+Route116_EventScript_BrineyTrigger::
 	lockall
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestRight
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -162,7 +162,7 @@ Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	releaseall
 	end
 
-Route116_EventScript_GlassesMan:: @ 81F2DB6
+Route116_EventScript_GlassesMan::
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
@@ -175,13 +175,13 @@ Route116_EventScript_GlassesMan:: @ 81F2DB6
 	release
 	end
 
-Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
+Route116_EventScript_FoundGlassesNotOnPlayer::
 	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
+Route116_EventScript_PlayerHasGlasses::
 	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
@@ -191,13 +191,13 @@ Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
 	release
 	end
 
-Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
+Route116_EventScript_FoundGlassesOnPlayer::
 	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_GlassesManExit:: @ 81F2E2A
+Route116_EventScript_GlassesManExit::
 	delay 20
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq Route116_EventScript_GlassesManExitNormal
@@ -211,17 +211,17 @@ Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	release
 	end
 
-Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
+Route116_EventScript_GlassesManExitNormal::
 	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_GlassesManExitEast:: @ 81F2E69
+Route116_EventScript_GlassesManExitEast::
 	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_GlassesManExit: @ 81F2E74
+Route116_Movement_GlassesManExit:
 	walk_left
 	walk_left
 	walk_left
@@ -233,7 +233,7 @@ Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_GlassesManExitEast: @ 81F2E7E
+Route116_Movement_GlassesManExitEast:
 	walk_up
 	walk_left
 	walk_left
@@ -246,17 +246,17 @@ Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_Joey:: @ 81F2E89
+Route116_EventScript_Joey::
 	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
 	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Jose:: @ 81F2EA0
+Route116_EventScript_Jose::
 	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
 	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Jerry:: @ 81F2EB7
+Route116_EventScript_Jerry::
 	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -269,12 +269,12 @@ Route116_EventScript_Jerry:: @ 81F2EB7
 	release
 	end
 
-Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
+Route116_EventScript_TryRegisterJerryAfterBattle::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
+Route116_EventScript_RegisterJerryAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
@@ -282,34 +282,34 @@ Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
 	release
 	end
 
-Route116_EventScript_TryRegisterJerry:: @ 81F2F22
+Route116_EventScript_TryRegisterJerry::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
 	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_RegisterJerry:: @ 81F2F35
+Route116_EventScript_RegisterJerry::
 	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_RematchJerry:: @ 81F2F4E
+Route116_EventScript_RematchJerry::
 	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
 	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Clark:: @ 81F2F65
+Route116_EventScript_Clark::
 	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
 	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Janice:: @ 81F2F7C
+Route116_EventScript_Janice::
 	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
 	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Karen:: @ 81F2F93
+Route116_EventScript_Karen::
 	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -322,12 +322,12 @@ Route116_EventScript_Karen:: @ 81F2F93
 	release
 	end
 
-Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
+Route116_EventScript_TryRegisterKarenAfterBattle::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
+Route116_EventScript_RegisterKarenAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
@@ -335,44 +335,44 @@ Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
 	release
 	end
 
-Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
+Route116_EventScript_TryRegisterKaren::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
 	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_RegisterKaren:: @ 81F3011
+Route116_EventScript_RegisterKaren::
 	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_RematchKaren:: @ 81F302A
+Route116_EventScript_RematchKaren::
 	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
 	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Sarah:: @ 81F3041
+Route116_EventScript_Sarah::
 	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
 	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Dawson:: @ 81F3058
+Route116_EventScript_Dawson::
 	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
 	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Devan:: @ 81F306F
+Route116_EventScript_Devan::
 	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
 	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Johnson:: @ 81F3086
+Route116_EventScript_Johnson::
 	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
 	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko:
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -380,11 +380,11 @@ Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_WantToDigTunnel: @ 81F3140
+Route116_Text_WantToDigTunnel:
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut:
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -398,12 +398,12 @@ Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel:
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation:
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -422,61 +422,61 @@ Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_NewBallAvailableAtMart: @ 81F3521
+Route116_Text_NewBallAvailableAtMart:
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_BagIsJamPacked: @ 81F3593
+Route116_Text_BagIsJamPacked:
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_TokenOfAppreciation: @ 81F35CE
+Route116_Text_TokenOfAppreciation:
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses:
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_MayISeeThoseGlasses: @ 81F3688
+Route116_Text_MayISeeThoseGlasses:
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere:
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_CantFindGlassesNotHere: @ 81F3718
+Route116_Text_CantFindGlassesNotHere:
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_NotWhatImLookingFor: @ 81F375E
+Route116_Text_NotWhatImLookingFor:
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_RouteSignRustboro: @ 81F379D
+Route116_Text_RouteSignRustboro:
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_RusturfTunnelSign: @ 81F37B7
+Route116_Text_RusturfTunnelSign:
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_TunnelersRestHouse: @ 81F380F
+Route116_Text_TunnelersRestHouse:
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution:
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -484,7 +484,7 @@ Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets:
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"