Remove address comments

1 files changed, 164 insertions, 164 deletions

diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 05bd25247..5c6ef0902 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -5,12 +5,12 @@
 .set LOCALID_RIVAL, 14
 .set LOCALID_SCIENTIST, 15
 
-RustboroCity_MapScripts:: @ 81E06BD
+RustboroCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame
 	.byte 0
 
-RustboroCity_OnTransition: @ 81E06C8
+RustboroCity_OnTransition:
 	setflag FLAG_VISITED_RUSTBORO_CITY
 	call Common_EventScript_SetupRivalGfxId
 	compare VAR_RUSTBORO_CITY_STATE, 6
@@ -20,25 +20,25 @@ RustboroCity_OnTransition: @ 81E06C8
 	goto_if_eq RustboroCity_EventScript_PositionScientistForExit
 	end
 
-RustboroCity_EventScript_PositionScientistForExit:: @ 81E06EC
+RustboroCity_EventScript_PositionScientistForExit::
 	compare VAR_TEMP_0, 11
 	goto_if_eq RustboroCity_EventScript_PositionScientistLeftExit
 	setobjectxyperm LOCALID_SCIENTIST, 12, 15
 	end
 
-RustboroCity_EventScript_PositionScientistLeftExit:: @ 81E06FF
+RustboroCity_EventScript_PositionScientistLeftExit::
 	setobjectxyperm LOCALID_SCIENTIST, 11, 15
 	end
 
-RustboroCity_EventScript_HideMapNamePopup:: @ 81E0707
+RustboroCity_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-RustboroCity_OnFrame: @ 81E070B
+RustboroCity_OnFrame:
 	map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_ScientistAddMatchCall
 	.2byte 0
 
-RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
+RustboroCity_EventScript_ScientistAddMatchCall::
 	lockall
 	setvar VAR_ROUTE104_STATE, 1
 	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
@@ -77,13 +77,13 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	delay 20
 	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_PleaseSelectPokenav:: @ 81E07AC
+RustboroCity_EventScript_PleaseSelectPokenav::
 	msgbox RustboroCity_Text_PleaseSelectPokenav, MSGBOX_DEFAULT
 	closemessage
 	delay 10
 	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
+RustboroCity_EventScript_MatchCallTutorial::
 	setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV
 	special ScriptMenu_CreateStartMenuForPokenavTutorial
 	waitstate
@@ -111,21 +111,21 @@ RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
 	releaseall
 	end
 
-RustboroCity_Movement_ScientistWalkInPlaceDown: @ 81E084E
+RustboroCity_Movement_ScientistWalkInPlaceDown:
 	walk_in_place_down
 	step_end
 
-RustboroCity_Movement_PlayerWalkDown: @ 81E0850
+RustboroCity_Movement_PlayerWalkDown:
 	walk_down
 	step_end
 
-RustboroCity_Movement_ScientistApproachPlayer: @ 81E0852
+RustboroCity_Movement_ScientistApproachPlayer:
 	walk_down
 	delay_16
 	step_end
 
 @ Unused
-RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855
+RustboroCity_Movement_ScientistWalkAroundPlayer:
 	delay_16
 	walk_left
 	walk_down
@@ -135,11 +135,11 @@ RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855
 	delay_16
 	step_end
 
-RustboroCity_Movement_ScientistLeave: @ 81E085D
+RustboroCity_Movement_ScientistLeave:
 	walk_up
 	step_end
 
-RustboroCity_EventScript_FatMan:: @ 81E085F
+RustboroCity_EventScript_FatMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt
@@ -147,23 +147,23 @@ RustboroCity_EventScript_FatMan:: @ 81E085F
 	release
 	end
 
-RustboroCity_EventScript_FatManSawGrunt:: @ 81E0874
+RustboroCity_EventScript_FatManSawGrunt::
 	msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_DevonEmployee2:: @ 81E087E
+RustboroCity_EventScript_DevonEmployee2::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Woman:: @ 81E088A
+RustboroCity_EventScript_Woman::
 	msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_Man1:: @ 81E0893
+RustboroCity_EventScript_Man1::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge
@@ -171,12 +171,12 @@ RustboroCity_EventScript_Man1:: @ 81E0893
 	release
 	end
 
-RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8
+RustboroCity_EventScript_Man1HaveBadge::
 	msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Boy2:: @ 81E08B2
+RustboroCity_EventScript_Boy2::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_Boy2BrineyLeftTunnel
@@ -184,49 +184,49 @@ RustboroCity_EventScript_Boy2:: @ 81E08B2
 	release
 	end
 
-RustboroCity_EventScript_Boy2BrineyLeftTunnel:: @ 81E08C7
+RustboroCity_EventScript_Boy2BrineyLeftTunnel::
 	msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Twin:: @ 81E08D1
+RustboroCity_EventScript_Twin::
 	msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_NinjaBoy:: @ 81E08DA
+RustboroCity_EventScript_NinjaBoy::
 	msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_TunnelSign:: @ 81E08E3
+RustboroCity_EventScript_TunnelSign::
 	msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_DevonCorpSign:: @ 81E08EC
+RustboroCity_EventScript_DevonCorpSign::
 	msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_GymSign:: @ 81E08F5
+RustboroCity_EventScript_GymSign::
 	msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN
 	end
 
 @ Unused
-RustboroCity_EventScript_DevonCorpBranchOfficeSign:: @ 81E08FE
+RustboroCity_EventScript_DevonCorpBranchOfficeSign::
 	msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_CitySign:: @ 81E0907
+RustboroCity_EventScript_CitySign::
 	msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_TrainersSchoolSign:: @ 81E0910
+RustboroCity_EventScript_TrainersSchoolSign::
 	msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_CuttersHouseSign:: @ 81E0919
+RustboroCity_EventScript_CuttersHouseSign::
 	msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_LittleBoy:: @ 81E0922
+RustboroCity_EventScript_LittleBoy::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT
@@ -235,7 +235,7 @@ RustboroCity_EventScript_LittleBoy:: @ 81E0922
 	release
 	end
 
-RustboroCity_EventScript_LittleGirl:: @ 81E0938
+RustboroCity_EventScript_LittleGirl::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT
@@ -244,14 +244,14 @@ RustboroCity_EventScript_LittleGirl:: @ 81E0938
 	release
 	end
 
-RustboroCity_EventScript_Man2:: @ 81E094E
+RustboroCity_EventScript_Man2::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A
+RustboroCity_EventScript_StolenGoodsTrigger0::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -259,7 +259,7 @@ RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971
+RustboroCity_EventScript_StolenGoodsTrigger1::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -267,7 +267,7 @@ RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988
+RustboroCity_EventScript_StolenGoodsTrigger2::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -275,7 +275,7 @@ RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F
+RustboroCity_EventScript_StolenGoodsTrigger3::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -283,7 +283,7 @@ RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
+RustboroCity_EventScript_StolenGoodsTrigger4::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -291,7 +291,7 @@ RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
+RustboroCity_EventScript_StolenGoodsScene::
 	msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_ENCOUNTER_AQUA, FALSE
@@ -323,41 +323,41 @@ RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
 	end
 
 @ Unused
-RustboroCity_EventScript_ShadyCharacterTookOff:: @ 81E0A3B
+RustboroCity_EventScript_ShadyCharacterTookOff::
 	msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT
 	return
 
 @ Unused
-RustboroCity_EventScript_YouGotItThankYou:: @ 81E0A44
+RustboroCity_EventScript_YouGotItThankYou::
 	msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT
 	return
 
 @ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions
-RustboroCity_EventScript_EmployeeApproachUp:: @ 81E0A4D
+RustboroCity_EventScript_EmployeeApproachUp::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachLeft:: @ 81E0A58
+RustboroCity_EventScript_EmployeeApproachLeft::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachRight:: @ 81E0A63
+RustboroCity_EventScript_EmployeeApproachRight::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E
+RustboroCity_EventScript_EmployeeApproachDown::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown
 	waitmovement 0
 	return
 
 @ Unused, similar movement to the above scripts
-RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
+RustboroCity_EventScript_EmployeeApproachPlayerFar::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -365,7 +365,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
 	return
 
 @ Unused
-RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E
+RustboroCity_Movement_GruntEscapeExtended:
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -385,7 +385,7 @@ RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_GruntEscape: @ 81E0AA0
+RustboroCity_Movement_GruntEscape:
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -404,7 +404,7 @@ RustboroCity_Movement_GruntEscape: @ 81E0AA0
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1
+RustboroCity_Movement_EmployeeChaseGrunt1:
 	walk_right
 	walk_right
 	walk_right
@@ -414,7 +414,7 @@ RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1
 	walk_in_place_fastest_up
 	step_end
 
-RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9
+RustboroCity_Movement_EmployeeChaseGrunt2:
 	walk_up
 	walk_up
 	walk_up
@@ -425,14 +425,14 @@ RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachUp: @ 81E0AC1
+RustboroCity_Movement_EmployeeApproachUp:
 	walk_down
 	walk_right
 	walk_right
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5
+RustboroCity_Movement_EmployeeApproachLeft:
 	walk_down
 	walk_down
 	walk_right
@@ -440,7 +440,7 @@ RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA
+RustboroCity_Movement_EmployeeApproachRight:
 	walk_down
 	walk_down
 	walk_right
@@ -448,7 +448,7 @@ RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF
+RustboroCity_Movement_EmployeeApproachDown:
 	walk_down
 	walk_down
 	walk_down
@@ -457,7 +457,7 @@ RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5
+RustboroCity_Movement_EmployeeApproachPlayerFar:
 	walk_down
 	walk_down
 	walk_down
@@ -467,7 +467,7 @@ RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5
 	walk_in_place_fastest_down
 	step_end
 
-RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD
+RustboroCity_EventScript_DevonEmployee1::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee
@@ -475,37 +475,37 @@ RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD
 	release
 	end
 
-RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 81E0AF2
+RustboroCity_EventScript_ReturnGoodsSpokeToEmployee::
 	waitse
 	setvar VAR_TEMP_1, 4
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 81E0AFE
+RustboroCity_EventScript_HelpGetGoodsTrigger0::
 	lockall
 	setvar VAR_TEMP_1, 0
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 81E0B0A
+RustboroCity_EventScript_HelpGetGoodsTrigger1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 81E0B16
+RustboroCity_EventScript_HelpGetGoodsTrigger2::
 	lockall
 	setvar VAR_TEMP_1, 2
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 81E0B22
+RustboroCity_EventScript_HelpGetGoodsTrigger3::
 	lockall
 	setvar VAR_TEMP_1, 3
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E
+RustboroCity_EventScript_EmployeeAskToGetGoods::
 	compare VAR_TEMP_1, 0
 	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1
 	compare VAR_TEMP_1, 1
@@ -522,7 +522,7 @@ RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E
 	end
 
 @ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods
-RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
+RustboroCity_EventScript_EmployeeFacePlayerUp1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -534,7 +534,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
+RustboroCity_EventScript_EmployeeFacePlayerLeft1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -546,7 +546,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
+RustboroCity_EventScript_EmployeeFacePlayerDown1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -558,7 +558,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
+RustboroCity_EventScript_EmployeeApproachPlayerDown1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -572,35 +572,35 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
 	waitmovement 0
 	return
 
-RustboroCity_Movement_EmployeeApproachPlayerDown: @ 81E0C29
+RustboroCity_Movement_EmployeeApproachPlayerDown:
 	walk_down
 	step_end
 
-RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 81E0C2B
+RustboroCity_EventScript_ReturnGoodsTrigger0::
 	lockall
 	setvar VAR_TEMP_1, 0
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 81E0C37
+RustboroCity_EventScript_ReturnGoodsTrigger1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 81E0C43
+RustboroCity_EventScript_ReturnGoodsTrigger2::
 	lockall
 	setvar VAR_TEMP_1, 2
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 81E0C4F
+RustboroCity_EventScript_ReturnGoodsTrigger3::
 	lockall
 	setvar VAR_TEMP_1, 3
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
+RustboroCity_EventScript_ReturnGoods::
 	compare VAR_TEMP_1, 0
 	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2
 	compare VAR_TEMP_1, 1
@@ -626,11 +626,11 @@ RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
 	releaseall
 	end
 
-RustboroCity_EventScript_BagFull:: @ 81E0CD3
+RustboroCity_EventScript_BagFull::
 	msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
+RustboroCity_EventScript_EmployeeFacePlayerUp2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -642,7 +642,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
+RustboroCity_EventScript_EmployeeFacePlayerLeft2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
@@ -654,7 +654,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
+RustboroCity_EventScript_EmployeeFacePlayerDown2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -666,7 +666,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
+RustboroCity_EventScript_EmployeeApproachPlayerDown2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -680,7 +680,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96
+RustboroCity_EventScript_EmployeeFacePlayerRight::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -690,14 +690,14 @@ RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_Rival:: @ 81E0DB8
+RustboroCity_EventScript_Rival::
 	lockall
 	call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
+RustboroCity_EventScript_PlayRivalMusic::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq RustboroCity_EventScript_PlayMayMusic
@@ -705,15 +705,15 @@ RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
 	goto_if_eq RustboroCity_EventScript_PlayBrendanMusic
 	return
 
-RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9
+RustboroCity_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE
+RustboroCity_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
+RustboroCity_EventScript_RivalTrigger0::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -729,7 +729,7 @@ RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
+RustboroCity_EventScript_RivalTrigger1::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -745,7 +745,7 @@ RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
+RustboroCity_EventScript_RivalTrigger2::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -761,7 +761,7 @@ RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
+RustboroCity_EventScript_RivalTrigger3::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -777,7 +777,7 @@ RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
+RustboroCity_EventScript_RivalTrigger4::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -793,7 +793,7 @@ RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
+RustboroCity_EventScript_RivalTrigger5::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -809,7 +809,7 @@ RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
+RustboroCity_EventScript_RivalTrigger6::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -825,7 +825,7 @@ RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
+RustboroCity_EventScript_RivalTrigger7::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -841,7 +841,7 @@ RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3
+RustboroCity_EventScript_RivalEncounter::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq RustboroCity_EventScript_MayEncounter
@@ -849,7 +849,7 @@ RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3
 	goto_if_eq RustboroCity_EventScript_BrendanEncounter
 	end
 
-RustboroCity_EventScript_MayEncounter:: @ 81E100B
+RustboroCity_EventScript_MayEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_MayBrineyHint
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_MayAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
@@ -873,7 +873,7 @@ RustboroCity_EventScript_MayEncounter:: @ 81E100B
 	releaseall
 	end
 
-RustboroCity_EventScript_MayAskToBattle:: @ 81E1070
+RustboroCity_EventScript_MayAskToBattle::
 	setvar VAR_0x8008, 1
 	msgbox RustboroCity_Text_MayWantToBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -882,7 +882,7 @@ RustboroCity_EventScript_MayAskToBattle:: @ 81E1070
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleMay:: @ 81E1092
+RustboroCity_EventScript_BattleMay::
 	msgbox RustboroCity_Text_MayImNotGoingToLose, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_BattleMayTreecko
@@ -890,37 +890,37 @@ RustboroCity_EventScript_BattleMay:: @ 81E1092
 	case 2, RustboroCity_EventScript_BattleMayMudkip
 	end
 
-RustboroCity_EventScript_MayBrineyHint:: @ 81E10C1
+RustboroCity_EventScript_MayBrineyHint::
 	msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
