Merge pull request #133 from YamaArashi/master

Remove address comments

1 files changed, 38 insertions, 38 deletions

diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm
index 406bc373..c40c7d70 100755
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6Script: ; 1a1a9 (6:61a9)
+SilphCo6Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo6TrainerHeaders
@@ -8,7 +8,7 @@ SilphCo6Script: ; 1a1a9 (6:61a9)
 	ld [wSilphCo6CurScript], a
 	ret
 
-SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
+SilphCo6Script_1a1bf:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,23 +23,23 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
 	lb bc, 6, 2
 	predef_jump ReplaceTileBlock
 
-SilphCo6GateCoords: ; 1a1e3 (6:61e3)
+SilphCo6GateCoords:
 	db $06,$02
 	db $FF
 
-SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6)
+SilphCo6Script_1a1e6:
 	ld a, [$ffe0]
 	and a
 	ret z
 	SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR
 	ret
 
-SilphCo6ScriptPointers: ; 1a1f0 (6:61f0)
+SilphCo6ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo6TextPointers: ; 1a1f6 (6:61f6)
+SilphCo6TextPointers:
 	dw SilphCo6Text1
 	dw SilphCo6Text2
 	dw SilphCo6Text3
@@ -51,8 +51,8 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6)
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo6TrainerHeaders: ; 1a20a (6:620a)
-SilphCo6TrainerHeader0: ; 1a20a (6:620a)
+SilphCo6TrainerHeaders:
+SilphCo6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0
@@ -61,7 +61,7 @@ SilphCo6TrainerHeader0: ; 1a20a (6:620a)
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 
-SilphCo6TrainerHeader2: ; 1a216 (6:6216)
+SilphCo6TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2
@@ -70,7 +70,7 @@ SilphCo6TrainerHeader2: ; 1a216 (6:6216)
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 
-SilphCo6TrainerHeader3: ; 1a222 (6:6222)
+SilphCo6TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
@@ -81,7 +81,7 @@ SilphCo6TrainerHeader3: ; 1a222 (6:6222)
 
 	db $ff
 
-SilphCo6Script_1a22f: ; 1a22f (6:622f)
+SilphCo6Script_1a22f:
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	jr nz, .asm_1a238
 	jr .asm_1a23a
@@ -91,131 +91,131 @@ SilphCo6Script_1a22f: ; 1a22f (6:622f)
 .asm_1a23a
 	jp PrintText
 
-SilphCo6Text1: ; 1a23d (6:623d)
+SilphCo6Text1:
 	TX_ASM
 	ld hl, SilphCo6Text_1a24a
 	ld de, SilphCo6Text_1a24f
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a24a: ; 1a24a (6:624a)
+SilphCo6Text_1a24a:
 	TX_FAR _SilphCo6Text_1a24a
 	db "@"
 
-SilphCo6Text_1a24f: ; 1a24f (6:624f)
+SilphCo6Text_1a24f:
 	TX_FAR _SilphCo6Text_1a24f
 	db "@"
 
-SilphCo6Text2: ; 1a254 (6:6254)
+SilphCo6Text2:
 	TX_ASM
 	ld hl, SilphCo6Text_1a261
 	ld de, SilphCo6Text_1a266
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a261: ; 1a261 (6:6261)
+SilphCo6Text_1a261:
 	TX_FAR _SilphCo6Text_1a261
 	db "@"
 
-SilphCo6Text_1a266: ; 1a266 (6:6266)
+SilphCo6Text_1a266:
 	TX_FAR _SilphCo6Text_1a266
 	db "@"
 
-SilphCo6Text3: ; 1a26b (6:626b)
+SilphCo6Text3:
 	TX_ASM
 	ld hl, SilphCo6Text_1a278
 	ld de, SilphCo6Text_1a27d
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a278: ; 1a278 (6:6278)
+SilphCo6Text_1a278:
 	TX_FAR _SilphCo6Text_1a278
 	db "@"
 
-SilphCo6Text_1a27d: ; 1a27d (6:627d)
+SilphCo6Text_1a27d:
 	TX_FAR _SilphCo6Text_1a27d
 	db "@"
 
-SilphCo6Text4: ; 1a282 (6:6282)
+SilphCo6Text4:
 	TX_ASM
 	ld hl, SilphCo6Text_1a28f
 	ld de, SilphCo6Text_1a294
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a28f: ; 1a28f (6:628f)
+SilphCo6Text_1a28f:
 	TX_FAR _SilphCo6Text_1a28f
 	db "@"
 
-SilphCo6Text_1a294: ; 1a294 (6:6294)
+SilphCo6Text_1a294:
 	TX_FAR _SilphCo6Text_1a294
 	db "@"
 
-SilphCo6Text5: ; 1a299 (6:6299)
+SilphCo6Text5:
 	TX_ASM
 	ld hl, SilphCo6Text_1a2a6
 	ld de, SilphCo6Text_1a2ab
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a2a6: ; 1a2a6 (6:62a6)
+SilphCo6Text_1a2a6:
 	TX_FAR _SilphCo6Text_1a2a6
 	db "@"
 
-SilphCo6Text_1a2ab: ; 1a2ab (6:62ab)
+SilphCo6Text_1a2ab:
 	TX_FAR _SilphCo6Text_1a2ab
 	db "@"
 
-SilphCo6Text6: ; 1a2b0 (6:62b0)
+SilphCo6Text6:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText2: ; 1a2ba (6:62ba)
+SilphCo6BattleText2:
 	TX_FAR _SilphCo6BattleText2
 	db "@"
 
-SilphCo6EndBattleText2: ; 1a2bf (6:62bf)
+SilphCo6EndBattleText2:
 	TX_FAR _SilphCo6EndBattleText2
 	db "@"
 
-SilphCo6AfterBattleText2: ; 1a2c4 (6:62c4)
+SilphCo6AfterBattleText2:
 	TX_FAR _SilphCo6AfterBattleText2
 	db "@"
 
-SilphCo6Text7: ; 1a2c9 (6:62c9)
+SilphCo6Text7:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText3: ; 1a2d3 (6:62d3)
+SilphCo6BattleText3:
 	TX_FAR _SilphCo6BattleText3
 	db "@"
 
-SilphCo6EndBattleText3: ; 1a2d8 (6:62d8)
+SilphCo6EndBattleText3:
 	TX_FAR _SilphCo6EndBattleText3
 	db "@"
 
-SilphCo6AfterBattleText3: ; 1a2dd (6:62dd)
+SilphCo6AfterBattleText3:
 	TX_FAR _SilphCo6AfterBattleText3
 	db "@"
 
-SilphCo6Text8: ; 1a2e2 (6:62e2)
+SilphCo6Text8:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText4: ; 1a2ec (6:62ec)
+SilphCo6BattleText4:
 	TX_FAR _SilphCo6BattleText4
 	db "@"
 
-SilphCo6EndBattleText4: ; 1a2f1 (6:62f1)
+SilphCo6EndBattleText4:
 	TX_FAR _SilphCo6EndBattleText4
 	db "@"
 
-SilphCo6AfterBattleText4: ; 1a2f6 (6:62f6)
+SilphCo6AfterBattleText4:
 	TX_FAR _SilphCo6AfterBattleText4
 	db "@"