diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
| commit | 3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch) | |
| tree | 9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /data/scripts/magma_chimney.inc | |
| parent | 501482beadd05c5ade13f6919c3c2cd42c86952d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
fix merge conflicts
Diffstat (limited to 'data/scripts/magma_chimney.inc')
| -rw-r--r-- | data/scripts/magma_chimney.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index d104b52d4..11f42daf0 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -37,7 +37,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif applymovement 2, MtChimney_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 2, MtChimney_Movement_1A0833 waitmovement 0 applymovement 2, MtChimney_Movement_1A0835 |