diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
| commit | 79c64d2b7137f12cccf290ea7f495727ad6b4cca (patch) | |
| tree | b2022ddfbc867bab3802465afbbdc7c3843460a9 /data/scripts/magma_chimney.inc | |
| parent | fd42bcc78ce229d13afc26af4c6d2dd0187b871d (diff) | |
| parent | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'data/scripts/magma_chimney.inc')
| -rw-r--r-- | data/scripts/magma_chimney.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 11f42daf0..ed81e6628 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -1,10 +1,8 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 0, MtChimney_EventScript_1B2CB9 - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 1, MtChimney_EventScript_1B2CC2 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9 + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2 closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 @@ -68,9 +66,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB setobjectxyperm 1, 10, 12 addobject 1 compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D7D + call_if_eq MtChimney_EventScript_1B2D7D compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D88 + call_if_eq MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -80,9 +78,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif closemessage compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D93 + call_if_eq MtChimney_EventScript_1B2D93 compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D9E + call_if_eq MtChimney_EventScript_1B2D9E removeobject 1 setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY |