Remove address comments

2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
@@ -16,12 +16,12 @@

@@ Map scripts

-TrainerTower_OnResume:: @ 81C4F54
+TrainerTower_OnResume::
 	setvar VAR_TEMP_2, 0
 	ttower_resumetimer
 	end

-TrainerTower_OnTransition:: @ 81C4F62
+TrainerTower_OnTransition::
 	ttower_initfloor
 	switch VAR_RESULT
 	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles
@@ -35,7 +35,7 @@ TrainerTower_OnTransition:: @ 81C4F62
 	setvar DISABLE_DOUBLES_TRIGGER, TRUE
 	end

-TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7
+TrainerTower_EventScript_SetObjectsSingles::
 	setflag HIDE_TRAINER_DOUBLES1
 	setflag HIDE_TRAINER_KNOCKOUT
 	setflag HIDE_TRAINER_DOUBLES2
@@ -44,7 +44,7 @@ TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7
 	setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
 	goto TrainerTower_EventScript_HideOwner

-TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5
+TrainerTower_EventScript_SetObjectsDoubles::
 	setflag HIDE_TRAINER_SINGLES
 	setflag HIDE_TRAINER_KNOCKOUT
 	setvar DISABLE_SINGLES_TRIGGER, TRUE
@@ -57,7 +57,7 @@ TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5
 	setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT
 	goto TrainerTower_EventScript_HideOwner

-TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE
+TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten::
 	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 12
 	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
 	setobjectxyperm       LOCALID_TRAINER_DOUBLES2, 11, 12
@@ -65,7 +65,7 @@ TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE
 	goto TrainerTower_EventScript_HideOwner

@ Knockout challenge re-uses trainer objects
-TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019
+TrainerTower_EventScript_SetObjectsKnockout::
 	setflag HIDE_TRAINER_DOUBLES2
 	setvar DISABLE_DOUBLES_TRIGGER, TRUE
 	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 10
@@ -78,11 +78,11 @@ TrainerTower_EventScript_HideOwner:
 	setflag HIDE_OWNER
 	end

-TrainerTower_OnFrame:: @ 81C5046
+TrainerTower_OnFrame::
 	map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor
 	.2byte 0

-TrainerTower_EventScript_EnterFloor:: @ 81C5050
+TrainerTower_EventScript_EnterFloor::
 	setvar VAR_TEMP_2, 1
 	ttower_isfloorcleared
 	compare VAR_RESULT, FALSE
@@ -96,7 +96,7 @@ TrainerTower_EventScript_EndEnterFloor:
 	end

@ Never reached
-TrainerTower_EventScript_WarpToLobby:: @ 81C5086
+TrainerTower_EventScript_WarpToLobby::
 	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
 	waitstate

@@ -124,7 +124,7 @@ TrainerTower_EventScript_DoSingleBattle:
 	closemessage
 	goto TrainerTower_EventScript_DoBattle

-TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D
+TrainerTower_EventScript_DoDoubleBattle::
 	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3
 	msgbox gStringVar4
 	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
@@ -140,7 +140,7 @@ TrainerTower_EventScript_DoSecondTrainerIntro:
 	closemessage
 	goto TrainerTower_EventScript_DoBattle

-TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C
+TrainerTower_EventScript_DoKnockoutBattle::
 	switch VAR_TEMP_1
 	case 0, TrainerTower_EventScript_DoKnockoutBattle1
 	case 1, TrainerTower_EventScript_DoKnockoutBattle2
@@ -156,7 +156,7 @@ TrainerTower_EventScript_DoKnockoutBattle1:
 	waitmovement 0
 	goto TrainerTower_EventScript_DoKnockoutBattleIntro

-TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD
+TrainerTower_EventScript_DoKnockoutBattle2::
 	ttower_encountermusic
 	applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
 	waitmovement 0
@@ -166,7 +166,7 @@ TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD
 	waitmovement 0
 	goto TrainerTower_EventScript_DoKnockoutBattleIntro

-TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8
+TrainerTower_EventScript_DoKnockoutBattle3::
 	ttower_encountermusic
 	applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
 	waitmovement 0
@@ -202,23 +202,23 @@ TrainerTower_EventScript_DoSecondKnockoutBattle:
 	addvar VAR_TEMP_1, 1
 	goto TrainerTower_EventScript_DoKnockoutBattle

-TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0
+TrainerTower_EventScript_DoThirdKnockoutBattle::
 	addvar VAR_TEMP_1, 1
 	goto TrainerTower_EventScript_DoKnockoutBattle

-TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA
+TrainerTower_EventScript_MoveDoublesTrainers::
 	applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay
 	waitmovement 0
 	applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown
 	goto TrainerTower_EventScript_SetFloorCleared

-TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0
+TrainerTower_EventScript_MoveLastKnockoutTrainer::
 	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay
 TrainerTower_EventScript_SetFloorCleared:
 	ttower_clearedfloor
 	end

-TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0
+TrainerTower_EventScript_WarpToLobbyLost::
 	special HealPlayerParty
 	ttower_setlost
 	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
@@ -227,7 +227,7 @@ TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0

@@ Speaking to trainers after battle

-TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4
+TrainerTower_EventScript_SpeakToDoublesTrainer1::
 	ttower_getchallengetype
 	switch VAR_RESULT
 	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle
@@ -237,11 +237,11 @@ TrainerTower_EventScript_DoublesTrainer1PostBattle:
 	setvar VAR_0x8006, 0
 	goto TrainerTower_EventScript_DoPostBattleText

-TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331
+TrainerTower_EventScript_KnockoutTrainer2PostBattle::
 	setvar VAR_0x8006, 1
 	goto TrainerTower_EventScript_DoPostBattleText

-TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B
+TrainerTower_EventScript_SpeakToSinglesTrainer::
 	ttower_getchallengetype
 	switch VAR_RESULT
 	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle
@@ -251,15 +251,15 @@ TrainerTower_EventScript_SinglesTrainerPostBattle:
 	setvar VAR_0x8006, 0
 	goto TrainerTower_EventScript_DoPostBattleText

-TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378
+TrainerTower_EventScript_KnockoutTrainer3PostBattle::
 	setvar VAR_0x8006, 2
 	goto TrainerTower_EventScript_DoPostBattleText

-TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382
+TrainerTower_EventScript_SpeakToKnockoutTrainer::
 	setvar VAR_0x8006, 0
 	goto TrainerTower_EventScript_DoPostBattleText

-TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C
+TrainerTower_EventScript_SpeakToDoublesTrainer2::
 	setvar VAR_0x8006, 1
 TrainerTower_EventScript_DoPostBattleText:
 	ttower_getspeech TRAINER_TOWER_TEXT_AFTER
@@ -272,7 +272,7 @@ TrainerTower_EventScript_DoPostBattleText:

@@ Speaking to owner

-TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA
+TrainerTower_EventScript_SpeakToOwner::
 	lock
 	faceplayer
 	ttower_getownerstate
@@ -302,12 +302,12 @@ TrainerTower_Roof_EventScript_ReceivePrize:
 	call EventScript_RestorePrevTextColor
 	goto TrainerTower_Roof_EventScript_CheckFinalTime

-TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A
+TrainerTower_Roof_EventScript_NoRoomForPrize::
 	msgbox TrainerTower_Roof_Text_ThisIsForYou
 	msgbox Text_BagIsFull
 	goto TrainerTower_Roof_EventScript_CheckFinalTime

-TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F
+TrainerTower_Roof_EventScript_CheckFinalTime::
 	ttower_checkfinaltime
 	switch VAR_RESULT
 	case 0, TrainerTower_Roof_EventScript_NewRecord
@@ -318,14 +318,14 @@ TrainerTower_Roof_EventScript_NewRecord:
 	msgbox TrainerTower_Roof_Text_DoneItInRecordTime
 	goto TrainerTower_Roof_EventScript_OwnerEnd

-TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A
+TrainerTower_Roof_EventScript_NoNewRecord::
 	msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere
 TrainerTower_Roof_EventScript_OwnerEnd:
 	msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime
 	release
 	return

-TrainerTower_EventScript_ShowTime:: @ 81C549C
+TrainerTower_EventScript_ShowTime::
 	lockall
 	ttower_gettime
 	msgbox TrainerTower_Text_XMinYZSec
@@ -335,10 +335,10 @@ TrainerTower_EventScript_ShowTime:: @ 81C549C

@@ Battle triggers

-TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF
+TrainerTower_EventScript_SingleBattleTrigger::
 	goto TrainerTower_EventScript_TriggerBattle

-TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4
+TrainerTower_EventScript_DoubleBattleTriggerTop::
 	setvar VAR_TEMP_3, 0
 	ttower_checkdoubles
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
@@ -349,7 +349,7 @@ TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4
 	applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
 	goto TrainerTower_EventScript_TriggerDoubleBattle

-TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA
+TrainerTower_EventScript_DoubleBattleTriggerBottom::
 	setvar VAR_TEMP_3, 1
 	ttower_checkdoubles
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
@@ -363,7 +363,7 @@ TrainerTower_EventScript_TriggerDoubleBattle:
 	setvar DISABLE_DOUBLES_TRIGGER, TRUE
 	goto TrainerTower_EventScript_TriggerBattle

-TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528
+TrainerTower_EventScript_IneligibleForDoubleBattle::
 	lockall
 	playse SE_DING_DONG
 	msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble
@@ -375,30 +375,30 @@ TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528

 TrainerTower_Movement_SingleTrainerApproach:
 	walk_left
-TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542
+TrainerTower_Movement_RightKnockoutTrainerApproach::
 	walk_left
 	walk_left
 TrainerTower_Movement_PushPlayerBack:
 	walk_left
 	step_end

-TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546
+TrainerTower_Movement_BottomKnockoutTrainerApproach::
 	walk_up
 	walk_up
 	step_end

-TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549
+TrainerTower_Movement_TopKnockoutTrainerApproach::
 	walk_down
 	walk_down
 	step_end

-TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C
+TrainerTower_Movement_DoublesTrainer2OutOfWay::
 	walk_right
 TrainerTower_Movement_LastKnockoutTrainerOutOfWay:
 	walk_up
 	face_down
 	step_end

-TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550
+TrainerTower_Movement_DoublesTrainer1FaceDown::
 	face_down
 	step_end