diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /data/scripts/maps/FallarborTown.inc | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'data/scripts/maps/FallarborTown.inc')
| -rw-r--r-- | data/scripts/maps/FallarborTown.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 13c8a9f2e..8ea580e28 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -3,16 +3,16 @@ FallarborTown_MapScripts:: @ 814E7E0 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 - setflag 2067 + setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 - setflag 800 - clearflag 270 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + clearflag FLAG_CONTEST_SKETCH_CREATED end FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release @@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 - waitpokecry + waitmoncry release end |