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 /main.asm | |
| parent | 7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff) | |
| parent | d31dbfc7804cc0fa0a48a28779b8f9db1a0032c8 (diff) | |
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -19116,9 +19116,9 @@ BoxNameInputUpper: INCBIN "baserom.gbc", $11e5d, $122c1 - $11e5d UnknownScript_0x122c1: ; 0x122c1 - checkbit2 $0011 + checkflag $0011 iffalse .script_122cd - setbit2 $0051 + setflag $0051 special $0017 .script_122cd end @@ -19409,7 +19409,7 @@ UnknownScript_0x124c8: ; 0x124c8 special $002e pause 40 special $001b - checkbit2 $0011 + checkflag $0011 iftrue .script_64f2 3callasm BANK(HalveMoney), HalveMoney 3callasm BANK(Function12527), Function12527 @@ -54426,7 +54426,7 @@ UnknownScript_0x506c8: ; 0x506c8 closetext 3callasm BANK(Function506ef), Function506ef iffalse UnknownScript_0x506e9 - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x506e5 battlecheck startbattle |