+RustboroCity_EventScript_RestoreBgm::
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
+RustboroCity_EventScript_BattleMayTreecko::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
+RustboroCity_EventScript_BattleMayTorchic::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
+RustboroCity_EventScript_BattleMayMudkip::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
+RustboroCity_EventScript_BrendanEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanBrineyHint
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
@@ -943,7 +943,7 @@ RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
 	releaseall
 	end
 
-RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174
+RustboroCity_EventScript_BrendanAskToBattle::
 	msgbox RustboroCity_Text_BrendanWantToBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq RustboroCity_EventScript_BattleBrendan
@@ -951,7 +951,7 @@ RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleBrendan:: @ 81E1191
+RustboroCity_EventScript_BattleBrendan::
 	msgbox RustboroCity_Text_BrendanIWontGoEasy, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_BattleBrendanTreecko
@@ -959,32 +959,32 @@ RustboroCity_EventScript_BattleBrendan:: @ 81E1191
 	case 2, RustboroCity_EventScript_BattleBrendanMudkip
 	end
 
-RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
+RustboroCity_EventScript_BrendanBrineyHint::
 	msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
+RustboroCity_EventScript_BattleBrendanTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
+RustboroCity_EventScript_BattleBrendanTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
+RustboroCity_EventScript_BattleBrendanMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E
+RustboroCity_Movement_RivalApproachPlayer0:
 	walk_down
 	walk_left
 	walk_left
@@ -993,7 +993,7 @@ RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215
+RustboroCity_Movement_RivalApproachPlayer1:
 	walk_down
 	walk_left
 	walk_left
@@ -1001,38 +1001,38 @@ RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer2: @ 81E121B
+RustboroCity_Movement_RivalApproachPlayer2:
 	walk_down
 	walk_left
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer3: @ 81E1220
+RustboroCity_Movement_RivalApproachPlayer3:
 	walk_down
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer4: @ 81E1224
+RustboroCity_Movement_RivalApproachPlayer4:
 	walk_down
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer5: @ 81E1227
+RustboroCity_Movement_RivalApproachPlayer5:
 	walk_down
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer6: @ 81E122B
+RustboroCity_Movement_RivalApproachPlayer6:
 	walk_down
 	walk_right
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230
+RustboroCity_Movement_RivalApproachPlayer7:
 	walk_down
 	walk_right
 	walk_right
@@ -1040,53 +1040,53 @@ RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230
 	walk_down
 	step_end
 
-RustboroCity_EventScript_Boy1:: @ 81E1236
+RustboroCity_EventScript_Boy1::
 	msgbox RustboroCity_Text_YouCanHave2On2Battle, MSGBOX_NPC
 	end
 
-RustboroCity_Text_WeShortenItToDevon: @ 81E123F
+RustboroCity_Text_WeShortenItToDevon:
 	.string "The DEVON CORPORATION…\n"
 	.string "We all just shorten it to DEVON.\p"
 	.string "That company makes all sorts of\n"
 	.string "convenient products.$"
 
-RustboroCity_Text_SneakyLookingManWentAroundCorner: @ 81E12AC
+RustboroCity_Text_SneakyLookingManWentAroundCorner:
 	.string "Hm? A sneaky-looking man?\p"
 	.string "Come to think of it, yes, a shady-\n"
 	.string "looking guy went around the corner.$"
 
-RustboroCity_Text_HaveYouChallengedGym: @ 81E130D
+RustboroCity_Text_HaveYouChallengedGym:
 	.string "Have you taken the POKéMON GYM\n"
 	.string "challenge?\p"
 	.string "When you get that shiny GYM BADGE\n"
 	.string "in hand, I guess TRAINERS begin to\l"
 	.string "realize what is required of them.$"
 
-RustboroCity_Text_HeyThatsRustborosGymBadge: @ 81E139E
+RustboroCity_Text_HeyThatsRustborosGymBadge:
 	.string "Hey, that's RUSTBORO's GYM BADGE!\p"
 	.string "Out of all the POKéMON GYM BADGES,\n"
 	.string "RUSTBORO's is the coolest, I'd say.$"
 
