remove address comments

1 files changed, 54 insertions, 54 deletions

diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index aae06103..146d31f9 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGymScript: ; 5d00d (17:500d)
+SaffronGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -16,33 +16,33 @@ SaffronGymScript: ; 5d00d (17:500d)
 	ld de, Gym6LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym6CityName: ; 5d033 (17:5033)
+Gym6CityName:
 	db "SAFFRON CITY@"
 
-Gym6LeaderName: ; 5d040 (17:5040)
+Gym6LeaderName:
 	db "SABRINA@"
 
-SaffronGymText_5d048: ; 5d048 (17:5048)
+SaffronGymText_5d048:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wSaffronGymCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SaffronGymScriptPointers: ; 5d053 (17:5053)
+SaffronGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SaffronGymScript3
 
-SaffronGymScript3: ; 5d05b (17:505b)
+SaffronGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SaffronGymText_5d048
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-SaffronGymText_5d068: ; 5d068 (17:5068)
+SaffronGymText_5d068:
 	ld a, $a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
 
 	jp SaffronGymText_5d048
 
-SaffronGymTextPointers: ; 5d0ab (17:50ab)
+SaffronGymTextPointers:
 	dw SaffronGymText1
 	dw SaffronGymText2
 	dw SaffronGymText3
@@ -84,8 +84,8 @@ SaffronGymTextPointers: ; 5d0ab (17:50ab)
 	dw SaffronGymText11
 	dw SaffronGymText12
 
-SaffronGymTrainerHeaders: ; 5d0c3 (17:50c3)
-SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
+SaffronGymTrainerHeaders:
+SaffronGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0
@@ -94,7 +94,7 @@ SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
 	dw SaffronGymEndBattleText1 ; TextEndBattle
 	dw SaffronGymEndBattleText1 ; TextEndBattle
 
-SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
+SaffronGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1
@@ -103,7 +103,7 @@ SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
 	dw SaffronGymEndBattleText2 ; TextEndBattle
 	dw SaffronGymEndBattleText2 ; TextEndBattle
 
-SaffronGymTrainerHeader2: ; 5d0db (17:50db)
+SaffronGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2
@@ -112,7 +112,7 @@ SaffronGymTrainerHeader2: ; 5d0db (17:50db)
 	dw SaffronGymEndBattleText3 ; TextEndBattle
 	dw SaffronGymEndBattleText3 ; TextEndBattle
 
-SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
+SaffronGymTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3
@@ -121,7 +121,7 @@ SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
 	dw SaffronGymEndBattleText4 ; TextEndBattle
 	dw SaffronGymEndBattleText4 ; TextEndBattle
 
-SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
+SaffronGymTrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4
@@ -130,7 +130,7 @@ SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
 	dw SaffronGymEndBattleText5 ; TextEndBattle
 	dw SaffronGymEndBattleText5 ; TextEndBattle
 
-SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
+SaffronGymTrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5
@@ -139,7 +139,7 @@ SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
 	dw SaffronGymEndBattleText6 ; TextEndBattle
 	dw SaffronGymEndBattleText6 ; TextEndBattle
 
-SaffronGymTrainerHeader6: ; 5d10b (17:510b)
+SaffronGymTrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1
@@ -150,7 +150,7 @@ SaffronGymTrainerHeader6: ; 5d10b (17:510b)
 
 	db $ff
 
-SaffronGymText1: ; 5d118 (17:5118)
+SaffronGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SABRINA
 	jr z, .asm_5d134
@@ -183,77 +183,77 @@ SaffronGymText1: ; 5d118 (17:5118)
 .asm_5d15f
 	jp TextScriptEnd
 
-SaffronGymText_5d162: ; 5d162 (17:5162)
+SaffronGymText_5d162:
 	TX_FAR _SaffronGymText_5d162
 	db "@"
 
-SaffronGymText_5d167: ; 5d167 (17:5167)
+SaffronGymText_5d167:
 	TX_FAR _SaffronGymText_5d167
 	db $11 ; play same sound as red giving oak parcel
 	db $6 ; wait for keypress
 	db "@"
 
-SaffronGymText_5d16e: ; 5d16e (17:516e)
+SaffronGymText_5d16e:
 	TX_FAR _SaffronGymText_5d16e
 	db "@"
 
-SaffronGymText10: ; 5d173 (17:5173)
+SaffronGymText10:
 	TX_FAR _SaffronGymText_5d173
 	db "@"
 
-SaffronGymText11: ; 5d178 (17:5178)
+SaffronGymText11:
 	TX_FAR ReceivedTM46Text
 	db $b
 	TX_FAR _TM46ExplanationText
 	db "@"
 
-SaffronGymText12: ; 5d182 (17:5182)
+SaffronGymText12:
 	TX_FAR _TM46NoRoomText
 	db "@"
 
