summaryrefslogtreecommitdiff
path: root/maps/Route25.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-30 23:17:04 -0700
committerBryan Bishop <kanzure@gmail.com>2013-09-30 23:17:04 -0700
commit94d4c89e093b76a0964114bd7a370046e70e965e (patch)
treeff6a162f91628d6e05eb14144448ea5c1c4d80fa /maps/Route25.asm
parent7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff)
parentd31dbfc7804cc0fa0a48a28779b8f9db1a0032c8 (diff)
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
Diffstat (limited to 'maps/Route25.asm')
-rw-r--r--maps/Route25.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 9aa6a9a6e..bdf40c419 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -39,7 +39,7 @@ UnknownScript_0x19eea0: ; 0x19eea0
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
- clearbit1 $076f
+ clearevent $076f
dotrigger $0
special $003d
end
@@ -66,7 +66,7 @@ UnknownScript_0x19eee0: ; 0x19eee0
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
- clearbit1 $076f
+ clearevent $076f
dotrigger $0
special $003d
end
@@ -278,15 +278,15 @@ SupernerdPatScript: ; 0x19efa4
CooltrainerMScript_0x19efac: ; 0x19efac
faceplayer
loadfont
- checkbit1 $0558
+ checkevent $0558
iftrue UnknownScript_0x19efda
- checkbit1 EVENT_CLEARED_NUGGET_BRIDGE
+ checkevent EVENT_CLEARED_NUGGET_BRIDGE
iftrue UnknownScript_0x19efc7
2writetext UnknownText_0x19f43b
keeptextopen
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x19efde
- setbit1 EVENT_CLEARED_NUGGET_BRIDGE
+ setevent EVENT_CLEARED_NUGGET_BRIDGE
UnknownScript_0x19efc7: ; 0x19efc7
2writetext UnknownText_0x19f49d
closetext
@@ -295,7 +295,7 @@ UnknownScript_0x19efc7: ; 0x19efc7
loadtrainer COOLTRAINERM, KEVIN
startbattle
returnafterbattle
- setbit1 $0558
+ setevent $0558
loadfont
UnknownScript_0x19efda: ; 0x19efda
2writetext UnknownText_0x19f520