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/DayCare.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/DayCare.asm')
| -rw-r--r-- | maps/DayCare.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 2c05823e4..0fc1f13ee 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -11,23 +11,23 @@ DayCare_MapScriptHeader: ; 0x62f76 ; 0x62f7b UnknownScript_0x62f7b: ; 0x62f7b - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x62f88 - clearbit1 $06e5 - setbit1 $06e6 + clearevent $06e5 + setevent $06e6 return ; 0x62f88 UnknownScript_0x62f88: ; 0x62f88 - setbit1 $06e5 - clearbit1 $06e6 + setevent $06e5 + clearevent $06e6 return ; 0x62f8f GrampsScript_0x62f8f: ; 0x62f8f faceplayer loadfont - checkbit1 EVENT_GOT_ODD_EGG + checkevent EVENT_GOT_ODD_EGG iftrue UnknownScript_0x62fbd 2writetext UnknownText_0x630ce keeptextopen @@ -42,7 +42,7 @@ GrampsScript_0x62f8f: ; 0x62f8f 2writetext UnknownText_0x631c3 closetext loadmovesprites - setbit1 EVENT_GOT_ODD_EGG + setevent EVENT_GOT_ODD_EGG end ; 0x62fb6 @@ -64,7 +64,7 @@ UnknownScript_0x62fbd: ; 0x62fbd GrannyScript_0x62fc3: ; 0x62fc3 faceplayer loadfont - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x62fd1 special $001f closetext |