-SaffronGymText2: ; 5d187 (17:5187)
+SaffronGymText2:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText3: ; 5d191 (17:5191)
+SaffronGymText3:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText4: ; 5d19b (17:519b)
+SaffronGymText4:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText5: ; 5d1a5 (17:51a5)
+SaffronGymText5:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText6: ; 5d1af (17:51af)
+SaffronGymText6:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText7: ; 5d1b9 (17:51b9)
+SaffronGymText7:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText8: ; 5d1c3 (17:51c3)
+SaffronGymText8:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText9: ; 5d1cd (17:51cd)
+SaffronGymText9:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SABRINA
 	jr nz, .asm_5d1dd
@@ -266,94 +266,94 @@ SaffronGymText9: ; 5d1cd (17:51cd)
 .asm_5d1e3
 	jp TextScriptEnd
 
-SaffronGymText_5d1e6: ; 5d1e6 (17:51e6)
+SaffronGymText_5d1e6:
 	TX_FAR _SaffronGymText_5d1e6
 	db "@"
 
-SaffronGymText_5d1eb: ; 5d1eb (17:51eb)
+SaffronGymText_5d1eb:
 	TX_FAR _SaffronGymText_5d1eb
 	db "@"
 
-SaffronGymBattleText1: ; 5d1f0 (17:51f0)
+SaffronGymBattleText1:
 	TX_FAR _SaffronGymBattleText1
 	db "@"
 
-SaffronGymEndBattleText1: ; 5d1f5 (17:51f5)
+SaffronGymEndBattleText1:
 	TX_FAR _SaffronGymEndBattleText1
 	db "@"
 
-SaffronGymAfterBattleText1: ; 5d1fa (17:51fa)
+SaffronGymAfterBattleText1:
 	TX_FAR _SaffronGymAfterBattleText1
 	db "@"
 
-SaffronGymBattleText2: ; 5d1ff (17:51ff)
+SaffronGymBattleText2:
 	TX_FAR _SaffronGymBattleText2
 	db "@"
 
-SaffronGymEndBattleText2: ; 5d204 (17:5204)
+SaffronGymEndBattleText2:
 	TX_FAR _SaffronGymEndBattleText2
 	db "@"
 
-SaffronGymAfterBattleText2: ; 5d209 (17:5209)
+SaffronGymAfterBattleText2:
 	TX_FAR _SaffronGymAfterBattleText2
 	db "@"
 
-SaffronGymBattleText3: ; 5d20e (17:520e)
+SaffronGymBattleText3:
 	TX_FAR _SaffronGymBattleText3
 	db "@"
 
-SaffronGymEndBattleText3: ; 5d213 (17:5213)
+SaffronGymEndBattleText3:
 	TX_FAR _SaffronGymEndBattleText3
 	db "@"
 
-SaffronGymAfterBattleText3: ; 5d218 (17:5218)
+SaffronGymAfterBattleText3:
 	TX_FAR _SaffronGymAfterBattleText3
 	db "@"
 
-SaffronGymBattleText4: ; 5d21d (17:521d)
+SaffronGymBattleText4:
 	TX_FAR _SaffronGymBattleText4
 	db "@"
 
-SaffronGymEndBattleText4: ; 5d222 (17:5222)
+SaffronGymEndBattleText4:
 	TX_FAR _SaffronGymEndBattleText4
 	db "@"
 
-SaffronGymAfterBattleText4: ; 5d227 (17:5227)
+SaffronGymAfterBattleText4:
 	TX_FAR _SaffronGymAfterBattleText4
 	db "@"
 
-SaffronGymBattleText5: ; 5d22c (17:522c)
+SaffronGymBattleText5:
 	TX_FAR _SaffronGymBattleText5
 	db "@"
 
-SaffronGymEndBattleText5: ; 5d231 (17:5231)
+SaffronGymEndBattleText5:
 	TX_FAR _SaffronGymEndBattleText5
 	db "@"
 
-SaffronGymAfterBattleText5: ; 5d236 (17:5236)
+SaffronGymAfterBattleText5:
 	TX_FAR _SaffronGymAfterBattleText5
 	db "@"
 
-SaffronGymBattleText6: ; 5d23b (17:523b)
+SaffronGymBattleText6:
 	TX_FAR _SaffronGymBattleText6
 	db "@"
 
-SaffronGymEndBattleText6: ; 5d240 (17:5240)
+SaffronGymEndBattleText6:
 	TX_FAR _SaffronGymEndBattleText6
 	db "@"
 
-SaffronGymAfterBattleText6: ; 5d245 (17:5245)
+SaffronGymAfterBattleText6:
 	TX_FAR _SaffronGymAfterBattleText6
 	db "@"
 
-SaffronGymBattleText7: ; 5d24a (17:524a)
+SaffronGymBattleText7:
 	TX_FAR _SaffronGymBattleText7
 	db "@"
 
-SaffronGymEndBattleText7: ; 5d24f (17:524f)
+SaffronGymEndBattleText7:
 	TX_FAR _SaffronGymEndBattleText7
 	db "@"
 
-SaffronGymAfterBattleText7: ; 5d254 (17:5254)
+SaffronGymAfterBattleText7:
 	TX_FAR _SaffronGymAfterBattleText7
 	db "@"