-RustboroCity_Text_YoureNewAroundHere: @ 81E1407
+RustboroCity_Text_YoureNewAroundHere:
 	.string "Oh? Who might you be?\n"
 	.string "You're a new face around these parts.\p"
 	.string "Have you just transferred into the\n"
 	.string "POKéMON TRAINER'S SCHOOL?$"
 
-RustboroCity_Text_GymLeaderIsntEasyWithFire: @ 81E1480
+RustboroCity_Text_GymLeaderIsntEasyWithFire:
 	.string "I challenged the GYM LEADER, but…\p"
 	.string "It's not going to be easy winning with\n"
 	.string "my FIRE-type POKéMON…\p"
 	.string "FIRE-type POKéMON don't match up\n"
 	.string "well against ROCK-type POKéMON…$"
 
-RustboroCity_Text_MrBrineyWalksInTheTunnel: @ 81E1520
+RustboroCity_Text_MrBrineyWalksInTheTunnel:
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He goes for walks in the tunnel every\n"
 	.string "so often.$"
 
-RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589
+RustboroCity_Text_MrBrineyLovesPeeko:
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He said he was going shopping in\n"
@@ -1094,40 +1094,40 @@ RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589
 	.string "That old sea dog, he must really love\n"
 	.string "that PEEKO.$"
 
-RustboroCity_Text_WowYouHavePokemon: @ 81E1633
+RustboroCity_Text_WowYouHavePokemon:
 	.string "Wow, you have POKéMON with you, too.\p"
 	.string "When I get bigger, I'm going to go\n"
 	.string "places with POKéMON, too.$"
 
-RustboroCity_Text_CatchRarePokemonIfIGoToSchool: @ 81E1695
+RustboroCity_Text_CatchRarePokemonIfIGoToSchool:
 	.string "POKéMON TRAINER'S SCHOOL!\p"
 	.string "If I go to this school, will I be able\n"
 	.string "to catch rare POKéMON easily?$"
 
-RustboroCity_Text_PokemonCanChangeLookFromExp: @ 81E16F4
+RustboroCity_Text_PokemonCanChangeLookFromExp:
 	.string "If a POKéMON gains experience in\n"
 	.string "battles, it can sometimes change in\l"
 	.string "the way it looks.$"
 
-RustboroCity_Text_PokemonChangeShape: @ 81E174B
+RustboroCity_Text_PokemonChangeShape:
 	.string "A POKéMON changes shape?\n"
 	.string "If one did that, I would be shocked!$"
 
-RustboroCity_Text_TradePokemonGrowFast: @ 81E1789
+RustboroCity_Text_TradePokemonGrowFast:
 	.string "A POKéMON you get in a trade from\n"
 	.string "someone grows fast.\p"
 	.string "But if you don't have certain GYM\n"
 	.string "BADGES, it may not obey you…$"
 
-RustboroCity_Text_OutOfTheWay: @ 81E17FE
+RustboroCity_Text_OutOfTheWay:
 	.string "Get out!\n"
 	.string "Out of the way!$"
 
-RustboroCity_Text_WaitDontTakeMyGoods: @ 81E1817
+RustboroCity_Text_WaitDontTakeMyGoods:
 	.string "Wait! Pleeeaaase!\p"
 	.string "Don't take my GOODS!$"
 
-RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E
+RustboroCity_Text_HelpMeIWasRobbed:
 	.string "Oh, it's you!\p"
 	.string "You're that fantastic TRAINER who\n"
 	.string "helped me in PETALBURG WOODS!\p"
@@ -1136,11 +1136,11 @@ RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E
 	.string "If I don't…\n"
 	.string "I'm going to be in serious trouble.$"
 
-RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel: @ 81E1904
+RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel:
 	.string "That shady character, I think he took\n"
 	.string "off towards the tunnel over there.$"
 
