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/SaffronGym.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/SaffronGym.asm')
| -rw-r--r-- | maps/SaffronGym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 52499a2f7..a888d34b7 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -9,7 +9,7 @@ SaffronGym_MapScriptHeader: ; 0x189c2c SabrinaScript_0x189c2e: ; 0x189c2e faceplayer loadfont - checkbit2 $0028 + checkflag $0028 iftrue UnknownScript_0x189c65 2writetext UnknownText_0x189cdf closetext @@ -18,16 +18,16 @@ SabrinaScript_0x189c2e: ; 0x189c2e loadtrainer SABRINA, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_SABRINA - setbit1 EVENT_BEAT_MEDIUM_REBECCA - setbit1 EVENT_BEAT_MEDIUM_DORIS - setbit1 EVENT_BEAT_PSYCHIC_FRANKLIN - setbit1 EVENT_BEAT_PSYCHIC_JARED + setevent EVENT_BEAT_SABRINA + setevent EVENT_BEAT_MEDIUM_REBECCA + setevent EVENT_BEAT_MEDIUM_DORIS + setevent EVENT_BEAT_PSYCHIC_FRANKLIN + setevent EVENT_BEAT_PSYCHIC_JARED loadfont 2writetext UnknownText_0x189e95 playsound $009c waitbutton - setbit2 $0028 + setflag $0028 2writetext UnknownText_0x189ead closetext loadmovesprites @@ -160,7 +160,7 @@ PsychicJaredScript: ; 0x189cb3 SaffronGymGuyScript: ; 0x189cbb faceplayer loadfont - checkbit1 EVENT_BEAT_SABRINA + checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript 2writetext SaffronGymGuyText closetext @@ -175,7 +175,7 @@ SaffronGymGuyScript: ; 0x189cbb ; 0x189ccf MapSaffronGymSignpost0Script: ; 0x189ccf - checkbit2 $0028 + checkflag $0028 iftrue UnknownScript_0x189cd8 jumpstd $002d ; 0x189cd8 |