Merge pull request #133 from YamaArashi/master

Remove address comments

1 files changed, 56 insertions, 56 deletions

diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index c4905d59..4cae9989 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -1,11 +1,11 @@
-CinnabarGymScript: ; 7574a (1d:574a)
+CinnabarGymScript:
 	call CinnabarGymScript_75759
 	call EnableAutoTextBoxDrawing
 	ld hl, CinnabarGymScriptPointers
 	ld a, [wCinnabarGymCurScript]
 	jp CallFunctionInTable
 
-CinnabarGymScript_75759: ; 75759 (1d:5759)
+CinnabarGymScript_75759:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -17,17 +17,17 @@ CinnabarGymScript_75759: ; 75759 (1d:5759)
 	call nz, UpdateCinnabarGymGateTileBlocks
 	ResetEvent EVENT_2A7
 	ret
-CinnabarGymScript_75772: ; 75772 (1d:5772)
+CinnabarGymScript_75772:
 	ld hl, Gym7CityName
 	ld de, Gym7LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym7CityName: ; 7577b (1d:577b)
+Gym7CityName:
 	db "CINNABAR ISLAND@"
-Gym7LeaderName: ; 7578b (1d:578b)
+Gym7LeaderName:
 	db "BLAINE@"
 
-CinnabarGymScript_75792: ; 75792 (1d:5792)
+CinnabarGymScript_75792:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCinnabarGymCurScript], a
@@ -35,18 +35,18 @@ CinnabarGymScript_75792: ; 75792 (1d:5792)
 	ld [wOpponentAfterWrongAnswer], a
 	ret
 
-CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
+CinnabarGymScript_757a0:
 	ld a, [hSpriteIndexOrTextID]
 	ld [wTrainerHeaderFlagBit], a
 	ret
 
-CinnabarGymScriptPointers: ; 757a6 (1d:57a6)
+CinnabarGymScriptPointers:
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
 	dw CinnabarGymScript2
 	dw CinnabarGymScript3
 
-CinnabarGymScript0: ; 757ae (1d:57ae)
+CinnabarGymScript0:
 	ld a, [wOpponentAfterWrongAnswer]
 	and a
 	ret z
@@ -68,16 +68,16 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
 	ld [wCurMapScript], a
 	ret
 
-MovementData_757d7: ; 757d7 (1d:57d7)
+MovementData_757d7:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db $FF
 
-MovementData_757da: ; 757da (1d:57da)
+MovementData_757da:
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
-CinnabarGymScript1: ; 757dc (1d:57dc)
+CinnabarGymScript1:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -88,10 +88,10 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CinnabarGymFlagAction: ; 757f1 (1d:57f1)
+CinnabarGymFlagAction:
 	predef_jump FlagActionPredef
 
-CinnabarGymScript2: ; 757f6 (1d:57f6)
+CinnabarGymScript2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
@@ -133,13 +133,13 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
 	ld [wCurMapScript], a
 	ret
 
-CinnabarGymScript3: ; 7584a (1d:584a)
+CinnabarGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
 	ld a, $f0
 	ld [wJoyIgnore], a
-CinnabarGymScript3_75857: ; 75857 (1d:5857)
+CinnabarGymScript3_75857:
 	ld a, $a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -170,7 +170,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857)
 
 	jp CinnabarGymScript_75792
 
-CinnabarGymTextPointers: ; 7589f (1d:589f)
+CinnabarGymTextPointers:
 	dw CinnabarGymText1
 	dw CinnabarGymText2
 	dw CinnabarGymText3
@@ -184,7 +184,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
 	dw ReceivedTM38Text
 	dw TM38NoRoomText
 
-CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
+CinnabarGymScript_758b7:
 	ld a, [hSpriteIndexOrTextID]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
@@ -204,7 +204,7 @@ CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
 	ld [wCurMapScript], a
 	jp TextScriptEnd
 
-CinnabarGymText1: ; 758df (1d:58df)
+CinnabarGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_BLAINE
 	jr z, .asm_d9332
@@ -227,35 +227,35 @@ CinnabarGymText1: ; 758df (1d:58df)
 	ld [wGymLeaderNo], a
 	jp CinnabarGymScript_758b7
 
-BlaineBattleText: ; 75914 (1d:5914)
+BlaineBattleText:
 	TX_FAR _BlaineBattleText
 	db "@"
 
-BlaineEndBattleText: ; 75919 (1d:5919)
+BlaineEndBattleText:
 	TX_FAR _BlaineEndBattleText
 	db $11
 	db $d
 	db "@"
 
-BlaineFireBlastText: ; 75920 (1d:5920)
+BlaineFireBlastText:
 	TX_FAR _BlaineFireBlastText
 	db "@"
 
-BlaineBadgeText: ; 75925 (1d:5925)
+BlaineBadgeText:
 	TX_FAR _BlaineBadgeText
 	db "@"
 
-ReceivedTM38Text: ; 7592a (1d:592a)
+ReceivedTM38Text:
 	TX_FAR _ReceivedTM38Text
 	db $0B
 	TX_FAR _TM38ExplanationText
 	db "@"
 
-TM38NoRoomText: ; 75934 (1d:5934)
+TM38NoRoomText:
 	TX_FAR _TM38NoRoomText
 	db "@"
 
-CinnabarGymText2: ; 75939 (1d:5939)
+CinnabarGymText2:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
@@ -271,19 +271,19 @@ CinnabarGymText2: ; 75939 (1d:5939)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_7595f: ; 7595f (1d:595f)
+CinnabarGymText_7595f:
 	TX_FAR _CinnabarGymText_7595f
 	db "@"
 
