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/FiveIsland_RocketWarehouse | |
| parent | 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 (diff) | |
More basic script constants
Diffstat (limited to 'data/maps/FiveIsland_RocketWarehouse')
| -rw-r--r-- | data/maps/FiveIsland_RocketWarehouse/scripts.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 1ad6a2991..aa54456f0 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -8,8 +8,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 end FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D - checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if_eq EventScript_163F47 + call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -80,13 +79,13 @@ EventScript_16402F:: @ 816402F call_if_le EventScript_164065 msgbox gUnknown_817BA64 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 1 removeobject 2 removeobject 4 removeobject 3 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE release |