Remove address comments

1 files changed, 62 insertions, 62 deletions

diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index a88e86459..ff1ac4ac0 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -1,10 +1,10 @@
 @ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map. 
 @  These are labeled in DewfordTown/scripts.inc
 
-Route109_MapScripts:: @ 81EE75F
+Route109_MapScripts::
 	.byte 0
 
-Route109_EventScript_StartDepartForDewford:: @ 81EE760
+Route109_EventScript_StartDepartForDewford::
 	call EventScript_BackupMrBrineyLocation
 	setobjectpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0
 	setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0
@@ -17,25 +17,25 @@ Route109_EventScript_StartDepartForDewford:: @ 81EE760
 	case DIR_EAST, Route109_EventScript_EnterBoatEast
 	end
 
-Route109_EventScript_EnterBoatSouth:: @ 81EE7A5
+Route109_EventScript_EnterBoatSouth::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_EnterBoatEast:: @ 81EE7B5
+Route109_EventScript_EnterBoatEast::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_EnterBoatWest:: @ 81EE7C5
+Route109_EventScript_EnterBoatWest::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_DoSailToDewford:: @ 81EE7D5
+Route109_EventScript_DoSailToDewford::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
 	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement LOCALID_BOAT_R109, Route109_Movement_SailToDewford
@@ -65,7 +65,7 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5
 	release
 	end
 
-Route109_Movement_SailToDewford: @ 81EE84F
+Route109_Movement_SailToDewford:
 	walk_in_place_fastest_down
 	walk_down
 	walk_down
@@ -241,45 +241,45 @@ Route109_Movement_SailToDewford: @ 81EE84F
 	walk_in_place_fastest_down
 	step_end
 
-Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD
+Route109_Movement_PlayerEnterBoatSouth:
 	walk_down
 	walk_down
 	step_end
 
-Route109_Movement_PlayerExitBoat: @ 81EE900
+Route109_Movement_PlayerExitBoat:
 	walk_down
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Route109_Movement_PlayerEnterBoatEast: @ 81EE905
+Route109_Movement_PlayerEnterBoatEast:
 	walk_right
 	walk_down
 	step_end
 
-Route109_Movement_PlayerEnterBoatWest: @ 81EE908
+Route109_Movement_PlayerEnterBoatWest:
 	walk_left
 	walk_down
 	step_end
 
-Route109_Movement_BrineyEnterBoat: @ 81EE90B
+Route109_Movement_BrineyEnterBoat:
 	walk_down
 	step_end
 
-Route109_Movement_BrineyExitBoat: @ 81EE90D
+Route109_Movement_BrineyExitBoat:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route109_EventScript_MrBriney:: @ 81EE910
+Route109_EventScript_MrBriney::
 	lock
 	faceplayer
 	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood
 	goto Route109_EventScript_DeliveredDevonGoods
 	end
 
-Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
+Route109_EventScript_HaveNotDeliveredDevonGood::
 	message Route109_Text_BrineySailToDewfordQuestion
 	msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -287,7 +287,7 @@ Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
 	goto Route109_EventScript_SailToDewford
 	end
 
-Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
+Route109_EventScript_DeliveredDevonGoods::
 	message Route109_Text_BrineyWhereAreWeBound
 	waitmessage
 	multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, FALSE
@@ -297,27 +297,27 @@ Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
 	case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail
 	end
 
-Route109_EventScript_SailToDewford:: @ 81EE972
+Route109_EventScript_SailToDewford::
 	msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT
 	closemessage
 	goto Route109_EventScript_StartDepartForDewford
 	end
 
-Route109_EventScript_StayHere:: @ 81EE981
+Route109_EventScript_StayHere::
 	msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_ChoseNotToSail:: @ 81EE98B
+Route109_EventScript_ChoseNotToSail::
 	msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_SeashoreHouseGirl:: @ 81EE995
+Route109_EventScript_SeashoreHouseGirl::
 	msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC
 	end
 
-Route109_EventScript_SandCastleBoy:: @ 81EE99E
+Route109_EventScript_SandCastleBoy::
 	lock
 	faceplayer
 	msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT
@@ -327,7 +327,7 @@ Route109_EventScript_SandCastleBoy:: @ 81EE99E
 	release
 	end
 
-Route109_EventScript_SoftSandGirl:: @ 81EE9B5
+Route109_EventScript_SoftSandGirl::
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
@@ -343,22 +343,22 @@ Route109_EventScript_SoftSandGirl:: @ 81EE9B5
 	release
 	end
 
-Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2
+Route109_EventScript_AlreadyReceivedSoftSand::
 	msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route109_EventScript_Woman:: @ 81EEA06
+Route109_EventScript_Woman::
 	msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC
 	end
 
-Route109_EventScript_OldMan:: @ 81EEA0F
+Route109_EventScript_OldMan::
 	msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC
 	end
 
-Route109_EventScript_Zigzagoon:: @ 81EEA18
+Route109_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -368,35 +368,35 @@ Route109_EventScript_Zigzagoon:: @ 81EEA18
 	release
 	end
 
-Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B
+Route109_EventScript_SeashoreHouseSign::
 	msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_TrainerTipsSign:: @ 81EEA34
+Route109_EventScript_TrainerTipsSign::
 	msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_David:: @ 81EEA3D
+Route109_EventScript_David::
 	trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated
 	msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Alice:: @ 81EEA54
+Route109_EventScript_Alice::
 	trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated
 	msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Huey:: @ 81EEA6B
+Route109_EventScript_Huey::
 	trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated
 	msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Edmond:: @ 81EEA82
+Route109_EventScript_Edmond::
 	trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated
 	msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Ricky:: @ 81EEA99