-RustboroCity_Text_YouGotItThankYou: @ 81E194D
+RustboroCity_Text_YouGotItThankYou:
 	.string "Oh! How did it go?\n"
 	.string "The DEVON GOODS?\p"
 	.string "You did!\n"
@@ -1149,15 +1149,15 @@ RustboroCity_Text_YouGotItThankYou: @ 81E194D
 	.string "I know! As my thanks, I'll give you\n"
 	.string "another GREAT BALL!$"
 
-RustboroCity_Text_YoureLoadedWithItems: @ 81E19E5
+RustboroCity_Text_YoureLoadedWithItems:
 	.string "You're loaded with items.\n"
 	.string "I can't give you this GREAT BALL.$"
 
-RustboroCity_Text_PleaseComeWithMe: @ 81E1A21
+RustboroCity_Text_PleaseComeWithMe:
 	.string "Excuse me, please!\n"
 	.string "Please come with me!$"
 
-RustboroCity_Text_MayHiLetsRegister: @ 81E1A49
+RustboroCity_Text_MayHiLetsRegister:
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV!\p"
@@ -1165,11 +1165,11 @@ RustboroCity_Text_MayHiLetsRegister: @ 81E1A49
 	.string "contact one another anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_RegisteredMay: @ 81E1ADB
+RustboroCity_Text_RegisteredMay:
 	.string "Registered MAY\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA
+RustboroCity_Text_MayPassedBrineyWantToBattle:
 	.string "MAY: Oh, by the way, I passed\n"
 	.string "MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I guess he's on his way home to his\n"
@@ -1179,32 +1179,32 @@ RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA
 	.string "So…\n"
 	.string "How about a little battle?$"
 
-RustboroCity_Text_MayOhHaventRaisedPokemonEnough: @ 81E1BD3
+RustboroCity_Text_MayOhHaventRaisedPokemonEnough:
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-RustboroCity_Text_MayWantToBattle: @ 81E1C48
+RustboroCity_Text_MayWantToBattle:
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-RustboroCity_Text_MayImNotGoingToLose: @ 81E1C84
+RustboroCity_Text_MayImNotGoingToLose:
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-RustboroCity_Text_MayDefeat: @ 81E1CC1
+RustboroCity_Text_MayDefeat:
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-RustboroCity_Text_MayMrBrineyHint: @ 81E1CE7
+RustboroCity_Text_MayMrBrineyHint:
 	.string "MAY: Oh, by the way, MR. BRINEY, who\n"
 	.string "I just passed…\p"
 	.string "{PLAYER}{KUN}, you just moved here so you\n"
 	.string "might not know this, but MR. BRINEY\l"
 	.string "was once a revered seafarer.$"
 
-RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D
+RustboroCity_Text_BrendanHiLetsRegister:
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV! Cool!\p"
@@ -1212,11 +1212,11 @@ RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D
 	.string "get in touch anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_RegisteredBrendan: @ 81E1E11
+RustboroCity_Text_RegisteredBrendan:
 	.string "Registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34
+RustboroCity_Text_BrendanPassedBrineyWantToBattle:
 	.string "BRENDAN: By the way, {PLAYER}, I walked\n"
 	.string "by MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I bet he was on his way home to his\n"
@@ -1227,72 +1227,72 @@ RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34
 	.string "Want to have a battle to test how\n"
 	.string "far you've progressed?$"
 
-RustboroCity_Text_BrendanNoConfidenceInPokemon: @ 81E1F2F
+RustboroCity_Text_BrendanNoConfidenceInPokemon:
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-RustboroCity_Text_BrendanWantToBattle: @ 81E1F76
+RustboroCity_Text_BrendanWantToBattle:
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-RustboroCity_Text_BrendanIWontGoEasy: @ 81E1FA9
+RustboroCity_Text_BrendanIWontGoEasy:
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-RustboroCity_Text_BrendanDefeat: @ 81E1FE9
+RustboroCity_Text_BrendanDefeat:
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-RustboroCity_Text_BrendanMrBrineyHint: @ 81E2002
+RustboroCity_Text_BrendanMrBrineyHint:
 	.string "BRENDAN: By the way, you know\n"
 	.string "MR. BRINEY? The guy I just passed?\p"
 	.string "I bet you didn't know this, since you\n"
 	.string "just moved here, {PLAYER}, but\l"
 	.string "MR. BRINEY was once a great sailor.$"
 
