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/MossdeepCity.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/MossdeepCity.inc')
| -rw-r--r-- | data/scripts/maps/MossdeepCity.inc | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index ddb317364..7ec338927 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -3,12 +3,11 @@ MossdeepCity_MapScripts:: @ 814CF92 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 - clearflag 100 - clearflag 101 - clearflag 102 - clearflag 103 - checkflag 2090 - callif 1, MossdeepCity_EventScript_1A02C1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -52,32 +51,31 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF end MossdeepCity_EventScript_14D008:: @ 814D008 - setflag 2076 - setvar 0x4001, 1 + setflag FLAG_VISITED_MOSSDEEP_CITY + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_14D011:: @ 814D011 lock faceplayer msgbox MossdeepCity_Text_16944E, 4 - move LAST_TALKED, MossdeepCity_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_Movement_1A083D + waitmovement 0 release end MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag 276 - jumpeq MossdeepCity_EventScript_14D069 - msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 - jumpeq MossdeepCity_EventScript_14D073 + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 + msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem ITEM_KINGS_ROCK + giveitem_std ITEM_KINGS_ROCK compare RESULT, 0 - jumpeq MossdeepCity_EventScript_1A029B - setflag 276 + goto_if_eq MossdeepCity_EventScript_1A029B + setflag FLAG_RECEIVED_KINGS_ROCK release end |