diff options
Diffstat (limited to 'data/maps/PalletTown')
| -rw-r--r-- | data/maps/PalletTown/map.json | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown/scripts.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 6854282b5..344d30be7 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x02C" + "flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN" } ], "warp_events": [ diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index eb3a85f4c..ac977d53a 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -76,7 +76,7 @@ EventScript_1654D8:: @ 81654D8 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 - setflag FLAG_0x02C + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall @@ -221,9 +221,9 @@ EventScript_165605:: @ 8165605 closedoor 16, 13 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 - setflag FLAG_0x02C + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -382,7 +382,7 @@ PalletTown_EventScript_16575C:: @ 816575C goto_if_eq EventScript_165815 compare_var_to_value VAR_0x4002, 1 goto_if_eq EventScript_1658C2 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 @@ -399,7 +399,7 @@ PalletTown_EventScript_16575C:: @ 816575C compare_var_to_value VAR_FACING, 4 call_if 5, EventScript_1657E2 moveobjectoffscreen 1 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end |