summaryrefslogtreecommitdiff
path: root/maps/Route37.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/Route37.asm
parent7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff)
parentd31dbfc7804cc0fa0a48a28779b8f9db1a0032c8 (diff)
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
Diffstat (limited to 'maps/Route37.asm')
-rw-r--r--maps/Route37.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route37.asm b/maps/Route37.asm
index c70e38521..55c9cf340 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -112,17 +112,17 @@ PsychicGregScript: ; 0x1a8db7
BugCatcherScript_0x1a8dbf: ; 0x1a8dbf
faceplayer
loadfont
- checkbit1 EVENT_GOT_MAGNET_FROM_SUNNY
+ checkevent EVENT_GOT_MAGNET_FROM_SUNNY
iftrue UnknownScript_0x1a8dfa
checkcode $b
if_not_equal SUNDAY, UnknownScript_0x1a8e00
- checkbit1 EVENT_MET_SUNNY_OF_SUNDAY
+ checkevent EVENT_MET_SUNNY_OF_SUNDAY
iftrue UnknownScript_0x1a8dda
2writetext UnknownText_0x1a8fc8
keeptextopen
- setbit1 EVENT_MET_SUNNY_OF_SUNDAY
+ setevent EVENT_MET_SUNNY_OF_SUNDAY
UnknownScript_0x1a8dda: ; 0x1a8dda
- checkbit2 $0063
+ checkflag $0063
iftrue UnknownScript_0x1a8de7
2writetext UnknownText_0x1a9004
keeptextopen
@@ -135,7 +135,7 @@ UnknownScript_0x1a8de7: ; 0x1a8de7
UnknownScript_0x1a8deb: ; 0x1a8deb
verbosegiveitem MAGNET, 1
iffalse UnknownScript_0x1a8dfe
- setbit1 EVENT_GOT_MAGNET_FROM_SUNNY
+ setevent EVENT_GOT_MAGNET_FROM_SUNNY
2writetext UnknownText_0x1a905a
closetext
loadmovesprites