Remove address comments

1 files changed, 54 insertions, 54 deletions

diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index d04a16b58..6dd0767f0 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,17 +1,17 @@
-SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C
+SafariZone_EventScript_OutOfBallsMidBattle::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
-SafariZone_EventScript_Exit:: @ 82A4B5D
+SafariZone_EventScript_Exit::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
+SafariZone_EventScript_RetirePrompt::
 	lockall
 	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -19,10 +19,10 @@ SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	releaseall
 	end
 
-SafariZone_EventScript_Retire:: @ 82A4B85
+SafariZone_EventScript_Retire::
 	goto SafariZone_EventScript_Exit
 
-SafariZone_EventScript_TimesUp:: @ 82A4B8A
+SafariZone_EventScript_TimesUp::
 	lockall
 	playse SE_DING_DONG
 	message SafariZone_Text_TimesUp
@@ -31,7 +31,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A
 	releaseall
 	goto SafariZone_EventScript_Exit
 
-SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
+SafariZone_EventScript_OutOfBalls::
 	lockall
 	playse SE_DING_DONG
 	message SafariZone_Text_OutOfBalls
@@ -40,7 +40,7 @@ SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
 	releaseall
 	goto SafariZone_EventScript_Exit
 
-EventScript_PokeBlockFeeder:: @ 82A4BAC
+EventScript_PokeBlockFeeder::
 	lockall
 	special GetPokeblockFeederInFront
 	compare VAR_RESULT, 0xFFFF
@@ -51,7 +51,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
 	releaseall
 	end
 
-SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
+SafariZone_EventScript_ChoosePokeblock::
 	fadescreen FADE_TO_BLACK
 	special OpenPokeblockCaseOnFeeder
 	waitstate
@@ -59,45 +59,45 @@ SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
 	goto_if_ne SafariZone_EventScript_PokeblockPlaced
 	end
 
-SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2
+SafariZone_EventScript_PokeblockPlaced::
 	message SafariZone_Text_PokeblockWasPlaced
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB
+SafariZone_EventScript_PokeblockPresent::
 	message SafariZone_Text_PokeblockStillHere
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4
+SafariZone_Text_WouldYouLikeToExit:
 	.string "Would you like to exit the SAFARI\n"
 	.string "ZONE right now?$"
 
-SafariZone_Text_TimesUp: @ 82A4C26
+SafariZone_Text_TimesUp:
 	.string "Ding-dong! Time's up!\n"
 	.string "Your SAFARI Game is over.$"
 
-SafariZone_Text_OutOfBalls: @ 82A4C56
+SafariZone_Text_OutOfBalls:
 	.string "You've run out of SAFARI BALLS.\n"
 	.string "Your SAFARI Game is over.$"
 
-SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90
+SafariZone_Text_PlacePokeblockOnFeeder:
 	.string "Would you like to place a {POKEBLOCK}\n"
 	.string "on the {POKEBLOCK} FEEDER?$"
 
-SafariZone_Text_PokeblockStillHere: @ 82A4CC5
+SafariZone_Text_PokeblockStillHere:
 	.string "The {STR_VAR_1} you left\n"
 	.string "before is still here.$"
 
-SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB
+SafariZone_Text_PokeblockWasPlaced:
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
+Route121_SafariZoneEntrance_Text_WelcomeToSafariZone:
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "Here, you may witness many kinds of\n"
 	.string "POKéMON rarely seen in HOENN.\p"
@@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
 	.string "for keeps!\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46
+Route121_SafariZoneEntrance_Text_WelcomeFirstTime:
 	.string "Welcome to the SAFARI ZONE!\n"
 	.string "Is it your first time here?$"
 
-Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E
+Route121_SafariZoneEntrance_Text_ComeInAndEnjoy:
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
+Route121_SafariZoneEntrance_Text_FirstTimeInfo:
 	.string "When you enter the SAFARI ZONE, you\n"
 	.string "start with 30 SAFARI BALLS for\l"
 	.string "catching POKéMON.\p"
@@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
 	.string "walked 500 steps.\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74
+Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay:
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "All you can catch for just ¥500!\n"
 	.string "Would you like to play a SAFARI Game?$"
 
-Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7
+Route121_SafariZoneEntrance_Text_PlayAnotherTime:
 	.string "Okay.\n"
 	.string "Please play another time!$"
 
-Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7
+Route121_SafariZoneEntrance_Text_NotEnoughMoney:
 	.string "You don't have enough money.\n"
 	.string "Sorry.$"
 
-Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B
+Route121_SafariZoneEntrance_Text_ThatWillBe500Please:
 	.string "That will be ¥500, please.$"
 
-Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036
+Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls:
 	.string "Here are your SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052
+Route121_SafariZoneEntrance_Text_Received30SafariBalls:
 	.string "{PLAYER} received 30 SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F
+Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself:
 	.string "We'll let you know when your game\n"
 	.string "is over.\p"
 	.string "So, until then, enjoy yourself, please!\n"
 	.string "Off you go on your wild excursion!$"
 
-Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5
+Route121_SafariZoneEntrance_Text_PCIsFull:
 	.string "Excuse me!\n"
 	.string "Your PC BOX is full.$"
 
-Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
+Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase:
 	.string "Excuse me!\n"
 	.string "You seem to be without a {POKEBLOCK} CASE.\p"
 	.string "Your SAFARI Game will be much more\n"
@@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
 	.string "You may obtain a {POKEBLOCK} CASE from\n"
 	.string "the LILYCOVE CONTEST HALL.$"
 
-SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4
+SafariZone_South_Text_StillHaveTimeExit:
 	.string "You still have time left. Would you like\n"
 	.string "to exit the SAFARI ZONE now?$"
 
-SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A
+SafariZone_South_Text_EnjoyTheRestOfYourAdventure:
 	.string "Please enjoy the rest of your wild\n"
 	.string "adventure!$"
 
-SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248
+SafariZone_South_Text_ExitEarlyThankYouForPlaying:
 	.string "Okay.\p"
 	.string "I'll take back your remaining SAFARI\n"
 	.string "BALLS.\p"
 	.string "Thank you for playing.\n"
 	.string "We hope to see you again.$"
 
-SafariZone_South_Text_GoodLuck: @ 82A52AB
+SafariZone_South_Text_GoodLuck:
 	.string "Good luck!\p"
 	.string "If you need anything, don't hesitate\n"
 	.string "to tell me, please!$"
 
-SafariZone_South_Text_Boy: @ 82A52EF
+SafariZone_South_Text_Boy:
 	.string "Did you know?\p"
 	.string "If you put a {POKEBLOCK} in that square box,\n"
 	.string "POKéMON gather around.$"
 
-SafariZone_South_Text_Man: @ 82A533B
+SafariZone_South_Text_Man:
 	.string "I want to keep going deeper, but I\n"
 	.string "forgot to bring a BIKE.\p"
 	.string "Something tells me that rare POKéMON\n"
 	.string "live in the outlying areas.$"
 
-SafariZone_Southwest_Text_Woman: @ 82A53B7
+SafariZone_Southwest_Text_Woman:
 	.string "Sometimes, when I toss a {POKEBLOCK} at \n"
 	.string "POKéMON, it gets ignored.\p"
 	.string "Do POKéMON have likes and dislikes\n"
 	.string "about what they eat?$"
 
-SafariZone_Northwest_Text_Man: @ 82A542C
+SafariZone_Northwest_Text_Man:
 	.string "Gasp… Gasp…\n"
 	.string "I…made it out here…but…\p"
 	.string "I'm exhausted… I don't have the\n"
 	.string "energy to catch POKéMON…$"
 
-SafariZone_North_Text_Fisherman: @ 82A5489
+SafariZone_North_Text_Fisherman:
 	.string "I'm on a mission to find WATER POKéMON\n"
 	.string "you don't see in HOENN.\p"
 	.string "Do you have any idea where the lake is?$"
 
-SafariZone_North_Text_Man: @ 82A54F0
+SafariZone_North_Text_Man:
 	.string "I'm going to catch a lot of rare POKéMON\n"
 	.string "here and trade them with my friends!$"
 
-SafariZone_South_Text_Youngster: @ 82A553E
+SafariZone_South_Text_Youngster:
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
 	.string "I guess POKéMON must have eaten it\n"
 	.string "without me noticing.$"
 
-Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB
+Route121_SafariZoneEntrance_Text_TrainerTip:
 	.string "SAFARI ZONE TRAINER TIP!\p"
 	.string "Throw {POKEBLOCK}S at wild POKéMON to make\n"
 	.string "them less likely to flee.$"
 
-SafariZone_Southwest_Text_RestHouseSign: @ 82A5613
+SafariZone_Southwest_Text_RestHouseSign:
 	.string "“Relieve your tired feet.”\n"
 	.string "REST HOUSE$"
 
-SafariZone_RestHouse_Text_Youngster: @ 82A5639
+SafariZone_RestHouse_Text_Youngster:
 	.string "I don't have any {POKEBLOCK}S, but I caught\n"
 	.string "a good number of POKéMON.\p"
 	.string "You can improve your chances of making\n"
 	.string "a catch by getting closer to them\l"
 	.string "before throwing a SAFARI BALL.$"
 
-SafariZone_RestHouse_Text_PsychicM: @ 82A56E1
+SafariZone_RestHouse_Text_PsychicM:
 	.string "If you use {POKEBLOCK}S, wild POKéMON won't\n"
 	.string "be so quick to run away.\p"
 	.string "It's not much use to give {POKEBLOCK}S to\n"
 	.string "POKéMON that don't flee easily.$"
 
-SafariZone_RestHouse_Text_FatMan: @ 82A5764
+SafariZone_RestHouse_Text_FatMan:
 	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
 	.string "POKéMON are attracted to it.\p"
 	.string "I think POKéMON with the same sort of\n"
 	.string "nature are drawn by a certain {POKEBLOCK}.$"
 
-SafariZone_South_Text_AreaOffLimits1: @ 82A57EE
+SafariZone_South_Text_AreaOffLimits1:
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D
+SafariZone_Southeast_Text_ExpansionIsFinished:
 	.string "The SAFARI ZONE's expansion project\n"
 	.string "is finished now.\p"
 	.string "We hope you will enjoy the new area.$"
 
-SafariZone_South_Text_AreaOffLimits2: @ 82A5887
+SafariZone_South_Text_AreaOffLimits2:
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_LittleGirl: @ 82A58C6
+SafariZone_Southeast_Text_LittleGirl:
 	.string "Wow! Whee! I haven't seen any of\n"
 	.string "these POKéMON before!$"
 
-SafariZone_Southeast_Text_FatMan: @ 82A58FD
+SafariZone_Southeast_Text_FatMan:
 	.string "The POKéMON in this area are all\n"
 	.string "new to me.\p"
 	.string "And I'm allowed to catch these rare\n"
 	.string "POKéMON! Too cool!$"
 
-SafariZone_Southeast_Text_RichBoy: @ 82A5960
+SafariZone_Southeast_Text_RichBoy:
 	.string "The POKéMON around here seem to be\n"
 	.string "from somewhere other than HOENN.$"
 
-SafariZone_Northeast_Text_Boy: @ 82A59A4
+SafariZone_Northeast_Text_Boy:
 	.string "I only have a couple SAFARI BALLS left.\p"
 	.string "I'm having a hard time trying to\n"
 	.string "decide what I should catch.$"
 
-SafariZone_Northeast_Text_Woman: @ 82A5A09
+SafariZone_Northeast_Text_Woman:
 	.string "I heard that you can see PIKACHU here.\n"
 	.string "Where might one be?$"
 
-SafariZone_Northeast_Text_Girl: @ 82A5A44
+SafariZone_Northeast_Text_Girl:
 	.string "Oh, boo!\n"
 	.string "I can't seem to catch anything!\p"
 	.string "I'll end up wasting the admission\n"