+Route109_EventScript_Ricky::
 	trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -405,7 +405,7 @@ Route109_EventScript_Ricky:: @ 81EEA99
 	release
 	end
 
-Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
+Route109_EventScript_RickyRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT
@@ -413,12 +413,12 @@ Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
 	release
 	end
 
-Route109_EventScript_RickyRematch:: @ 81EEAE4
+Route109_EventScript_RickyRematch::
 	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated
 	msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Lola:: @ 81EEAFB
+Route109_EventScript_Lola::
 	trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -427,7 +427,7 @@ Route109_EventScript_Lola:: @ 81EEAFB
 	release
 	end
 
-Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
+Route109_EventScript_LolaRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT
@@ -435,115 +435,115 @@ Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
 	release
 	end
 
-Route109_EventScript_LolaRematch:: @ 81EEB46
+Route109_EventScript_LolaRematch::
 	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated
 	msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Austina:: @ 81EEB5D
+Route109_EventScript_Austina::
 	trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated
 	msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Gwen:: @ 81EEB74
+Route109_EventScript_Gwen::
 	trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated
 	msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Carter:: @ 81EEB8B
+Route109_EventScript_Carter::
 	trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated
 	msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Paul:: @ 81EEBA2
+Route109_EventScript_Paul::
 	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon
 	msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Mel:: @ 81EEBBD
+Route109_EventScript_Mel::
 	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon
 	msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Chandler:: @ 81EEBD8
+Route109_EventScript_Chandler::
 	trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated
 	msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Hailey:: @ 81EEBEF
+Route109_EventScript_Hailey::
 	trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated
 	msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Elijah:: @ 81EEC06
+Route109_EventScript_Elijah::
 	trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated
 	msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D
+DewfordTown_Text_BrineyLandedInSlateportDeliverGoods:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've made land in SLATEPORT!\p"
 	.string "I suppose you're going to visit CAPT.\n"
 	.string "STERN and deliver the DEVON GOODS?$"
 
-Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96
+Route109_Text_BrineySailToDewfordQuestion:
 	.string "MR. BRINEY: I thought you're supposed\n"
 	.string "to deliver the DEVON GOODS.\p"
 	.string "Would you like to sail back to\n"
 	.string "DEWFORD, then?$"
 
-Route109_Text_BrineyDewfordItIs: @ 81EED06
+Route109_Text_BrineyDewfordItIs:
 	.string "MR. BRINEY: DEWFORD it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E
+Route109_Text_BrineyDeliverDevonGoods:
 	.string "MR. BRINEY: Then you go on and deliver\n"
 	.string "the DEVON GOODS. I'll be waiting.$"
 
-DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7
+DewfordTown_Text_BrineyLandedInSlateport:
 	.string "MR. BRINEY: Ahoy! We've made land in\n"
 	.string "SLATEPORT!\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail again!$"
 
-Route109_Text_BrineyWhereAreWeBound: @ 81EEE17
+Route109_Text_BrineyWhereAreWeBound:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72
+Route109_Text_BrineyTellMeWhenYouNeedToSail:
 	.string "MR. BRINEY: You just tell me whenever\n"
 	.string "you need to set sail again!$"
 
-Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4
+Route109_Text_ChillAtMyPapasSpot:
 	.string "Yo, TRAINERS!\n"
 	.string "Whether you're hot to trot,\l"
 	.string "or cool cat not,\l"
 	.string "chill at my papa's spot!$"
 
-Route109_Text_LittleKidsDartAround: @ 81EEF08
+Route109_Text_LittleKidsDartAround:
 	.string "Little kids can dart around so quickly…\p"
 	.string "You don't dare take your eyes off them\n"
 	.string "for an instant. It's very taxing.\p"
 	.string "Mine are with my POKéMON, so they\n"
 	.string "should be okay, but…$"
 
-Route109_Text_SandCastleTakingLongTime: @ 81EEFB0
+Route109_Text_SandCastleTakingLongTime:
 	.string "Our sand castle's taking a long time\n"
 	.string "to make.$"
 
-Route109_Text_YouCanHaveThis: @ 81EEFDE
+Route109_Text_YouCanHaveThis:
 	.string "You can have this!$"
 
-Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1
+Route109_Text_WereGoingToMakeBigCastle:
 	.string "We're going to get all the sand from\n"
 	.string "the beach and make a big castle!\p"
 	.string "And then we're going to be a king and\n"
 	.string "queen.\p"
 	.string "We'll let you be a servant.$"
 
-Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
+Route109_Text_ZigzagoonPicksUpLitter:
 	.string "The water around these parts is clean.\p"
 	.string "But, I get my ZIGZAGOON to pick up\n"
 	.string "litter from the shoreline at times.\p"
@@ -552,15 +552,15 @@ Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
 	.string "If we pollute the sea, it all comes\n"
 	.string "back to haunt us eventually.$"
 
-Route109_Text_ZigzagoonCry: @ 81EF173
+Route109_Text_ZigzagoonCry:
 	.string "ZIGZAGOON: Guguu?$"
 
-Route109_Text_SeashoreHouseSign: @ 81EF185
+Route109_Text_SeashoreHouseSign:
 	.string "SEASHORE HOUSE\p"
 	.string "“May hot battles rage on hot sands!\n"
 	.string "The place for hot TRAINERS!”$"
 
-Route109_Text_TrainerTipsSign: @ 81EF1D5
+Route109_Text_TrainerTipsSign:
 	.string "TRAINER TIPS\p"
 	.string "POKéMON at the same level may not\n"
 	.string "always have identical stats.\p"