diff options
| author | huderlem <huderlem@gmail.com> | 2019-01-03 20:37:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 20:37:25 -0600 |
| commit | cba2f81bf870734960492b2d586d5a0684d99cf5 (patch) | |
| tree | 5845c0ad7355d3568637287b19796be4668d1b36 /data/maps/JaggedPass | |
| parent | fd201f8395fccaf26349b352d3b0eda98bec8593 (diff) | |
| parent | 97ebeef1dbe8b4954d234fda067651f63d7e6360 (diff) | |
Merge pull request #507 from Tetrable/master
Finish off labeling flags
Diffstat (limited to 'data/maps/JaggedPass')
| -rw-r--r-- | data/maps/JaggedPass/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index a140093ca..93788a703 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -68,7 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB JaggedPass_EventScript_230718:: @ 8230718 lockall - goto_if_set FLAG_0x139, JaggedPass_EventScript_230766 + goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN applymovement 5, JaggedPass_Movement_272598 @@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D - setflag FLAG_0x139 + setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 releaseall |