Remove address comments

1 files changed, 29 insertions, 29 deletions

diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index 8202267b9..4a4091269 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -4,22 +4,22 @@
 .set LOCALID_AQUA_GRUNT_1, 8
 .set LOCALID_AQUA_GRUNT_2, 9
 
-MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
+MeteorFalls_1F_1R_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad
 	.byte 0
 
-MeteorFalls_1F_1R_OnLoad: @ 822BD30
+MeteorFalls_1F_1R_OnLoad:
 	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave
 	end
 
-MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
+MeteorFalls_1F_1R_EventScript_OpenStevensCave::
 	setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
 	setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
 	setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
 	setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
 	return
 
-MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
+MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
 	lockall
 	playbgm MUS_ENCOUNTER_MAGMA, FALSE
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown
@@ -96,13 +96,13 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	releaseall
 	end
 
-MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0
+MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer:
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
+MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -114,7 +114,7 @@ MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
+MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -127,7 +127,7 @@ MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
+MeteorFalls_1F_1R_Movement_ArchieArrive:
 	walk_right
 	walk_right
 	walk_right
@@ -136,7 +136,7 @@ MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
+MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive:
 	delay_16
 	delay_16
 	walk_right
@@ -146,7 +146,7 @@ MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
+MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive:
 	delay_16
 	delay_16
 	walk_right
@@ -156,7 +156,7 @@ MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
+MeteorFalls_1F_1R_Movement_ArchieExit:
 	walk_right
 	walk_right
 	walk_right
@@ -166,7 +166,7 @@ MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
+MeteorFalls_1F_1R_Movement_ArchieApproachPlayer:
 	walk_right
 	walk_right
 	walk_up
@@ -174,7 +174,7 @@ MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
 	walk_in_place_fastest_left
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
+MeteorFalls_1F_1R_Movement_AquaGrunt1Exit:
 	walk_up
 	walk_up
 	walk_right
@@ -186,14 +186,14 @@ MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08
+MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
+MeteorFalls_1F_1R_Movement_AquaGrunt2Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -206,14 +206,14 @@ MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18
+MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
+MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay:
 	walk_in_place_fastest_down
 	delay_4
 	walk_in_place_fastest_right
@@ -223,7 +223,7 @@ MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
 	face_right
 	step_end
 
-MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
+MeteorFalls_1F_1R_EventScript_ProfCozmo::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo
@@ -232,28 +232,28 @@ MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
 	release
 	end
 
-MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D
+MeteorFalls_1F_1R_EventScript_MetCozmo::
 	msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47
+MeteorFalls_1F_1R_Text_WithThisMeteorite:
 	.string "Hehehe!\p"
 	.string "With this METEORITE, that thing in\n"
 	.string "MT. CHIMNEY will…$"
 
-MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84
+MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma:
 	.string "Heh?\p"
 	.string "I don't know who you are, but if you get\n"
 	.string "in the way of TEAM MAGMA, don't\l"
 	.string "expect any mercy!$"
 
-MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4
+MeteorFalls_1F_1R_Text_HoldItRightThereMagma:
 	.string "Hold it right there, TEAM MAGMA!\p"
 	.string "You're badly mistaken if you think you\n"
 	.string "can have your way with the world!$"
 
-MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
+MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua:
 	.string "Hehehe!\n"
 	.string "Even TEAM AQUA joins us!\p"
 	.string "But it's too much trouble to deal with\n"
@@ -264,7 +264,7 @@ MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
 	.string "Hehehe! Be seeing you, you TEAM\n"
 	.string "AQUA dingbats!$"
 
-MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
+MeteorFalls_1F_1R_Text_ArchieSeenYouBefore:
 	.string "ARCHIE: Didn't I see you before?\n"
 	.string "At SLATEPORT's MUSEUM?\p"
 	.string "Ah, so your name is {PLAYER}.\p"
@@ -279,22 +279,22 @@ MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
 	.string "They are the rivals to us,\n"
 	.string "the sea-loving TEAM AQUA!$"
 
-MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268
+MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma:
 	.string "BOSS, we should give chase to\n"
 	.string "TEAM MAGMA…$"
 
-MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292
+MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo:
 	.string "ARCHIE: Yes, yes, we must!\n"
 	.string "We've got to hurry.\p"
 	.string "There's no telling what TEAM MAGMA\n"
 	.string "will do at MT. CHIMNEY!$"
 
-MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC
+MeteorFalls_1F_1R_Text_ArchieFarewell:
 	.string "ARCHIE: {PLAYER}, you should keep\n"
 	.string "an eye out for TEAM MAGMA, too.\p"
 	.string "Farewell!$"
 
-MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
+MeteorFalls_1F_1R_Text_MeetProfCozmo:
 	.string "I… I'm COZMO…\n"
 	.string "I'm a PROFESSOR…\p"
 	.string "TEAM MAGMA asked me to guide them\n"
@@ -309,7 +309,7 @@ MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
 
-MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D
+MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney:
 	.string "PROF. COZMO: But that TEAM MAGMA…\p"
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"