summaryrefslogtreecommitdiff
path: root/data/maps/PokemonTower_7F
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/PokemonTower_7F
parenta8b767965a92352de03780fb4671d2a469343d28 (diff)
Hide/show flags through 07F
Diffstat (limited to 'data/maps/PokemonTower_7F')
-rw-r--r--data/maps/PokemonTower_7F/map.json10
-rw-r--r--data/maps/PokemonTower_7F/scripts.inc4
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index e6183274c..6e404c614 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_3",
+ "graphics_id": "MAP_OBJ_GFX_MR_FUJI",
"x": 11,
"y": 4,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_7F_EventScript_16355A",
- "flag": "FLAG_0x034"
+ "flag": "FLAG_HIDE_TOWER_FUJI"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_163586",
- "flag": "FLAG_0x05E"
+ "flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_16363D",
- "flag": "FLAG_0x083"
+ "flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_1636D6",
- "flag": "FLAG_0x084"
+ "flag": "FLAG_HIDE_TOWER_ROCKET_3"
}
],
"warp_events": [
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc
index 396b408af..0947eedc5 100644
--- a/data/maps/PokemonTower_7F/scripts.inc
+++ b/data/maps/PokemonTower_7F/scripts.inc
@@ -7,8 +7,8 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A
setvar VAR_0x8004, 14
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
- setflag FLAG_0x034
- clearflag FLAG_0x035
+ setflag FLAG_HIDE_TOWER_FUJI
+ clearflag FLAG_HIDE_POKEHOUSE_FUJI
setflag FLAG_0x23C
msgbox gUnknown_817A529
closemessage