Remove address comments

1 files changed, 49 insertions, 49 deletions

diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index b6fa7428e..07c397e8c 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,11 +1,11 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SCOTT, 5
 
-SSTidalCorridor_MapScripts:: @ 823BFCF
+SSTidalCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
 	.byte 0
 
-SSTidalCorridor_OnFrame: @ 823BFD5
+SSTidalCorridor_OnFrame:
 	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
@@ -13,7 +13,7 @@ SSTidalCorridor_OnFrame: @ 823BFD5
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
 	.2byte 0
 
-SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
+SSTidalCorridor_EventScript_DepartSlateportForLilycove::
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
@@ -22,7 +22,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
+SSTidalCorridor_EventScript_DepartLilycoveForSlateport::
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
 	playse SE_DING_DONG
@@ -30,28 +30,28 @@ SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
 	releaseall
 	end
 
-SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
+SSTidalRooms_EventScript_HalfwayToSlateport::
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
+SSTidalRooms_EventScript_ArrivedInLilycove::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
-SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
+SSTidalCorridor_EventScript_ReachedStepCount::
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
 	end
 
-SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
+SSTidalCorridor_EventScript_HalfwayToLilycove::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
@@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
+SSTidalCorridor_EventScript_ArrivedInSlateport::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
@@ -69,14 +69,14 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	releaseall
 	end
 
-SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
+SSTidalRooms_EventScript_ArrivedInSlateport::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
+SSTidalRooms_EventScript_ProgessCruiseAfterBed::
 	switch VAR_SS_TIDAL_STATE
 	case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
 	case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
@@ -84,11 +84,11 @@ SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
 	case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
 	return
 
-SSTidalCorridor_EventScript_Briney:: @ 823C0D9
+SSTidalCorridor_EventScript_Briney::
 	msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
 	end
 
-SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
+SSTidalCorridor_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
@@ -98,23 +98,23 @@ SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
 	release
 	end
 
-SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
+SSTidalCorridor_EventScript_Cabin1Sign::
 	msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
+SSTidalCorridor_EventScript_Cabin2Sign::
 	msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
+SSTidalCorridor_EventScript_Cabin3Sign::
 	msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
+SSTidalCorridor_EventScript_Cabin4Sign::
 	msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
+SSTidalCorridor_EventScript_ExitSailor::
 	lock
 	faceplayer
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
@@ -125,7 +125,7 @@ SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
 	release
 	end
 
-SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
+SSTidalCorridor_EventScript_ExitLilycove::
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
@@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
 	release
 	end
 
-SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
+SSTidalCorridor_EventScript_ExitSlateport::
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
@@ -143,11 +143,11 @@ SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
 	release
 	end
 
-SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
+SSTidalCorridor_EventScript_HideSnatchGiver::
 	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
-SSTidalCorridor_EventScript_Porthole:: @ 823C17D
+SSTidalCorridor_EventScript_Porthole::
 	lockall
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
@@ -157,12 +157,12 @@ SSTidalCorridor_EventScript_Porthole:: @ 823C17D
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
+SSTidalCorridor_EventScript_LookThroughPorthole::
 	special LookThroughPorthole
 	waitstate
 	end
 
-SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
+SSTidalCorridor_EventScript_Sailor::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
@@ -171,12 +171,12 @@ SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
 	release
 	end
 
-SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
+SSTidalCorridor_EventScript_EnjoyYourCruise::
 	msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
+SSTidalCorridor_EventScript_CheckIfTrainersDefeated::
 	goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated
 	goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated
 	goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated
@@ -189,10 +189,10 @@ SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
 	goto SSTidalCorridor_EventScript_EnjoyYourCruise
 	return
 
-SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
+SSTidalCorridor_EventScript_TrainerNotDefeated::
 	return
 
-SSTidalCorridor_EventScript_ScottScene:: @ 823C219
+SSTidalCorridor_EventScript_ScottScene::
 	lockall
 	applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer
 	waitmovement 0
@@ -215,7 +215,7 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	releaseall
 	end
 
-SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
+SSTidalCorridor_Movement_ScottApproachPlayer:
 	walk_left
 	walk_left
 	walk_left
