summaryrefslogtreecommitdiff
path: root/data/maps/OneIsland_PokemonCenter_1F
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/OneIsland_PokemonCenter_1F
parenta8b767965a92352de03780fb4671d2a469343d28 (diff)
Hide/show flags through 07F
Diffstat (limited to 'data/maps/OneIsland_PokemonCenter_1F')
-rw-r--r--data/maps/OneIsland_PokemonCenter_1F/map.json4
-rw-r--r--data/maps/OneIsland_PokemonCenter_1F/scripts.inc8
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
index ae54dc6e2..b5575d3fd 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_1F_EventScript_170E9D",
- "flag": "FLAG_0x072"
+ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
},
{
"graphics_id": "MAP_OBJ_GFX_CELIO",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_1F_EventScript_170EC5",
- "flag": "FLAG_0x073"
+ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 6604b9ea3..5b12958c8 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -146,7 +146,7 @@ EventScript_170E46:: @ 8170E46
return
EventScript_170E58:: @ 8170E58
- setflag FLAG_0x039
+ setflag FLAG_HIDE_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
@@ -300,7 +300,7 @@ EventScript_170FA5:: @ 8170FA5
msgbox gUnknown_81A1D7D
special sub_810B82C
setflag FLAG_0x844
- setflag FLAG_0x05C
+ setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_0x08C
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
special InitRoamer
@@ -514,9 +514,9 @@ EventScript_1711DA:: @ 81711DA
applymovement 2, Movement_17132D
waitmovement 0
playse SE_KAIDAN
- setflag FLAG_0x072
+ setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
- clearflag FLAG_0x062
+ clearflag FLAG_HIDE_CINNABAR_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3
setvar VAR_0x8004, 1
setvar VAR_0x8006, 8