Remove address comments

1 files changed, 45 insertions, 45 deletions

diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 0197508bb..723f3c0b5 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,12 +1,12 @@
 .set LOCALID_STEVEN, 19
 
-Route118_MapScripts:: @ 81F3DBC
+Route118_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
-Route118_OnTransition: @ 81F3DCC
+Route118_OnTransition:
 	call GabbyAndTy_EventScript_UpdateLocation
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -16,18 +16,18 @@ Route118_OnTransition: @ 81F3DCC
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route118_OnLoad: @ 81F3DF3
+Route118_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_OnFrame: @ 81F3E0A
+Route118_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_GoodRodFisherman:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
@@ -38,7 +38,7 @@ Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
+Route118_EventScript_ReceiveGoodRod::
 	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
@@ -46,29 +46,29 @@ Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
 	release
 	end
 
-Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
+Route118_EventScript_DeclineGoodRod::
 	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
+Route118_EventScript_ReceivedGoodRod::
 	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_Girl:: @ 81F3E73
+Route118_EventScript_Girl::
 	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_RouteSignMauville:: @ 81F3E7C
+Route118_EventScript_RouteSignMauville::
 	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_RouteSign119:: @ 81F3E85
+Route118_EventScript_RouteSign119::
 	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_StevenTrigger0:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -78,7 +78,7 @@ Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger1:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -86,7 +86,7 @@ Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger2:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -96,7 +96,7 @@ Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger:: @ 81F3EE4
+Route118_EventScript_StevenTrigger::
 	playse SE_LEDGE
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge
 	waitmovement 0
@@ -114,44 +114,44 @@ Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	releaseall
 	end
 
-Route118_EventScript_StevenExit0:: @ 81F3F28
+Route118_EventScript_StevenExit0::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_StevenExit1:: @ 81F3F3A
+Route118_EventScript_StevenExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_StevenExit2:: @ 81F3F4C
+Route118_EventScript_StevenExit2::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit:
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_StevenApproachLedge0: @ 81F3F61
+Route118_Movement_StevenApproachLedge0:
 	walk_left
 	step_end
 
-Route118_Movement_StevenApproachLedge2: @ 81F3F63
+Route118_Movement_StevenApproachLedge2:
 	walk_right
 	step_end
 
-Route118_Movement_StevenJumpLedge: @ 81F3F65
+Route118_Movement_StevenJumpLedge:
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_StevenExit0: @ 81F3F69
+Route118_Movement_StevenExit0:
 	walk_right
 	walk_right
 	walk_right
@@ -164,7 +164,7 @@ Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_StevenExit1: @ 81F3F74
+Route118_Movement_StevenExit1:
 	walk_right
 	walk_right
 	walk_right
@@ -176,7 +176,7 @@ Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_StevenExit2: @ 81F3F7E
+Route118_Movement_StevenExit2:
 	walk_right
 	walk_right
 	walk_right
@@ -187,7 +187,7 @@ Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_Rose:: @ 81F3F87
+Route118_EventScript_Rose::
 	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -196,7 +196,7 @@ Route118_EventScript_Rose:: @ 81F3F87
 	release
 	end
 
-Route118_EventScript_RegisterRose:: @ 81F3FB3
+Route118_EventScript_RegisterRose::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
@@ -204,22 +204,22 @@ Route118_EventScript_RegisterRose:: @ 81F3FB3
 	release
 	end
 
-Route118_EventScript_RematchRose:: @ 81F3FD2
+Route118_EventScript_RematchRose::
 	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
 	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Barny:: @ 81F3FE9
+Route118_EventScript_Barny::
 	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
 	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Wade:: @ 81F4000
+Route118_EventScript_Wade::
 	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
 	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Dalton:: @ 81F4017
+Route118_EventScript_Dalton::
 	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -228,7 +228,7 @@ Route118_EventScript_Dalton:: @ 81F4017
 	release
 	end
 
-Route118_EventScript_RegisterDalton:: @ 81F4043
+Route118_EventScript_RegisterDalton::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
@@ -236,27 +236,27 @@ Route118_EventScript_RegisterDalton:: @ 81F4043
 	release
 	end
 
-Route118_EventScript_RematchDalton:: @ 81F4062
+Route118_EventScript_RematchDalton::
 	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
 	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Perry:: @ 81F4079
+Route118_EventScript_Perry::
 	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
 	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Chester:: @ 81F4090
+Route118_EventScript_Chester::
 	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
 	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Deandre:: @ 81F40A7
+Route118_EventScript_Deandre::
 	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
 	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_StevenQuestions: @ 81F40BE
+Route118_Text_StevenQuestions:
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -274,40 +274,40 @@ Route118_Text_StevenQuestions: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood:
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis:
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_TryYourLuckFishing: @ 81F42E7
+Route118_Text_TryYourLuckFishing:
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_DontYouLikeToFish: @ 81F4319
+Route118_Text_DontYouLikeToFish:
 	.string "Don't you like to fish?$"
 
-Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod:
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_CanCrossRiversWithSurf: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf:
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_RouteSignMauville: @ 81F43F4
+Route118_Text_RouteSignMauville:
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_RouteSign119: @ 81F440E
+Route118_Text_RouteSign119:
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"