diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-30 23:17:04 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-30 23:17:04 -0700 |
| commit | 94d4c89e093b76a0964114bd7a370046e70e965e (patch) | |
| tree | ff6a162f91628d6e05eb14144448ea5c1c4d80fa /maps/Route40.asm | |
| parent | 7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff) | |
| parent | d31dbfc7804cc0fa0a48a28779b8f9db1a0032c8 (diff) | |
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
Diffstat (limited to 'maps/Route40.asm')
| -rw-r--r-- | maps/Route40.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm index 6b03735d1..bece0f561 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -11,7 +11,7 @@ Route40_MapScriptHeader: ; 0x1a6160 ; 0x1a6165 UnknownScript_0x1a6165: ; 0x1a6165 - clearbit1 $07cf + clearevent $07cf checkcode $b if_equal MONDAY, UnknownScript_0x1a6171 disappear $a @@ -164,21 +164,21 @@ StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 BuenaScript_0x1a61d9: ; 0x1a61d9 faceplayer loadfont - checkbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA + checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue UnknownScript_0x1a6207 checkcode $b if_not_equal MONDAY, UnknownScript_0x1a620d - checkbit1 EVENT_MET_MONICA_OF_MONDAY + checkevent EVENT_MET_MONICA_OF_MONDAY iftrue UnknownScript_0x1a61f4 2writetext UnknownText_0x1a6606 keeptextopen - setbit1 EVENT_MET_MONICA_OF_MONDAY + setevent EVENT_MET_MONICA_OF_MONDAY UnknownScript_0x1a61f4: ; 0x1a61f4 2writetext UnknownText_0x1a6636 keeptextopen verbosegiveitem SHARP_BEAK, 1 iffalse UnknownScript_0x1a620b - setbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA + setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA 2writetext UnknownText_0x1a666c closetext loadmovesprites |