summaryrefslogtreecommitdiff
path: root/data/maps/PalletTown_ProfessorOaksLab
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/PalletTown_ProfessorOaksLab
parenta8b767965a92352de03780fb4671d2a469343d28 (diff)
Hide/show flags through 07F
Diffstat (limited to 'data/maps/PalletTown_ProfessorOaksLab')
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/map.json14
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc8
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index f6b80642a..9ff650466 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169595",
- "flag": "FLAG_0x02B"
+ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169BAB",
- "flag": "FLAG_0x028"
+ "flag": "FLAG_HIDE_BULBASAUR_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169D78",
- "flag": "FLAG_0x029"
+ "flag": "FLAG_HIDE_SQUIRTLE_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169DAE",
- "flag": "FLAG_0x02A"
+ "flag": "FLAG_HIDE_CHARMANDER_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_BLUE",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_16955F",
- "flag": "FLAG_0x02D"
+ "flag": "FLAG_HIDE_RIVAL_IN_LAB"
},
{
"graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
- "flag": "FLAG_0x03A"
+ "flag": "FLAG_HIDE_POKEDEX"
},
{
"graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
- "flag": "FLAG_0x03A"
+ "flag": "FLAG_HIDE_POKEDEX"
}
],
"warp_events": [
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index bb31dba40..59596e6d8 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -57,7 +57,7 @@ EventScript_169002:: @ 8169002
removeobject 4
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
- clearflag FLAG_0x02B
+ clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
waitmovement 0
goto EventScript_169035
@@ -219,7 +219,7 @@ EventScript_16923E:: @ 816923E
removeobject 4
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
- clearflag FLAG_0x02B
+ clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
waitmovement 0
applymovement 8, Movement_1A75E9
@@ -595,7 +595,7 @@ EventScript_16958B:: @ 816958B
PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
lock
faceplayer
- checkflag FLAG_0x002
+ checkflag FLAG_TEMP_2
goto_if_eq EventScript_169600
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
goto_if_eq EventScript_169903
@@ -871,7 +871,7 @@ EventScript_169913:: @ 8169913
closemessage
delay 70
msgbox gUnknown_81A72AD
- setflag FLAG_0x002
+ setflag FLAG_TEMP_2
release
end