diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/MtChimney.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/MtChimney.inc')
| -rw-r--r-- | data/scripts/maps/MtChimney.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d7a2ed83a..e445fc23f 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -35,7 +35,7 @@ MtChimney_EventScript_22EE02:: @ 822EE02 MtChimney_EventScript_22EE0B:: @ 822EE0B lockall - playbgm BGM_MGM0, 0 + playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, 4 applymovement 2, MtChimney_Movement_27259E waitmovement 0 @@ -58,17 +58,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEC7 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, 4 closemessage - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_0x39E @@ -104,17 +104,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 faceplayer showmoneybox 0, 0, 0 msgbox MtChimney_Text_22FE04, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 msgbox MtChimney_Text_22FE4D, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF51 hidemoneybox nop @@ -459,7 +459,7 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, 4 giveitem_std ITEM_METEORITE @@ -488,8 +488,8 @@ MtChimney_EventScript_22F141:: @ 822F141 MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, 4 release @@ -533,8 +533,8 @@ MtChimney_EventScript_22F1F1:: @ 822F1F1 MtChimney_EventScript_22F208:: @ 822F208 trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, 4 release |