Merge pull request #133 from YamaArashi/master

Remove address comments

1 files changed, 49 insertions, 49 deletions

diff --git a/scripts/route21.asm b/scripts/route21.asm
index 821cea39..89874e58 100755
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@@ -1,4 +1,4 @@
-Route21Script: ; 55eeb (15:5eeb)
+Route21Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route21TrainerHeaders
 	ld de, Route21ScriptPointers
@@ -7,12 +7,12 @@ Route21Script: ; 55eeb (15:5eeb)
 	ld [wRoute21CurScript], a
 	ret
 
-Route21ScriptPointers: ; 55efe (15:5efe)
+Route21ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route21TextPointers: ; 55f04 (15:5f04)
+Route21TextPointers:
 	dw Route21Text1
 	dw Route21Text2
 	dw Route21Text3
@@ -23,8 +23,8 @@ Route21TextPointers: ; 55f04 (15:5f04)
 	dw Route21Text8
 	dw Route21Text9
 
-Route21TrainerHeaders: ; 55f16 (15:5f16)
-Route21TrainerHeader0: ; 55f16 (15:5f16)
+Route21TrainerHeaders:
+Route21TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0
@@ -33,7 +33,7 @@ Route21TrainerHeader0: ; 55f16 (15:5f16)
 	dw Route21EndBattleText1 ; TextEndBattle
 	dw Route21EndBattleText1 ; TextEndBattle
 
-Route21TrainerHeader1: ; 55f22 (15:5f22)
+Route21TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1
@@ -42,7 +42,7 @@ Route21TrainerHeader1: ; 55f22 (15:5f22)
 	dw Route21EndBattleText2 ; TextEndBattle
 	dw Route21EndBattleText2 ; TextEndBattle
 
-Route21TrainerHeader2: ; 55f2e (15:5f2e)
+Route21TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2
@@ -51,7 +51,7 @@ Route21TrainerHeader2: ; 55f2e (15:5f2e)
 	dw Route21EndBattleText3 ; TextEndBattle
 	dw Route21EndBattleText3 ; TextEndBattle
 
-Route21TrainerHeader3: ; 55f3a (15:5f3a)
+Route21TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3
@@ -60,7 +60,7 @@ Route21TrainerHeader3: ; 55f3a (15:5f3a)
 	dw Route21EndBattleText4 ; TextEndBattle
 	dw Route21EndBattleText4 ; TextEndBattle
 
-Route21TrainerHeader4: ; 55f46 (15:5f46)
+Route21TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4
@@ -69,7 +69,7 @@ Route21TrainerHeader4: ; 55f46 (15:5f46)
 	dw Route21EndBattleText5 ; TextEndBattle
 	dw Route21EndBattleText5 ; TextEndBattle
 
-Route21TrainerHeader5: ; 55f52 (15:5f52)
+Route21TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5
@@ -78,7 +78,7 @@ Route21TrainerHeader5: ; 55f52 (15:5f52)
 	dw Route21EndBattleText6 ; TextEndBattle
 	dw Route21EndBattleText6 ; TextEndBattle
 
-Route21TrainerHeader6: ; 55f5e (15:5f5e)
+Route21TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6
@@ -87,7 +87,7 @@ Route21TrainerHeader6: ; 55f5e (15:5f5e)
 	dw Route21EndBattleText7 ; TextEndBattle
 	dw Route21EndBattleText7 ; TextEndBattle
 
-Route21TrainerHeader7: ; 55f6a (15:5f6a)
+Route21TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1
@@ -96,7 +96,7 @@ Route21TrainerHeader7: ; 55f6a (15:5f6a)
 	dw Route21EndBattleText8 ; TextEndBattle
 	dw Route21EndBattleText8 ; TextEndBattle
 
-Route21TrainerHeader8: ; 55f76 (15:5f76)
+Route21TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1
@@ -107,164 +107,164 @@ Route21TrainerHeader8: ; 55f76 (15:5f76)
 
 	db $ff
 
-Route21Text1: ; 55f83 (15:5f83)
+Route21Text1:
 	TX_ASM
 	ld hl, Route21TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text2: ; 55f8d (15:5f8d)
+Route21Text2:
 	TX_ASM
 	ld hl, Route21TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text3: ; 55f97 (15:5f97)
+Route21Text3:
 	TX_ASM
 	ld hl, Route21TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text4: ; 55fa1 (15:5fa1)
+Route21Text4:
 	TX_ASM
 	ld hl, Route21TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text5: ; 55fab (15:5fab)
+Route21Text5:
 	TX_ASM
 	ld hl, Route21TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text6: ; 55fb5 (15:5fb5)
+Route21Text6:
 	TX_ASM
 	ld hl, Route21TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text7: ; 55fbf (15:5fbf)
