summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-14 20:10:36 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-12-14 20:10:36 -0800
commit8d346b1baba8296f1a795b9add8f8f5ca5108d9f (patch)
tree03c740e3d7fbbf8d31d3f2fd2a8484a083a3d44c /data/scripts
parent58bf5392b36bc3a5c3559f218aff9f751dd90a64 (diff)
A few more flags
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/maps/NewMauville_Inside.inc6
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 62b8f4d59..1b55cde28 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -169,7 +169,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
playpokecry SPECIES_VOLTORB, 2
delay 40
waitpokecry
- setflag 974
+ setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
setflag SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag SYS_CTRL_OBJ_DELETE
@@ -184,7 +184,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
playpokecry SPECIES_VOLTORB, 2
delay 40
waitpokecry
- setflag 975
+ setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
setflag SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag SYS_CTRL_OBJ_DELETE
@@ -199,7 +199,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
playpokecry SPECIES_VOLTORB, 2
delay 40
waitpokecry
- setflag 976
+ setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
setflag SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag SYS_CTRL_OBJ_DELETE
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index fa19ee504..b66d4245d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -195,7 +195,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
- clearflag 973
+ clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
setvar 0x405e, 1
clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128