Merge pull request #133 from YamaArashi/master

Remove address comments

1 files changed, 60 insertions, 60 deletions

diff --git a/scripts/route17.asm b/scripts/route17.asm
index f2a021a7..ddf92c2d 100755
--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@@ -1,4 +1,4 @@
-Route17Script: ; 55b7a (15:5b7a)
+Route17Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route17TrainerHeaders
 	ld de, Route17ScriptPointers
@@ -7,12 +7,12 @@ Route17Script: ; 55b7a (15:5b7a)
 	ld [wRoute17CurScript], a
 	ret
 
-Route17ScriptPointers: ; 55b8d (15:5b8d)
+Route17ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route17TextPointers: ; 55b93 (15:5b93)
+Route17TextPointers:
 	dw Route17Text1
 	dw Route17Text2
 	dw Route17Text3
@@ -30,8 +30,8 @@ Route17TextPointers: ; 55b93 (15:5b93)
 	dw Route17Text15
 	dw Route17Text16
 
-Route17TrainerHeaders: ; 55bb3 (15:5bb3)
-Route17TrainerHeader0: ; 55bb3 (15:5bb3)
+Route17TrainerHeaders:
+Route17TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0
@@ -40,7 +40,7 @@ Route17TrainerHeader0: ; 55bb3 (15:5bb3)
 	dw Route17EndBattleText1 ; TextEndBattle
 	dw Route17EndBattleText1 ; TextEndBattle
 
-Route17TrainerHeader1: ; 55bbf (15:5bbf)
+Route17TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1
@@ -49,7 +49,7 @@ Route17TrainerHeader1: ; 55bbf (15:5bbf)
 	dw Route17EndBattleText2 ; TextEndBattle
 	dw Route17EndBattleText2 ; TextEndBattle
 
-Route17TrainerHeader2: ; 55bcb (15:5bcb)
+Route17TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2
@@ -58,7 +58,7 @@ Route17TrainerHeader2: ; 55bcb (15:5bcb)
 	dw Route17EndBattleText3 ; TextEndBattle
 	dw Route17EndBattleText3 ; TextEndBattle
 
-Route17TrainerHeader3: ; 55bd7 (15:5bd7)
+Route17TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3
@@ -67,7 +67,7 @@ Route17TrainerHeader3: ; 55bd7 (15:5bd7)
 	dw Route17EndBattleText4 ; TextEndBattle
 	dw Route17EndBattleText4 ; TextEndBattle
 
-Route17TrainerHeader4: ; 55be3 (15:5be3)
+Route17TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4
@@ -76,7 +76,7 @@ Route17TrainerHeader4: ; 55be3 (15:5be3)
 	dw Route17EndBattleText5 ; TextEndBattle
 	dw Route17EndBattleText5 ; TextEndBattle
 
-Route17TrainerHeader5: ; 55bef (15:5bef)
+Route17TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5
@@ -85,7 +85,7 @@ Route17TrainerHeader5: ; 55bef (15:5bef)
 	dw Route17EndBattleText6 ; TextEndBattle
 	dw Route17EndBattleText6 ; TextEndBattle
 
-Route17TrainerHeader6: ; 55bfb (15:5bfb)
+Route17TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6
@@ -94,7 +94,7 @@ Route17TrainerHeader6: ; 55bfb (15:5bfb)
 	dw Route17EndBattleText7 ; TextEndBattle
 	dw Route17EndBattleText7 ; TextEndBattle
 
-Route17TrainerHeader7: ; 55c07 (15:5c07)
+Route17TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1
@@ -103,7 +103,7 @@ Route17TrainerHeader7: ; 55c07 (15:5c07)
 	dw Route17EndBattleText8 ; TextEndBattle
 	dw Route17EndBattleText8 ; TextEndBattle
 
-Route17TrainerHeader8: ; 55c13 (15:5c13)
+Route17TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1
@@ -112,7 +112,7 @@ Route17TrainerHeader8: ; 55c13 (15:5c13)
 	dw Route17EndBattleText9 ; TextEndBattle
 	dw Route17EndBattleText9 ; TextEndBattle
 
-Route17TrainerHeader9: ; 55c1f (15:5c1f)
+Route17TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1
@@ -123,206 +123,206 @@ Route17TrainerHeader9: ; 55c1f (15:5c1f)
 
 	db $ff
 
-Route17Text1: ; 55c2c (15:5c2c)
+Route17Text1:
 	TX_ASM
 	ld hl, Route17TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText1: ; 55c36 (15:5c36)
+Route17BattleText1:
 	TX_FAR _Route17BattleText1
 	db "@"
 
-Route17EndBattleText1: ; 55c3b (15:5c3b)
+Route17EndBattleText1:
 	TX_FAR _Route17EndBattleText1
 	db "@"
 
-Route17AfterBattleText1: ; 55c40 (15:5c40)
+Route17AfterBattleText1:
 	TX_FAR _Route17AfterBattleText1
 	db "@"
 
-Route17Text2: ; 55c45 (15:5c45)
+Route17Text2:
 	TX_ASM
 	ld hl, Route17TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText2: ; 55c4f (15:5c4f)
+Route17BattleText2:
 	TX_FAR _Route17BattleText2
 	db "@"
 
-Route17EndBattleText2: ; 55c54 (15:5c54)
+Route17EndBattleText2:
 	TX_FAR _Route17EndBattleText2
 	db "@"
 
-Route17AfterBattleText2: ; 55c59 (15:5c59)
+Route17AfterBattleText2:
 	TX_FAR _Route17AfterBattleText2
 	db "@"
 
-Route17Text3: ; 55c5e (15:5c5e)
+Route17Text3:
 	TX_ASM
 	ld hl, Route17TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText3: ; 55c68 (15:5c68)