-CinnabarGymText_75964: ; 75964 (1d:5964)
+CinnabarGymText_75964:
 	TX_FAR _CinnabarGymText_75964
 	db "@"
 
-CinnabarGymText_75969: ; 75969 (1d:5969)
+CinnabarGymText_75969:
 	TX_FAR _CinnabarGymText_75969
 	db "@"
 
-CinnabarGymText3: ; 7596e (1d:596e)
+CinnabarGymText3:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
@@ -299,19 +299,19 @@ CinnabarGymText3: ; 7596e (1d:596e)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75994: ; 75994 (1d:5994)
+CinnabarGymText_75994:
 	TX_FAR _CinnabarGymText_75994
 	db "@"
 
-CinnabarGymText_75999: ; 75999 (1d:5999)
+CinnabarGymText_75999:
 	TX_FAR _CinnabarGymText_75999
 	db "@"
 
-CinnabarGymText_7599e: ; 7599e (1d:599e)
+CinnabarGymText_7599e:
 	TX_FAR _CinnabarGymText_7599e
 	db "@"
 
-CinnabarGymText4: ; 759a3 (1d:59a3)
+CinnabarGymText4:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
@@ -327,19 +327,19 @@ CinnabarGymText4: ; 759a3 (1d:59a3)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759c9: ; 759c9 (1d:59c9)
+CinnabarGymText_759c9:
 	TX_FAR _CinnabarGymText_759c9
 	db "@"
 
-CinnabarGymText_759ce: ; 759ce (1d:59ce)
+CinnabarGymText_759ce:
 	TX_FAR _CinnabarGymText_759ce
 	db "@"
 
-CinnabarGymText_759d3: ; 759d3 (1d:59d3)
+CinnabarGymText_759d3:
 	TX_FAR _CinnabarGymText_759d3
 	db "@"
 
-CinnabarGymText5: ; 759d8 (1d:59d8)
+CinnabarGymText5:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
@@ -355,19 +355,19 @@ CinnabarGymText5: ; 759d8 (1d:59d8)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759fe: ; 759fe (1d:59fe)
+CinnabarGymText_759fe:
 	TX_FAR _CinnabarGymText_759fe
 	db "@"
 
-CinnabarGymText_75a03: ; 75a03 (1d:5a03)
+CinnabarGymText_75a03:
 	TX_FAR _CinnabarGymText_75a03
 	db "@"
 
-CinnabarGymText_75a08: ; 75a08 (1d:5a08)
+CinnabarGymText_75a08:
 	TX_FAR _CinnabarGymText_75a08
 	db "@"
 
-CinnabarGymText6: ; 75a0d (1d:5a0d)
+CinnabarGymText6:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
@@ -383,19 +383,19 @@ CinnabarGymText6: ; 75a0d (1d:5a0d)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a33: ; 75a33 (1d:5a33)
+CinnabarGymText_75a33:
 	TX_FAR _CinnabarGymText_75a33
 	db "@"
 
-CinnabarGymText_75a38: ; 75a38 (1d:5a38)
+CinnabarGymText_75a38:
 	TX_FAR _CinnabarGymText_75a38
 	db "@"
 
-CinnabarGymText_75a3d: ; 75a3d (1d:5a3d)
+CinnabarGymText_75a3d:
 	TX_FAR _CinnabarGymText_75a3d
 	db "@"
 
-CinnabarGymText7: ; 75a42 (1d:5a42)
+CinnabarGymText7:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
@@ -411,19 +411,19 @@ CinnabarGymText7: ; 75a42 (1d:5a42)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a68: ; 75a68 (1d:5a68)
+CinnabarGymText_75a68:
 	TX_FAR _CinnabarGymText_75a68
 	db "@"
 
-CinnabarGymText_75a6d: ; 75a6d (1d:5a6d)
+CinnabarGymText_75a6d:
 	TX_FAR _CinnabarGymText_75a6d
 	db "@"
 
-CinnabarGymText_75a72: ; 75a72 (1d:5a72)
+CinnabarGymText_75a72:
 	TX_FAR _CinnabarGymText_75a72
 	db "@"
 
-CinnabarGymText8: ; 75a77 (1d:5a77)
+CinnabarGymText8:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
@@ -439,19 +439,19 @@ CinnabarGymText8: ; 75a77 (1d:5a77)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a9d: ; 75a9d (1d:5a9d)
+CinnabarGymText_75a9d:
 	TX_FAR _CinnabarGymText_75a9d
 	db "@"
 
-CinnabarGymText_75aa2: ; 75aa2 (1d:5aa2)
+CinnabarGymText_75aa2:
 	TX_FAR _CinnabarGymText_75aa2
 	db "@"
 
-CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7)
+CinnabarGymText_75aa7:
 	TX_FAR _CinnabarGymText_75aa7
 	db "@"
 
-CinnabarGymText9: ; 75aac (1d:5aac)
+CinnabarGymText9:
 	TX_ASM
 	CheckEvent EVENT_BEAT_BLAINE
 	jr nz, .asm_627d9
@@ -463,10 +463,10 @@ CinnabarGymText9: ; 75aac (1d:5aac)
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75ac2: ; 75ac2 (1d:5ac2)
+CinnabarGymText_75ac2:
 	TX_FAR _CinnabarGymText_75ac2
 	db "@"
 
-CinnabarGymText_75ac7: ; 75ac7 (1d:5ac7)
+CinnabarGymText_75ac7:
 	TX_FAR _CinnabarGymText_75ac7
 	db "@"