diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 03:19:11 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 03:50:11 -0500 |
| commit | 9fafa122851dc4eecdefde2b36b88be6572656f0 (patch) | |
| tree | 7b74f475c0a2b01169c9aec62d04a85cc1103ad3 /data/maps/CeruleanCity | |
| parent | 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 (diff) | |
More basic script constants
Diffstat (limited to 'data/maps/CeruleanCity')
| -rw-r--r-- | data/maps/CeruleanCity/scripts.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index a266a6c93..2e75b82b4 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -170,8 +170,7 @@ Movement_1665FB:: @ 81665FB CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if_eq EventScript_16662E + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 @@ -184,14 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_166677 giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 - fadescreen 0 + fadescreen FADE_FROM_BLACK setflag FLAG_GOT_TM28_FROM_ROCKET release end |