summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_11F
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-10 03:19:11 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-10 03:50:11 -0500
commit9fafa122851dc4eecdefde2b36b88be6572656f0 (patch)
tree7b74f475c0a2b01169c9aec62d04a85cc1103ad3 /data/maps/SilphCo_11F
parent29e4446a03b83a822f5dd8b11b60728cadbcb0f6 (diff)
More basic script constants
Diffstat (limited to 'data/maps/SilphCo_11F')
-rw-r--r--data/maps/SilphCo_11F/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
index 65d67dc2d..05f52646e 100644
--- a/data/maps/SilphCo_11F/scripts.inc
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -11,12 +11,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE
faceplayer
goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75
checkplayergender
- compare VAR_RESULT, 0
+ compare VAR_RESULT, MALE
call_if_eq EventScript_161E59
- compare VAR_RESULT, 1
+ compare VAR_RESULT, FEMALE
call_if_eq EventScript_161E62
checkitemspace ITEM_MASTER_BALL, 1
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_161E6B
giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5
msgbox gUnknown_8176FEB
@@ -77,11 +77,11 @@ EventScript_161EA0:: @ 8161EA0
trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB
msgbox gUnknown_81771C2
closemessage
- fadescreen 1
+ fadescreen FADE_TO_BLACK
removeobject 3
removeobject 4
removeobject 6
- fadescreen 0
+ fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_SILPH_CO_11F, 1
setflag FLAG_HIDE_SAFFRON_ROCKETS
clearflag FLAG_HIDE_SAFFRON_CIVILIANS