summaryrefslogtreecommitdiff
path: root/data/scripts/maps/FallarborTown.inc
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-10-08 23:54:46 -0400
committerGitHub <noreply@github.com>2017-10-08 23:54:46 -0400
commitb0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch)
treebe0dadd4cb3a6c36e27233836a6f104359d49949 /data/scripts/maps/FallarborTown.inc
parentb21c159b08c57a948edb268ac9b9b5baf6b4332d (diff)
parent3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff)
Merge branch 'master' into scaninc
Diffstat (limited to 'data/scripts/maps/FallarborTown.inc')
-rw-r--r--data/scripts/maps/FallarborTown.inc6
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