summaryrefslogtreecommitdiff
path: root/scripts/silphco5.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 17:30:20 -0700
committerGitHub <noreply@github.com>2016-06-11 17:30:20 -0700
commit7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch)
tree8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/silphco5.asm
parentd8dae96f35222ababb9688ce2aed3292515f8ca2 (diff)
parent7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff)
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/silphco5.asm')
-rwxr-xr-xscripts/silphco5.asm66
1 files changed, 33 insertions, 33 deletions
diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm
index d09848ba..42577498 100755
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5Script: ; 19f37 (6:5f37)
+SilphCo5Script:
call SilphCo5Script_19f4d
call EnableAutoTextBoxDrawing
ld hl, SilphCo5TrainerHeaders
@@ -8,7 +8,7 @@ SilphCo5Script: ; 19f37 (6:5f37)
ld [wSilphCo5CurScript], a
ret
-SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
+SilphCo5Script_19f4d:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -41,13 +41,13 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
lb bc, 5, 7
predef_jump ReplaceTileBlock
-SilphCo5GateCoords: ; 19f97 (6:5f97)
+SilphCo5GateCoords:
db $02,$03
db $06,$03
db $05,$07
db $FF
-SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
+SilphCo5Script_19f9e:
EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
ld a, [$ffe0]
and a
@@ -65,12 +65,12 @@ SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
ret
-SilphCo5ScriptPointers: ; 19fb6 (6:5fb6)
+SilphCo5ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-SilphCo5TextPointers: ; 19fbc (6:5fbc)
+SilphCo5TextPointers:
dw SilphCo5Text1
dw SilphCo5Text2
dw SilphCo5Text3
@@ -83,8 +83,8 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc)
dw SilphCo5Text10
dw SilphCo5Text11
-SilphCo5TrainerHeaders: ; 19fd2 (6:5fd2)
-Silphco5TrainerHeader0: ; 19fd2 (6:5fd2)
+SilphCo5TrainerHeaders:
+Silphco5TrainerHeader0:
dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
db ($1 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
@@ -93,7 +93,7 @@ Silphco5TrainerHeader0: ; 19fd2 (6:5fd2)
dw SilphCo5EndBattleText2 ; TextEndBattle
dw SilphCo5EndBattleText2 ; TextEndBattle
-Silphco5TrainerHeader2: ; 19fde (6:5fde)
+Silphco5TrainerHeader2:
dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
@@ -102,7 +102,7 @@ Silphco5TrainerHeader2: ; 19fde (6:5fde)
dw SilphCo5EndBattleText3 ; TextEndBattle
dw SilphCo5EndBattleText3 ; TextEndBattle
-Silphco5TrainerHeader3: ; 19fea (6:5fea)
+Silphco5TrainerHeader3:
dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
@@ -111,7 +111,7 @@ Silphco5TrainerHeader3: ; 19fea (6:5fea)
dw SilphCo5EndBattleText4 ; TextEndBattle
dw SilphCo5EndBattleText4 ; TextEndBattle
-Silphco5TrainerHeader4: ; 19ff6 (6:5ff6)
+Silphco5TrainerHeader4:
dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4
@@ -122,101 +122,101 @@ Silphco5TrainerHeader4: ; 19ff6 (6:5ff6)
db $ff
-SilphCo5Text1: ; 1a003 (6:6003)
+SilphCo5Text1:
TX_ASM
ld hl, SilphCo5Text_1a010
ld de, SilphCo5Text_1a015
call SilphCo6Script_1a22f
jp TextScriptEnd
-SilphCo5Text_1a010: ; 1a010 (6:6010)
+SilphCo5Text_1a010:
TX_FAR _SilphCo5Text_1a010
db "@"
-SilphCo5Text_1a015: ; 1a015 (6:6015)
+SilphCo5Text_1a015:
TX_FAR _SilphCo5Text_1a015
db "@"
-SilphCo5Text2: ; 1a01a (6:601a)
+SilphCo5Text2:
TX_ASM
ld hl, Silphco5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-SilphCo5BattleText2: ; 1a024 (6:6024)
+SilphCo5BattleText2:
TX_FAR _SilphCo5BattleText2
db "@"
-SilphCo5EndBattleText2: ; 1a029 (6:6029)
+SilphCo5EndBattleText2:
TX_FAR _SilphCo5EndBattleText2
db "@"
-SilphCo5AfterBattleText2: ; 1a02e (6:602e)
+SilphCo5AfterBattleText2:
TX_FAR _SilphCo5AfterBattleText2
db "@"
-SilphCo5Text3: ; 1a033 (6:6033)
+SilphCo5Text3:
TX_ASM
ld hl, Silphco5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-SilphCo5BattleText3: ; 1a03d (6:603d)
+SilphCo5BattleText3:
TX_FAR _SilphCo5BattleText3
db "@"
-SilphCo5EndBattleText3: ; 1a042 (6:6042)
+SilphCo5EndBattleText3:
TX_FAR _SilphCo5EndBattleText3
db "@"
-SilphCo5AfterBattleText3: ; 1a047 (6:6047)
+SilphCo5AfterBattleText3:
TX_FAR _SilphCo5AfterBattleText3
db "@"
-SilphCo5Text4: ; 1a04c (6:604c)
+SilphCo5Text4:
TX_ASM
ld hl, Silphco5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-SilphCo5BattleText4: ; 1a056 (6:6056)
+SilphCo5BattleText4:
TX_FAR _SilphCo5BattleText4
db "@"
-SilphCo5EndBattleText4: ; 1a05b (6:605b)
+SilphCo5EndBattleText4:
TX_FAR _SilphCo5EndBattleText4
db "@"
-SilphCo5AfterBattleText4: ; 1a060 (6:6060)
+SilphCo5AfterBattleText4:
TX_FAR _SilphCo5AfterBattleText4
db "@"
-SilphCo5Text5: ; 1a065 (6:6065)
+SilphCo5Text5:
TX_ASM
ld hl, Silphco5TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-SilphCo5BattleText5: ; 1a06f (6:606f)
+SilphCo5BattleText5:
TX_FAR _SilphCo5BattleText5
db "@"
-SilphCo5EndBattleText5: ; 1a074 (6:6074)
+SilphCo5EndBattleText5:
TX_FAR _SilphCo5EndBattleText5
db "@"
-SilphCo5AfterBattleText5: ; 1a079 (6:6079)
+SilphCo5AfterBattleText5:
TX_FAR _SilphCo5AfterBattleText5
db "@"
-SilphCo5Text9: ; 1a07e (6:607e)
+SilphCo5Text9:
TX_FAR _SilphCo5Text9
db "@"
-SilphCo5Text10: ; 1a083 (6:6083)
+SilphCo5Text10:
TX_FAR _SilphCo5Text10
db "@"
-SilphCo5Text11: ; 1a088 (6:6088)
+SilphCo5Text11:
TX_FAR _SilphCo5Text11
db "@"