@@ -225,7 +225,7 @@ SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_ScottExit: @ 823C275
+SSTidalCorridor_Movement_ScottExit:
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -235,7 +235,7 @@ SSTidalCorridor_Movement_ScottExit: @ 823C275
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
+SSTidalCorridor_Movement_PlayerWatchScottExit:
 	delay_16
 	delay_16
 	delay_16
@@ -244,7 +244,7 @@ SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
 	walk_in_place_fastest_down
 	step_end
 
-SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
+SSTidalCorridor_Movement_SailorMoveForScott:
 	delay_16
 	walk_right
 	walk_right
@@ -253,13 +253,13 @@ SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
 	walk_in_place_fastest_left
 	step_end
 
-SSTidalCorridor_Movement_SailorReturn: @ 823C28B
+SSTidalCorridor_Movement_SailorReturn:
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
+SSTidalCorridor_Text_ScottBattleFrontierInvite:
 	.string "SCOTT: Well, hi, hi!\n"
 	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
 	.string "Something's come up, so I have to\n"
@@ -279,25 +279,25 @@ SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
 	.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
 	.string "at the BATTLE FRONTIER!$"
 
-SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
+SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage:
 	.string "This ferry is built to plow through\n"
 	.string "fast-running currents.\p"
 	.string "We hope you enjoy your voyage with us.\n"
 	.string "Feel free to explore the ship.$"
 
-SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
+SSTidal_Text_HopeYouEnjoyVoyage:
 	.string "We hope you enjoy your voyage on\n"
 	.string "our ferry.$"
 
-SSTidal_Text_MadeLandInSlateport: @ 823C50F
+SSTidal_Text_MadeLandInSlateport:
 	.string "We have made land in SLATEPORT CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidal_Text_MadeLandInLilycove: @ 823C553
+SSTidal_Text_MadeLandInLilycove:
 	.string "We have made land in LILYCOVE CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
+SSTidalCorridor_Text_CanRestInCabin2:
 	.string "It'll be some time before we make land,\n"
 	.string "I reckon.\p"
 	.string "You can rest up in your cabin if you'd\n"
@@ -305,22 +305,22 @@ SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
 	.string "The bed in there is soft and plushy.\n"
 	.string "I can attest to how comfy it is!$"
 
-SSTidalCorridor_Text_WeveArrived: @ 823C64F
+SSTidalCorridor_Text_WeveArrived:
 	.string "We've arrived!$"
 
-SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
+SSTidalCorridor_Text_VisitOtherCabins:
 	.string "Go visit other cabins.\n"
 	.string "TRAINERS bored of the boat trip will\l"
 	.string "be itching to battle.$"
 
-SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
+SSTidalCorridor_Text_EnjoyYourCruise:
 	.string "Enjoy your cruise!$"
 
-SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
+SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole:
 	.string "The horizon spreads beyond\n"
 	.string "the porthole.$"
 
-SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
+SSTidalCorridor_Text_BrineyWelcomeAboard:
 	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
 	.string "They made me honorary captain of\n"
 	.string "the S.S. TIDAL!\p"
@@ -330,17 +330,17 @@ SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
 	.string "Let me just say, it stirred my sleeping\n"
 	.string "soul as a sailor!$"
 
-SSTidalCorridor_Text_Peeko: @ 823C7E1
+SSTidalCorridor_Text_Peeko:
 	.string "PEEKO: Pihyo pihyohyo…$"
 
-SSTidalCorridor_Text_Cabin1: @ 823C7F8
+SSTidalCorridor_Text_Cabin1:
 	.string "Cabin 1$"
 
-SSTidalCorridor_Text_Cabin2: @ 823C800
+SSTidalCorridor_Text_Cabin2:
 	.string "Cabin 2$"
 
-SSTidalCorridor_Text_Cabin3: @ 823C808
+SSTidalCorridor_Text_Cabin3:
 	.string "Cabin 3$"
 
-SSTidalCorridor_Text_Cabin4: @ 823C810
+SSTidalCorridor_Text_Cabin4:
 	.string "Cabin 4$"