Merge pull request #133 from YamaArashi/master

Remove address comments

1 files changed, 41 insertions, 41 deletions

diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 10a74853..994cd215 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11Script: ; 620fa (18:60fa)
+SilphCo11Script:
 	call SilphCo11Script_62110
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo11TrainerHeaders
@@ -8,7 +8,7 @@ SilphCo11Script: ; 620fa (18:60fa)
 	ld [wSilphCo11CurScript], a
 	ret
 
-SilphCo11Script_62110: ; 62110 (18:6110)
+SilphCo11Script_62110:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,11 +23,11 @@ SilphCo11Script_62110: ; 62110 (18:6110)
 	lb bc, 6, 3
 	predef_jump ReplaceTileBlock
 
-SilphCo11GateCoords: ; 62134 (18:6134)
+SilphCo11GateCoords:
 	db $06,$03
 	db $FF
 
-SilphCo11Script_62137: ; 62137 (18:6137)
+SilphCo11Script_62137:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -63,14 +63,14 @@ SilphCo11Script_62137: ; 62137 (18:6137)
 	ld [$ffe0], a
 	ret
 
-SilphCo11Script_62163: ; 62163 (18:6163)
+SilphCo11Script_62163:
 	ld a, [$ffe0]
 	and a
 	ret z
 	SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
 	ret
 
-SilphCo11Script_6216d: ; 6216d (18:616d)
+SilphCo11Script_6216d:
 	ld hl, MissableObjectIDs_6219b
 .asm_62170
 	ld a, [hli]
@@ -93,7 +93,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
 	pop hl
 	jr .asm_62184
 
-MissableObjectIDs_62194: ; 62194 (18:6194)
+MissableObjectIDs_62194:
 	db HS_SAFFRON_CITY_8
 	db HS_SAFFRON_CITY_9
 	db HS_SAFFRON_CITY_A
@@ -102,7 +102,7 @@ MissableObjectIDs_62194: ; 62194 (18:6194)
 	db HS_SAFFRON_CITY_D
 	db $FF
 
-MissableObjectIDs_6219b: ; 6219b (18:619b)
+MissableObjectIDs_6219b:
 	db HS_SAFFRON_CITY_1
 	db HS_SAFFRON_CITY_2
 	db HS_SAFFRON_CITY_3
@@ -145,16 +145,16 @@ MissableObjectIDs_6219b: ; 6219b (18:619b)
 	db HS_SILPH_CO_11F_3
 	db $FF
 
-SilphCo11Script_621c4: ; 621c4 (18:61c4)
+SilphCo11Script_621c4:
 	xor a
 	ld [wJoyIgnore], a
 
-SilphCo11Script_621c8: ; 621c8 (18:61c8)
+SilphCo11Script_621c8:
 	ld [wSilphCo11CurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo11ScriptPointers: ; 621cf (18:61cf)
+SilphCo11ScriptPointers:
 	dw SilphCo11Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -162,7 +162,7 @@ SilphCo11ScriptPointers: ; 621cf (18:61cf)
 	dw SilphCo11Script4
 	dw SilphCo11Script5
 
-SilphCo11Script0: ; 621db (18:61db)
+SilphCo11Script0:
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ret nz
 	ld hl, CoordsData_62211
@@ -185,18 +185,18 @@ SilphCo11Script0: ; 621db (18:61db)
 	ld a, $3
 	jp SilphCo11Script_621c8
 
-CoordsData_62211: ; 62211 (18:6211)
+CoordsData_62211:
 	db $0D,$06
 	db $0C,$07
 	db $FF
 
-MovementData_62216: ; 62216 (18:6216)
+MovementData_62216:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-SilphCo11Script_6221a: ; 6221a (18:621a)
+SilphCo11Script_6221a:
 	ld [wPlayerMovingDirection], a
 	ld a, $3
 	ld [H_SPRITEINDEX], a
@@ -204,7 +204,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a)
 	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
-SilphCo11Script5: ; 62227 (18:6227)
+SilphCo11Script5:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo11Script_621c4
@@ -234,7 +234,7 @@ SilphCo11Script5: ; 62227 (18:6227)
 	ld [wJoyIgnore], a
 	jp SilphCo11Script_621c8
 
-SilphCo11Script3: ; 6226a (18:626a)
+SilphCo11Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -256,7 +256,7 @@ SilphCo11Script3: ; 6226a (18:626a)
 	ld a, $4
 	jp SilphCo11Script_621c8
 
-SilphCo11Script4: ; 62293 (18:6293)
+SilphCo11Script4:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
@@ -272,7 +272,7 @@ SilphCo11Script4: ; 62293 (18:6293)
 	ld a, $5
 	jp SilphCo11Script_621c8
 
