summaryrefslogtreecommitdiff
path: root/data/maps/RocketHideout_B4F
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-19 20:30:38 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-19 20:30:38 -0400
commit2ff8af13d5a259fa0ca07afe3ecf4792b6871a80 (patch)
treee787d04143073746d171dcd841b43f95829afc53 /data/maps/RocketHideout_B4F
parenta8b767965a92352de03780fb4671d2a469343d28 (diff)
Hide/show flags through 07F
Diffstat (limited to 'data/maps/RocketHideout_B4F')
-rw-r--r--data/maps/RocketHideout_B4F/map.json6
-rw-r--r--data/maps/RocketHideout_B4F/scripts.inc6
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index f41c5a420..8c4ad9b68 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_161317",
- "flag": "FLAG_0x038"
+ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_161363",
- "flag": "FLAG_0x037"
+ "flag": "FLAG_HIDE_SILPH_SCOPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1613AD",
- "flag": "FLAG_0x036"
+ "flag": "FLAG_HIDE_LIFT_KEY"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index f5092c97c..38a680528 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -32,8 +32,8 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
closemessage
removeobject 1
addobject 2
- clearflag FLAG_0x037
- setflag FLAG_0x05F
+ clearflag FLAG_HIDE_SILPH_SCOPE
+ setflag FLAG_HIDE_CELADON_ROCKETS
setvar VAR_0x8004, 15
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
@@ -60,7 +60,7 @@ RocketHideout_B4F_EventScript_161381:: @ 8161381
EventScript_16139D:: @ 816139D
msgbox gUnknown_81754BD
addobject 4
- clearflag FLAG_0x036
+ clearflag FLAG_HIDE_LIFT_KEY
release
end