diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:48:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:52:40 -0400 |
| commit | 0685dd4920c64eae6bcfbc9f201854b4da91bfab (patch) | |
| tree | f759feaf819167d436ab4fde480eca35ba591b04 /data/scripts/maps/FallarborTown.inc | |
| parent | d0fbed6ad50c34593002c2b540c4e3e7f4c5cd16 (diff) | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'data/scripts/maps/FallarborTown.inc')
| -rw-r--r-- | data/scripts/maps/FallarborTown.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index a48be5b24..13c8a9f2e 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -13,7 +13,7 @@ FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer checkflag 139 - jumpeq FallarborTown_EventScript_14E80A + goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end @@ -34,8 +34,8 @@ FallarborTown_EventScript_14E81D:: @ 814E81D FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer - checksound - pokecry SPECIES_AZURILL, 0 + waitse + playpokecry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 waitpokecry release |