-SilphCo11TextPointers: ; 622b7 (18:62b7)
+SilphCo11TextPointers:
 	dw SilphCo11Text1
 	dw SilphCo11Text2
 	dw SilphCo11Text3
@@ -280,8 +280,8 @@ SilphCo11TextPointers: ; 622b7 (18:62b7)
 	dw SilphCo11Text5
 	dw SilphCo11Text6
 
-SilphCo11TrainerHeaders: ; 622c3 (18:62c3)
-SilphCo11TrainerHeader0: ; 622c3 (18:62c3)
+SilphCo11TrainerHeaders:
+SilphCo11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0
@@ -290,7 +290,7 @@ SilphCo11TrainerHeader0: ; 622c3 (18:62c3)
 	dw SilphCo11EndBattleText1 ; TextEndBattle
 	dw SilphCo11EndBattleText1 ; TextEndBattle
 
-SilphCo11TrainerHeader1: ; 622cf (18:62cf)
+SilphCo11TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1
@@ -301,7 +301,7 @@ SilphCo11TrainerHeader1: ; 622cf (18:62cf)
 
 	db $ff
 
-SilphCo11Text1: ; 622dc (18:62dc)
+SilphCo11Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_MASTER_BALL
 	jp nz, .asm_62308
@@ -324,75 +324,75 @@ SilphCo11Text1: ; 622dc (18:62dc)
 .asm_6230e
 	jp TextScriptEnd
 
-SilphCoPresidentText: ; 62311 (18:6311)
+SilphCoPresidentText:
 	TX_FAR _SilphCoPresidentText
 	db "@"
 
-ReceivedSilphCoMasterBallText: ; 62316 (18:6316)
+ReceivedSilphCoMasterBallText:
 	TX_FAR _ReceivedSilphCoMasterBallText
 	db $11, "@"
 
-SilphCo10Text_6231c: ; 6231c (18:631c)
+SilphCo10Text_6231c:
 	TX_FAR _SilphCo10Text_6231c
 	db "@"
 
-SilphCoMasterBallNoRoomText: ; 62321 (18:6321)
+SilphCoMasterBallNoRoomText:
 	TX_FAR _SilphCoMasterBallNoRoomText
 	db "@"
 
-SilphCo11Text2: ; 62326 (18:6326)
+SilphCo11Text2:
 	TX_FAR _SilphCo11Text2
 	db "@"
 
-SilphCo11Text3: ; 6232b (18:632b)
+SilphCo11Text3:
 	TX_FAR _SilphCo11Text3
 	db "@"
 
-SilphCo10Text_62330: ; 62330 (18:6330)
+SilphCo10Text_62330:
 	TX_FAR _SilphCo10Text_62330
 	db "@"
 
-SilphCo11Text6: ; 62335 (18:6335)
+SilphCo11Text6:
 	TX_FAR _SilphCo10Text_62335
 	db "@"
 
-SilphCo11Text4: ; 6233a (18:633a)
+SilphCo11Text4:
 	TX_ASM
 	ld hl, SilphCo11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo11BattleText1: ; 62344 (18:6344)
+SilphCo11BattleText1:
 	TX_FAR _SilphCo11BattleText1
 	db "@"
 
-SilphCo11EndBattleText1: ; 62349 (18:6349)
+SilphCo11EndBattleText1:
 	TX_FAR _SilphCo11EndBattleText1
 	db "@"
 
-SilphCo11AfterBattleText1: ; 6234e (18:634e)
+SilphCo11AfterBattleText1:
 	TX_FAR _SilphCo11AfterBattleText1
 	db "@"
 
-SilphCo11Text5: ; 62353 (18:6353)
+SilphCo11Text5:
 	TX_ASM
 	ld hl, SilphCo11TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo11BattleText2: ; 6235d (18:635d)
+SilphCo11BattleText2:
 	TX_FAR _SilphCo11BattleText2
 	db "@"
 
-SilphCo11EndBattleText2: ; 62362 (18:6362)
+SilphCo11EndBattleText2:
 	TX_FAR _SilphCo11EndBattleText2
 	db "@"
 
-SilphCo11AfterBattleText2: ; 62367 (18:6367)
+SilphCo11AfterBattleText2:
 	TX_FAR _SilphCo11AfterBattleText2
 	db "@"
 
-SilphCo10Text_6236c: ; 6236c (18:636c)
+SilphCo10Text_6236c:
 	TX_ASM
 	ld hl, SilphCo10Text_6237b
 	call PrintText
@@ -400,6 +400,6 @@ SilphCo10Text_6236c: ; 6236c (18:636c)
 	call DisplayPokedex
 	jp TextScriptEnd
 
-SilphCo10Text_6237b: ; 6237b (18:637b)
+SilphCo10Text_6237b:
 	TX_FAR _SilphCo10Text_6237b
 	db "@"