summaryrefslogtreecommitdiff
path: root/maps/Route42.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2015-07-10 02:36:57 -0600
committerIIMarckus <iimarckus@gmail.com>2015-07-10 02:36:57 -0600
commit718c2260e90e61b09bca085f7276ca889c2223b7 (patch)
tree921ed86c6f34bd44f1e8a3cbc7816da66137d4d2 /maps/Route42.asm
parent2c98c694e3f1ab7c82c73eaa671d281803130ae7 (diff)
Use constants for overworld phone script flags.
Diffstat (limited to 'maps/Route42.asm')
-rw-r--r--maps/Route42.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 17c48a855..d660e35bc 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -50,9 +50,9 @@ FisherTully1Script:
writecode VAR_CALLERID, $1d
talkaftercancel
loadfont
- checkflag $0076
+ checkflag ENGINE_TULLY
iftrue UnknownScript_0x1a927f
- checkflag $0084
+ checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue UnknownScript_0x1a92dc
checkcellnum $1d
iftrue UnknownScript_0x1a92fd
@@ -96,7 +96,7 @@ UnknownScript_0x1a92ac:
startbattle
returnafterbattle
loadvar wda06, $1
- clearflag $0076
+ clearflag ENGINE_TULLY
end
UnknownScript_0x1a92b9:
@@ -104,7 +104,7 @@ UnknownScript_0x1a92b9:
startbattle
returnafterbattle
loadvar wda06, $2
- clearflag $0076
+ clearflag ENGINE_TULLY
end
UnknownScript_0x1a92c6:
@@ -112,21 +112,21 @@ UnknownScript_0x1a92c6:
startbattle
returnafterbattle
loadvar wda06, $3
- clearflag $0076
+ clearflag ENGINE_TULLY
end
UnknownScript_0x1a92d3:
loadtrainer FISHER, TULLY4
startbattle
returnafterbattle
- clearflag $0076
+ clearflag ENGINE_TULLY
end
UnknownScript_0x1a92dc:
scall UnknownScript_0x1a930d
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1a92ee
- clearflag $0084
+ clearflag ENGINE_TULLY_HAS_WATER_STONE
setevent $0103
jump UnknownScript_0x1a92fd