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/MountMoon.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/MountMoon.asm')
| -rw-r--r-- | maps/MountMoon.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index f3c760189..10466e763 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -30,9 +30,9 @@ UnknownScript_0x7408e: ; 0x7408e 2writetext UnknownText_0x74105 closetext loadmovesprites - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x740c3 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x740d3 winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 @@ -72,7 +72,7 @@ UnknownScript_0x740e3: ; 0x740e3 applymovement $2, MovementData_0x740fd disappear $2 dotrigger $1 - setbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end ; 0x740f9 |