summaryrefslogtreecommitdiff
path: root/data/maps/FallarborTown/scripts.inc
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2019-01-05 19:54:26 +0000
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2019-01-05 19:54:26 +0000
commitf8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch)
tree81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /data/maps/FallarborTown/scripts.inc
parentee5a239534d7c4bd64ce7ced4146204579f5d598 (diff)
parentcbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'data/maps/FallarborTown/scripts.inc')
-rw-r--r--data/maps/FallarborTown/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 7b157c5f3..5e06ed4cb 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -5,13 +5,13 @@ FallarborTown_MapScripts:: @ 81EB1FA
FallarborTown_MapScript1_1EB200: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_0x4086, 0
- clearflag FLAG_0x10E
+ clearflag FLAG_CONTEST_SKETCH_CREATED
end
FallarborTown_EventScript_1EB20C:: @ 81EB20C
lock
faceplayer
- goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221
+ goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221
msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT
release
end