+Route17BattleText3:
 	TX_FAR _Route17BattleText3
 	db "@"
 
-Route17EndBattleText3: ; 55c6d (15:5c6d)
+Route17EndBattleText3:
 	TX_FAR _Route17EndBattleText3
 	db "@"
 
-Route17AfterBattleText3: ; 55c72 (15:5c72)
+Route17AfterBattleText3:
 	TX_FAR _Route17AfterBattleText3
 	db "@"
 
-Route17Text4: ; 55c77 (15:5c77)
+Route17Text4:
 	TX_ASM
 	ld hl, Route17TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText4: ; 55c81 (15:5c81)
+Route17BattleText4:
 	TX_FAR _Route17BattleText4
 	db "@"
 
-Route17EndBattleText4: ; 55c86 (15:5c86)
+Route17EndBattleText4:
 	TX_FAR _Route17EndBattleText4
 	db "@"
 
-Route17AfterBattleText4: ; 55c8b (15:5c8b)
+Route17AfterBattleText4:
 	TX_FAR _Route17AfterBattleText4
 	db "@"
 
-Route17Text5: ; 55c90 (15:5c90)
+Route17Text5:
 	TX_ASM
 	ld hl, Route17TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText5: ; 55c9a (15:5c9a)
+Route17BattleText5:
 	TX_FAR _Route17BattleText5
 	db "@"
 
-Route17EndBattleText5: ; 55c9f (15:5c9f)
+Route17EndBattleText5:
 	TX_FAR _Route17EndBattleText5
 	db "@"
 
-Route17AfterBattleText5: ; 55ca4 (15:5ca4)
+Route17AfterBattleText5:
 	TX_FAR _Route17AfterBattleText5
 	db "@"
 
-Route17Text6: ; 55ca9 (15:5ca9)
+Route17Text6:
 	TX_ASM
 	ld hl, Route17TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText6: ; 55cb3 (15:5cb3)
+Route17BattleText6:
 	TX_FAR _Route17BattleText6
 	db "@"
 
-Route17EndBattleText6: ; 55cb8 (15:5cb8)
+Route17EndBattleText6:
 	TX_FAR _Route17EndBattleText6
 	db "@"
 
-Route17AfterBattleText6: ; 55cbd (15:5cbd)
+Route17AfterBattleText6:
 	TX_FAR _Route17AfterBattleText6
 	db "@"
 
-Route17Text7: ; 55cc2 (15:5cc2)
+Route17Text7:
 	TX_ASM
 	ld hl, Route17TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText7: ; 55ccc (15:5ccc)
+Route17BattleText7:
 	TX_FAR _Route17BattleText7
 	db "@"
 
-Route17EndBattleText7: ; 55cd1 (15:5cd1)
+Route17EndBattleText7:
 	TX_FAR _Route17EndBattleText7
 	db "@"
 
-Route17AfterBattleText7: ; 55cd6 (15:5cd6)
+Route17AfterBattleText7:
 	TX_FAR _Route17AfterBattleText7
 	db "@"
 
-Route17Text8: ; 55cdb (15:5cdb)
+Route17Text8:
 	TX_ASM
 	ld hl, Route17TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText8: ; 55ce5 (15:5ce5)
+Route17BattleText8:
 	TX_FAR _Route17BattleText8
 	db "@"
 
-Route17EndBattleText8: ; 55cea (15:5cea)
+Route17EndBattleText8:
 	TX_FAR _Route17EndBattleText8
 	db "@"
 
-Route17AfterBattleText8: ; 55cef (15:5cef)
+Route17AfterBattleText8:
 	TX_FAR _Route17AfterBattleText8
 	db "@"
 
-Route17Text9: ; 55cf4 (15:5cf4)
+Route17Text9:
 	TX_ASM
 	ld hl, Route17TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText9: ; 55cfe (15:5cfe)
+Route17BattleText9:
 	TX_FAR _Route17BattleText9
 	db "@"
 
-Route17EndBattleText9: ; 55d03 (15:5d03)
+Route17EndBattleText9:
 	TX_FAR _Route17EndBattleText9
 	db "@"
 
-Route17AfterBattleText9: ; 55d08 (15:5d08)
+Route17AfterBattleText9:
 	TX_FAR _Route17AfterBattleText9
 	db "@"
 
-Route17Text10: ; 55d0d (15:5d0d)
+Route17Text10:
 	TX_ASM
 	ld hl, Route17TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText10: ; 55d17 (15:5d17)
+Route17BattleText10:
 	TX_FAR _Route17BattleText10
 	db "@"
 
-Route17EndBattleText10: ; 55d1c (15:5d1c)
+Route17EndBattleText10:
 	TX_FAR _Route17EndBattleText10
 	db "@"
 
-Route17AfterBattleText10: ; 55d21 (15:5d21)
+Route17AfterBattleText10:
 	TX_FAR _Route17AfterBattleText10
 	db "@"
 
-Route17Text11: ; 55d26 (15:5d26)
+Route17Text11:
 	TX_FAR _Route17Text11
 	db "@"
 
-Route17Text12: ; 55d2b (15:5d2b)
+Route17Text12:
 	TX_FAR _Route17Text12
 	db "@"
 
-Route17Text13: ; 55d30 (15:5d30)
+Route17Text13:
 	TX_FAR _Route17Text13
 	db "@"
 
-Route17Text14: ; 55d35 (15:5d35)
+Route17Text14:
 	TX_FAR _Route17Text14
 	db "@"
 
-Route17Text15: ; 55d3a (15:5d3a)
+Route17Text15:
 	TX_FAR _Route17Text15
 	db "@"
 
-Route17Text16: ; 55d3f (15:5d3f)
+Route17Text16:
 	TX_FAR _Route17Text16
 	db "@"