summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_8F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SilphCo_8F/scripts.inc')
-rw-r--r--data/maps/SilphCo_8F/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
index 99112ee5e..70bc954cc 100644
--- a/data/maps/SilphCo_8F/scripts.inc
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -3,15 +3,15 @@ SilphCo_8F_MapScripts:: @ 8161C5F
.byte 0
SilphCo_8F_MapScript1_161C65:: @ 8161C65
- checkflag FLAG_0x287
- call_if 0, EventScript_1A83D5
+ checkflag FLAG_SILPH_8F_DOOR
+ call_if FALSE, EventScript_1A83D5
end
SilphCo_8F_EventScript_161C6F:: @ 8161C6F
lock
faceplayer
- compare_var_to_value VAR_0x4060, 1
- goto_if 4, EventScript_161C86
+ compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1
+ goto_if ge, EventScript_161C86
msgbox gUnknown_817696D
release
end
@@ -26,16 +26,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90
end
SilphCo_8F_EventScript_161C99:: @ 8161C99
- trainerbattle 0, 343, 0, Text_1769FD, Text_176A19
+ trainerbattle 0, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19
msgbox gUnknown_8176A26, 6
end
SilphCo_8F_EventScript_161CB0:: @ 8161CB0
- trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE
+ trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE
msgbox gUnknown_81769CF, 6
end
SilphCo_8F_EventScript_161CC7:: @ 8161CC7
- trainerbattle 0, 386, 0, Text_176A56, Text_176A7C
+ trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C
msgbox gUnknown_8176A90, 6
end