+Route21Text7:
 	TX_ASM
 	ld hl, Route21TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text8: ; 55fc9 (15:5fc9)
+Route21Text8:
 	TX_ASM
 	ld hl, Route21TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text9: ; 55fd3 (15:5fd3)
+Route21Text9:
 	TX_ASM
 	ld hl, Route21TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21BattleText1: ; 55fdd (15:5fdd)
+Route21BattleText1:
 	TX_FAR _Route21BattleText1
 	db "@"
 
-Route21EndBattleText1: ; 55fe2 (15:5fe2)
+Route21EndBattleText1:
 	TX_FAR _Route21EndBattleText1
 	db "@"
 
-Route21AfterBattleText1: ; 55fe7 (15:5fe7)
+Route21AfterBattleText1:
 	TX_FAR _Route21AfterBattleText1
 	db "@"
 
-Route21BattleText2: ; 55fec (15:5fec)
+Route21BattleText2:
 	TX_FAR _Route21BattleText2
 	db "@"
 
-Route21EndBattleText2: ; 55ff1 (15:5ff1)
+Route21EndBattleText2:
 	TX_FAR _Route21EndBattleText2
 	db "@"
 
-Route21AfterBattleText2: ; 55ff6 (15:5ff6)
+Route21AfterBattleText2:
 	TX_FAR _Route21AfterBattleText2
 	db "@"
 
-Route21BattleText3: ; 55ffb (15:5ffb)
+Route21BattleText3:
 	TX_FAR _Route21BattleText3
 	db "@"
 
-Route21EndBattleText3: ; 56000 (15:6000)
+Route21EndBattleText3:
 	TX_FAR _Route21EndBattleText3
 	db "@"
 
-Route21AfterBattleText3: ; 56005 (15:6005)
+Route21AfterBattleText3:
 	TX_FAR _Route21AfterBattleText3
 	db "@"
 
-Route21BattleText4: ; 5600a (15:600a)
+Route21BattleText4:
 	TX_FAR _Route21BattleText4
 	db "@"
 
-Route21EndBattleText4: ; 5600f (15:600f)
+Route21EndBattleText4:
 	TX_FAR _Route21EndBattleText4
 	db "@"
 
-Route21AfterBattleText4: ; 56014 (15:6014)
+Route21AfterBattleText4:
 	TX_FAR _Route21AfterBattleText4
 	db "@"
 
-Route21BattleText5: ; 56019 (15:6019)
+Route21BattleText5:
 	TX_FAR _Route21BattleText5
 	db "@"
 
-Route21EndBattleText5: ; 5601e (15:601e)
+Route21EndBattleText5:
 	TX_FAR _Route21EndBattleText5
 	db "@"
 
-Route21AfterBattleText5: ; 56023 (15:6023)
+Route21AfterBattleText5:
 	TX_FAR _Route21AfterBattleText5
 	db "@"
 
-Route21BattleText6: ; 56028 (15:6028)
+Route21BattleText6:
 	TX_FAR _Route21BattleText6
 	db "@"
 
-Route21EndBattleText6: ; 5602d (15:602d)
+Route21EndBattleText6:
 	TX_FAR _Route21EndBattleText6
 	db "@"
 
-Route21AfterBattleText6: ; 56032 (15:6032)
+Route21AfterBattleText6:
 	TX_FAR _Route21AfterBattleText6
 	db "@"
 
-Route21BattleText7: ; 56037 (15:6037)
+Route21BattleText7:
 	TX_FAR _Route21BattleText7
 	db "@"
 
-Route21EndBattleText7: ; 5603c (15:603c)
+Route21EndBattleText7:
 	TX_FAR _Route21EndBattleText7
 	db "@"
 
-Route21AfterBattleText7: ; 56041 (15:6041)
+Route21AfterBattleText7:
 	TX_FAR _Route21AfterBattleText7
 	db "@"
 
-Route21BattleText8: ; 56046 (15:6046)
+Route21BattleText8:
 	TX_FAR _Route21BattleText8
 	db "@"
 
-Route21EndBattleText8: ; 5604b (15:604b)
+Route21EndBattleText8:
 	TX_FAR _Route21EndBattleText8
 	db "@"
 
-Route21AfterBattleText8: ; 56050 (15:6050)
+Route21AfterBattleText8:
 	TX_FAR _Route21AfterBattleText8
 	db "@"
 
-Route21BattleText9: ; 56055 (15:6055)
+Route21BattleText9:
 	TX_FAR _Route21BattleText9
 	db "@"
 
-Route21EndBattleText9: ; 5605a (15:605a)
+Route21EndBattleText9:
 	TX_FAR _Route21EndBattleText9
 	db "@"
 
-Route21AfterBattleText9: ; 5605f (15:605f)
+Route21AfterBattleText9:
 	TX_FAR _Route21AfterBattleText9
 	db "@"