summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_4F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SilphCo_4F/scripts.inc')
-rw-r--r--data/maps/SilphCo_4F/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc
index 884f2e410..176b6a4d3 100644
--- a/data/maps/SilphCo_4F/scripts.inc
+++ b/data/maps/SilphCo_4F/scripts.inc
@@ -3,17 +3,17 @@ SilphCo_4F_MapScripts:: @ 8161736
.byte 0
SilphCo_4F_MapScript1_16173C:: @ 816173C
- checkflag FLAG_0x27E
- call_if 0, EventScript_1A8213
- checkflag FLAG_0x27F
- call_if 0, EventScript_1A8241
+ checkflag FLAG_SILPH_4F_DOOR_1
+ call_if FALSE, EventScript_1A8213
+ checkflag FLAG_SILPH_4F_DOOR_2
+ call_if FALSE, EventScript_1A8241
end
SilphCo_4F_EventScript_16174F:: @ 816174F
lock
faceplayer
- compare_var_to_value VAR_0x4060, 1
- goto_if 4, EventScript_161766
+ compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1
+ goto_if ge, EventScript_161766
msgbox gUnknown_81759F5
release
end
@@ -28,16 +28,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770
end
SilphCo_4F_EventScript_161779:: @ 8161779
- trainerbattle 0, 339, 0, Text_175A90, Text_175AB0
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0
msgbox gUnknown_8175AC8, 6
end
SilphCo_4F_EventScript_161790:: @ 8161790
- trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B
msgbox gUnknown_8175A62, 6
end
SilphCo_4F_EventScript_1617A7:: @ 81617A7
- trainerbattle 0, 377, 0, Text_175B19, Text_175B2B
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B
msgbox gUnknown_8175B38, 6
end