-RustboroCity_Text_TunnelNearingCompletion: @ 81E20A6
+RustboroCity_Text_TunnelNearingCompletion:
 	.string "“Timesaving tunnel nearing\n"
 	.string "completion!”\p"
 	.string "…Is what it says on the sign, but\n"
 	.string "there's also a big “X” splashed\l"
 	.string "across it in red paint…$"
 
-RustboroCity_Text_DevonCorpSign: @ 81E2128
+RustboroCity_Text_DevonCorpSign:
 	.string "DEVON CORPORATION\p"
 	.string "“For all your living needs, we make\n"
 	.string "it all.”$"
 
-RustboroCity_Text_GymSign: @ 81E2167
+RustboroCity_Text_GymSign:
 	.string "RUSTBORO CITY POKéMON GYM\n"
 	.string "LEADER: ROXANNE\p"
 	.string "“The ROCK-loving honors student!”$"
 
-RustboroCity_Text_DevonCorpBranchOfficeSign: @ 81E21B3
+RustboroCity_Text_DevonCorpBranchOfficeSign:
 	.string "DEVON CORP. BRANCH OFFICE\p"
 	.string "“Access limited to DEVON employees\n"
 	.string "and authorized personnel.”$"
 
-RustboroCity_Text_CitySign: @ 81E220B
+RustboroCity_Text_CitySign:
 	.string "RUSTBORO CITY\p"
 	.string "“The city probing the integration of\n"
 	.string "nature and science.”$"
 
-RustboroCity_Text_TrainersSchoolSign: @ 81E2253
+RustboroCity_Text_TrainersSchoolSign:
 	.string "POKéMON TRAINER'S SCHOOL\p"
 	.string "“We'll teach you anything about\n"
 	.string "POKéMON!”$"
 
-RustboroCity_Text_CuttersHouse: @ 81E2296
+RustboroCity_Text_CuttersHouse:
 	.string "CUTTER'S HOUSE$"
 
-RustboroCity_Text_DevelopedNewPokenavFeature: @ 81E22A5
+RustboroCity_Text_DevelopedNewPokenavFeature:
 	.string "I've been developing an added feature\n"
 	.string "for the POKéNAV…\p"
 	.string "And it turned out great!\p"
 	.string "{PLAYER}, may I see that POKéNAV?\n"
 	.string "The one our PRESIDENT gave you?$"
 
-RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331
+RustboroCity_Text_AddedMatchCallPleaseCallMrStone:
 	.string "There you go, {PLAYER}!\p"
 	.string "I added a new feature named\n"
 	.string "MATCH CALL to your POKéNAV.\p"
@@ -1304,14 +1304,14 @@ RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331
 	.string "Test it out.\n"
 	.string "Please give our PRESIDENT a call.$"
 
-RustboroCity_Text_PleaseSelectPokenav: @ 81E2449
+RustboroCity_Text_PleaseSelectPokenav:
 	.string "Please select the POKéNAV.$"
 
-RustboroCity_Text_IdBetterGetBackToWork: @ 81E2464
+RustboroCity_Text_IdBetterGetBackToWork:
 	.string "Okay, I'd better get back to work.\n"
 	.string "Please take care, {PLAYER}!$"
 
-RustboroCity_Text_YouCanHave2On2Battle: @ 81E249D
+RustboroCity_Text_YouCanHave2On2Battle:
 	.string "Did you know this?\p"
 	.string "You can have a 2-on-2 battle even\n"
 	.string "if you're not with another TRAINER.\p"