diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-19 19:46:39 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-19 19:46:39 -0400 |
| commit | 707020f9be6548b2ea24eda0819c6202b3531571 (patch) | |
| tree | 967db990ad0e4cb81fa5db41d89233af15769f53 /engine/phone_scripts.asm | |
| parent | 5b9ba5d921c7d389edc0a72a520df09d8d3ec3a1 (diff) | |
| parent | 9ce74b3d2c7b0a6a678e234fd06dd898e1e372d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/phone_scripts.asm')
| -rw-r--r-- | engine/phone_scripts.asm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index e8af05f36..bcfec65e0 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1,6 +1,3 @@ -SWARM_DUNSPARCE EQU 0 -SWARM_YANMA EQU 1 - UnusedPhoneScript: ; 0xbcea5 farwritetext UnusedPhoneText end @@ -832,7 +829,7 @@ Ralph_SetUpSwarm: setflag ENGINE_SPECIAL_WILDDATA pokenamemem QWILFISH, $1 landmarktotext ROUTE_32, $2 - writebyte $1 + writebyte FISHSWARM_QWILFISH special Special_ActivateFishingSwarm farjump UnknownScript_0xa05d6 |