Remove address comments

1 files changed, 34 insertions, 34 deletions

diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 0fa73212e..706d362be 100644
--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -1,7 +1,7 @@
-MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
+MeteorFalls_1F_2R_MapScripts::
 	.byte 0
 
-MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
+MeteorFalls_1F_2R_EventScript_Nicolas::
 	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -10,7 +10,7 @@ MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
+MeteorFalls_1F_2R_EventScript_RegisterNicolas::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT
@@ -18,12 +18,12 @@ MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529
+MeteorFalls_1F_2R_EventScript_RematchNicolas::
 	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat
 	msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_John:: @ 822C540
+MeteorFalls_1F_2R_EventScript_John::
 	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -32,18 +32,18 @@ MeteorFalls_1F_2R_EventScript_John:: @ 822C540
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570
+MeteorFalls_1F_2R_EventScript_RegisterJohn::
 	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589
+MeteorFalls_1F_2R_EventScript_RematchJohn::
 	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons
 	msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
+MeteorFalls_1F_2R_EventScript_Jay::
 	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -52,133 +52,133 @@ MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4
+MeteorFalls_1F_2R_EventScript_RegisterJay::
 	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT  @ John speaks for both during register
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED
+MeteorFalls_1F_2R_EventScript_RematchJay::
 	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons
 	msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608
+MeteorFalls_1F_2R_Text_NicolasIntro:
 	.string "This is where we DRAGON users do our\n"
 	.string "training.\p"
 	.string "The CHAMPION even visits.\n"
 	.string "Now do you see how special it is here?$"
 
-MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678
+MeteorFalls_1F_2R_Text_NicolasDefeat:
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3
+MeteorFalls_1F_2R_Text_NicolasPostBattle:
 	.string "The road ahead remains long and harsh.\p"
 	.string "When will my POKéMON and I become\n"
 	.string "the best?$"
 
-MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6
+MeteorFalls_1F_2R_Text_NicolasRegister:
 	.string "I want to know more about your power.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F
+MeteorFalls_1F_2R_Text_NicolasRematchIntro:
 	.string "Since we met, we have trained hard\n"
 	.string "with our sights on number one.\p"
 	.string "Help us see how much stronger we've\n"
 	.string "become!$"
 
-MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD
+MeteorFalls_1F_2R_Text_NicolasRematchDefeat:
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8
+MeteorFalls_1F_2R_Text_NicolasPostRematch:
 	.string "You've obviously kept up your\n"
 	.string "POKéMON training.\p"
 	.string "So long as you remain strong, I, too,\n"
 	.string "can become stronger!$"
 
-MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843
+MeteorFalls_1F_2R_Text_JohnIntro:
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C
+MeteorFalls_1F_2R_Text_JohnDefeat:
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1
+MeteorFalls_1F_2R_Text_JohnPostBattle:
 	.string "JOHN: We've been married for\n"
 	.string "fifty years.\p"
 	.string "Come to think of it, I've yet to beat\n"
 	.string "my dear wife in a battle.$"
 
-MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B
+MeteorFalls_1F_2R_Text_JohnNotEnoughMons:
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C
+MeteorFalls_1F_2R_Text_JohnRegister:
 	.string "JOHN: Young TRAINER, if the chance\n"
 	.string "arises, will you battle with us again?$"
 
-MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6
+MeteorFalls_1F_2R_Text_JayIntro:
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "The bond we share as a couple could\n"
 	.string "never be broken.$"
 
-MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44
+MeteorFalls_1F_2R_Text_JayDefeat:
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70
+MeteorFalls_1F_2R_Text_JayPostBattle:
 	.string "JAY: Fifty years of marriage…\p"
 	.string "If we ever argued, we always settled\n"
 	.string "it with a POKéMON battle…$"
 
-MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD
+MeteorFalls_1F_2R_Text_JayNotEnoughMons:
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
 	.string "have to come back with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47
+MeteorFalls_1F_2R_Text_JohnRematchIntro:
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0
+MeteorFalls_1F_2R_Text_JohnRematchDefeat:
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5
+MeteorFalls_1F_2R_Text_JohnPostRematch:
 	.string "JOHN: Married for fifty years…\p"
 	.string "On reflection, the dear wife and I,\n"
 	.string "we battled day in and day out…$"
 
-MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27
+MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons:
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98
+MeteorFalls_1F_2R_Text_JayRematchIntro:
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "We've supported each other all that\n"
 	.string "time. We've made ourselves strong.$"
 
-MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08
+MeteorFalls_1F_2R_Text_JayRematchDefeat:
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34
+MeteorFalls_1F_2R_Text_JayPostRematch:
 	.string "JAY: Fifty years of marriage…\n"
 	.string "Many things have happened.\p"
 	.string "I hope that we will continue to make\n"
 	.string "happy memories together.$"
 
-MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB
+MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons:
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"