summaryrefslogtreecommitdiff
path: root/scripts/silphco3.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/silphco3.asm
parentd8dae96f35222ababb9688ce2aed3292515f8ca2 (diff)
parent7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff)
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/silphco3.asm')
-rwxr-xr-xscripts/silphco3.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm
index 68ae7ed2..b8dfb7fb 100755
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3Script: ; 59f5b (16:5f5b)
+SilphCo3Script:
call SilphCo3Script_59f71
call EnableAutoTextBoxDrawing
ld hl, SilphCo3TrainerHeaders
@@ -8,7 +8,7 @@ SilphCo3Script: ; 59f5b (16:5f5b)
ld [wSilphCo3CurScript], a
ret
-SilphCo3Script_59f71: ; 59f71 (16:5f71)
+SilphCo3Script_59f71:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -32,12 +32,12 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
lb bc, 4, 8
predef_jump ReplaceTileBlock
-SilphCo3GateCoords: ; 59fa8 (16:5fa8)
+SilphCo3GateCoords:
db $04,$04
db $04,$08
db $FF
-SilphCo3Script_59fad: ; 59fad (16:5fad)
+SilphCo3Script_59fad:
EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
ld a, [$ffe0]
and a
@@ -50,19 +50,19 @@ SilphCo3Script_59fad: ; 59fad (16:5fad)
SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
ret
-SilphCo3ScriptPointers: ; 59fbe (16:5fbe)
+SilphCo3ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-SilphCo3TextPointers: ; 59fc4 (16:5fc4)
+SilphCo3TextPointers:
dw SilphCo3Text1
dw SilphCo3Text2
dw SilphCo3Text3
dw PickUpItemText
-SilphCo3TrainerHeaders: ; 59fcc (16:5fcc)
-SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)
+SilphCo3TrainerHeaders:
+SilphCo3TrainerHeader0:
dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0
@@ -71,7 +71,7 @@ SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)
dw SilphCo3EndBattleText1 ; TextEndBattle
dw SilphCo3EndBattleText1 ; TextEndBattle
-SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8)
+SilphCo3TrainerHeader1:
dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1
@@ -82,7 +82,7 @@ SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8)
db $ff
-SilphCo3Text1: ; 59fe5 (16:5fe5)
+SilphCo3Text1:
TX_ASM
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SilphCo3Text_59ffe
@@ -92,46 +92,46 @@ SilphCo3Text1: ; 59fe5 (16:5fe5)
call PrintText
jp TextScriptEnd
-SilphCo3Text_59ff9: ; 59ff9 (16:5ff9)
+SilphCo3Text_59ff9:
TX_FAR _SilphCo3Text_59ff9
db "@"
-SilphCo3Text_59ffe: ; 59ffe (16:5ffe)
+SilphCo3Text_59ffe:
TX_FAR _SilphCo3Text_59ffe
db "@"
-SilphCo3Text2: ; 5a003 (16:6003)
+SilphCo3Text2:
TX_ASM
ld hl, SilphCo3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-SilphCo3BattleText1: ; 5a00d (16:600d)
+SilphCo3BattleText1:
TX_FAR _SilphCo3BattleText1
db "@"
-SilphCo3EndBattleText1: ; 5a012 (16:6012)
+SilphCo3EndBattleText1:
TX_FAR _SilphCo3EndBattleText1
db "@"
-SilphCo3AfterBattleText1: ; 5a017 (16:6017)
+SilphCo3AfterBattleText1:
TX_FAR _SilphCo3AfterBattleText1
db "@"
-SilphCo3Text3: ; 5a01c (16:601c)
+SilphCo3Text3:
TX_ASM
ld hl, SilphCo3TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
-SilphCo3BattleText2: ; 5a026 (16:6026)
+SilphCo3BattleText2:
TX_FAR _SilphCo3BattleText2
db "@"
-SilphCo3EndBattleText2: ; 5a02b (16:602b)
+SilphCo3EndBattleText2:
TX_FAR _SilphCo3EndBattleText2
db "@"
-SilphCo3AfterBattleText2: ; 5a030 (16:6030)
+SilphCo3AfterBattleText2:
TX_FAR _SilphCo3AfterBattleText2
db "@"