diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/scripts/maps/MtPyre_1F.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/MtPyre_1F.inc')
| -rw-r--r-- | data/scripts/maps/MtPyre_1F.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 805c4a8d3..f34c31da0 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,13 +4,12 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag 282 - jumpeq MtPyre_1F_EventScript_15D352 + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem ITEM_CLEANSE_TAG + giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 - jumpeq MtPyre_1F_EventScript_1A029B - setflag 282 + goto_if_eq MtPyre_1F_EventScript_1A029B + setflag FLAG_RECEIVED_CLEANSE_TAG release end |