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/MtChimney.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/MtChimney.inc')
| -rw-r--r-- | data/scripts/maps/MtChimney.inc | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index fdebcf102..ac7c00013 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -4,57 +4,57 @@ MtChimney_MapScripts:: @ 815CF7C .byte 0 MtChimney_MapScript1_15CF87:: @ 815CF87 - setvar 0x40bd, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 call MtChimney_EventScript_1A0196 end MtChimney_MapScript1_15CF92:: @ 815CF92 - tileeffect 1 + setstepcallback 1 end MtChimney_EventScript_15CF95:: @ 815CF95 lock faceplayer - showmoney 0, 0 - snop - msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 - jumpeq MtChimney_EventScript_15D00B + showmoneybox 0, 0 + nop + msgbox MtChimney_Text_195760, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D018 + goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - callif 1, MtChimney_EventScript_15D000 - giveitem ITEM_LAVA_COOKIE + call_if_eq MtChimney_EventScript_15D000 + giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 - jumpeq MtChimney_EventScript_15CFF3 - hidemoney 0, 0 + goto_if_eq MtChimney_EventScript_15CFF3 + hidemoneybox 0, 0 release end MtChimney_EventScript_15CFF3:: @ 815CFF3 msgbox MtChimney_Text_1A0CC2, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D000:: @ 815D000 - paymoney 0xc8, 0 - updatemoney 0, 0 - snop + takemoney 0xc8, 0 + updatemoneybox 0, 0 + nop return MtChimney_EventScript_15D00B:: @ 815D00B msgbox MtChimney_Text_1957F7, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D018:: @ 815D018 msgbox MtChimney_Text_1957BA, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end @@ -406,16 +406,14 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag 139 - jumpif 0, MtChimney_EventScript_15D1D0 - checkflag 115 - jumpeq MtChimney_EventScript_15D1C6 - msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 - jumpeq MtChimney_EventScript_15D1BC + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 + msgbox MtChimney_Text_195870, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem ITEM_METEORITE - setflag 115 + giveitem_std ITEM_METEORITE + setflag FLAG_RECEIVED_METEORITE releaseall end @@ -440,9 +438,9 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq MtChimney_EventScript_15D20A + goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end |