summaryrefslogtreecommitdiff
path: root/scripts/pokemontower5.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 17:24:04 -0700
committerYamaArashi <shadow962@live.com>2016-06-11 17:24:04 -0700
commit7f34e28f242ee4d0caba0bd96b040811dcb86c50 (patch)
tree8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/pokemontower5.asm
parentcee4d559f999312837da7d69e2c6704e85c159d4 (diff)
remove address comments
Diffstat (limited to 'scripts/pokemontower5.asm')
-rwxr-xr-xscripts/pokemontower5.asm56
1 files changed, 28 insertions, 28 deletions
diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm
index 6a2f5758..82b912b5 100755
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5Script: ; 60932 (18:4932)
+PokemonTower5Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower5TrainerHeaders
ld de, PokemonTower5ScriptPointers
@@ -7,12 +7,12 @@ PokemonTower5Script: ; 60932 (18:4932)
ld [wPokemonTower5CurScript], a
ret
-PokemonTower5ScriptPointers: ; 60945 (18:4945)
+PokemonTower5ScriptPointers:
dw PokemonTower5Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-PokemonTower5Script0: ; 6094b (18:494b)
+PokemonTower5Script0:
ld hl, CoordsData_60992
call ArePlayerCoordsInArray
jr c, .asm_60960
@@ -41,14 +41,14 @@ PokemonTower5Script0: ; 6094b (18:494b)
ld [wJoyIgnore], a
ret
-CoordsData_60992: ; 60992 (18:4992)
+CoordsData_60992:
db $08,$0A
db $08,$0B
db $09,$0A
db $09,$0B
db $FF
-PokemonTower5TextPointers: ; 6099b (18:499b)
+PokemonTower5TextPointers:
dw PokemonTower5Text1
dw PokemonTower5Text2
dw PokemonTower5Text3
@@ -57,8 +57,8 @@ PokemonTower5TextPointers: ; 6099b (18:499b)
dw PickUpItemText
dw PokemonTower5Text7
-PokemonTower5TrainerHeaders: ; 609a9 (18:49a9)
-PokemonTower5TrainerHeader0: ; 609a9 (18:49a9)
+PokemonTower5TrainerHeaders:
+PokemonTower5TrainerHeader0:
dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
@@ -67,7 +67,7 @@ PokemonTower5TrainerHeader0: ; 609a9 (18:49a9)
dw PokemonTower5EndBattleText1 ; TextEndBattle
dw PokemonTower5EndBattleText1 ; TextEndBattle
-PokemonTower5TrainerHeader1: ; 609b5 (18:49b5)
+PokemonTower5TrainerHeader1:
dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1
@@ -76,7 +76,7 @@ PokemonTower5TrainerHeader1: ; 609b5 (18:49b5)
dw PokemonTower5EndBattleText2 ; TextEndBattle
dw PokemonTower5EndBattleText2 ; TextEndBattle
-PokemonTower5TrainerHeader2: ; 609c1 (18:49c1)
+PokemonTower5TrainerHeader2:
dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2
@@ -85,7 +85,7 @@ PokemonTower5TrainerHeader2: ; 609c1 (18:49c1)
dw PokemonTower5EndBattleText3 ; TextEndBattle
dw PokemonTower5EndBattleText3 ; TextEndBattle
-PokemonTower5TrainerHeader3: ; 609cd (18:49cd)
+PokemonTower5TrainerHeader3:
dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3
@@ -96,82 +96,82 @@ PokemonTower5TrainerHeader3: ; 609cd (18:49cd)
db $ff
-PokemonTower5Text1: ; 609da (18:49da)
+PokemonTower5Text1:
TX_FAR _PokemonTower5Text1
db "@"
-PokemonTower5Text2: ; 609df (18:49df)
+PokemonTower5Text2:
TX_ASM
ld hl, PokemonTower5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-PokemonTower5BattleText1: ; 609e9 (18:49e9)
+PokemonTower5BattleText1:
TX_FAR _PokemonTower5BattleText1
db "@"
-PokemonTower5EndBattleText1: ; 609ee (18:49ee)
+PokemonTower5EndBattleText1:
TX_FAR _PokemonTower5EndBattleText1
db "@"
-PokemonTower5AfterBattleText1: ; 609f3 (18:49f3)
+PokemonTower5AfterBattleText1:
TX_FAR _PokemonTower5AfterBattleText1
db "@"
-PokemonTower5Text3: ; 609f8 (18:49f8)
+PokemonTower5Text3:
TX_ASM
ld hl, PokemonTower5TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
-PokemonTower5BattleText2: ; 60a02 (18:4a02)
+PokemonTower5BattleText2:
TX_FAR _PokemonTower5BattleText2
db "@"
-PokemonTower5EndBattleText2: ; 60a07 (18:4a07)
+PokemonTower5EndBattleText2:
TX_FAR _PokemonTower5EndBattleText2
db "@"
-PokemonTower5AfterBattleText2: ; 60a0c (18:4a0c)
+PokemonTower5AfterBattleText2:
TX_FAR _PokemonTower5AfterBattleText2
db "@"
-PokemonTower5Text4: ; 60a11 (18:4a11)
+PokemonTower5Text4:
TX_ASM
ld hl, PokemonTower5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-PokemonTower5BattleText3: ; 60a1b (18:4a1b)
+PokemonTower5BattleText3:
TX_FAR _PokemonTower5BattleText3
db "@"
-PokemonTower5EndBattleText3: ; 60a20 (18:4a20)
+PokemonTower5EndBattleText3:
TX_FAR _PokemonTower5EndBattleText3
db "@"
-PokemonTower5AfterBattleText3: ; 60a25 (18:4a25)
+PokemonTower5AfterBattleText3:
TX_FAR _PokemonTower5AfterBattleText3
db "@"
-PokemonTower5Text5: ; 60a2a (18:4a2a)
+PokemonTower5Text5:
TX_ASM
ld hl, PokemonTower5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-PokemonTower5BattleText4: ; 60a34 (18:4a34)
+PokemonTower5BattleText4:
TX_FAR _PokemonTower5BattleText4
db "@"
-PokemonTower5EndBattleText4: ; 60a39 (18:4a39)
+PokemonTower5EndBattleText4:
TX_FAR _PokemonTower5EndBattleText4
db "@"
-PokemonTower5AfterBattleText4: ; 60a3e (18:4a3e)
+PokemonTower5AfterBattleText4:
TX_FAR _PokemonTower5AfterBattleText4
db "@"
-PokemonTower5Text7: ; 60a43 (18:4a43)
+PokemonTower5Text7:
TX_FAR _PokemonTower5Text7
db "@"