diff --git a/files/fielddata/eventdata/zone_event/362_T11R0802.json b/files/fielddata/eventdata/zone_event/362_T11R0802.json index 304b793dd..b2f628019 100644 --- a/files/fielddata/eventdata/zone_event/362_T11R0802.json +++ b/files/fielddata/eventdata/zone_event/362_T11R0802.json @@ -49,7 +49,7 @@ "spriteId": "SPRITE_MONO_PIP", "movement": 0, "type": 0, - "eventFlag": "FLAG_UNK_2FB", + "eventFlag": "FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL", "scriptId": 0, "facingDirection": 1, "param0": 0, @@ -105,4 +105,4 @@ "y": 0 } ] -} \ No newline at end of file +} diff --git a/files/fielddata/script/scr_seq/scr_seq_0196_R10R0202.s b/files/fielddata/script/scr_seq/scr_seq_0196_R10R0202.s index d6ac19ea0..e7102f888 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0196_R10R0202.s +++ b/files/fielddata/script/scr_seq/scr_seq_0196_R10R0202.s @@ -59,7 +59,7 @@ _0071: closemsg setflag FLAG_UNK_258 clearflag FLAG_HIDE_LAVENDER_RADIO_TOWER_DIRECTOR - setflag FLAG_UNK_2FB + setflag FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL clearflag FLAG_HIDE_VERMILION_FAN_CLUB_LOST_ITEM setvar VAR_UNK_40FF, 1 releaseall diff --git a/files/fielddata/script/scr_seq/scr_seq_0827_T11.s b/files/fielddata/script/scr_seq/scr_seq_0827_T11.s index aa33523bc..2e7b14e5f 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0827_T11.s +++ b/files/fielddata/script/scr_seq/scr_seq_0827_T11.s @@ -262,7 +262,7 @@ scr_seq_T11_002: play_se SEQ_SE_DP_SELECT lockall faceplayer - goto_if_set FLAG_UNK_2FB, _03BE + goto_if_set FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL, _03BE npc_msg msg_0529_T11_00002 wait_button_or_walk_away closemsg diff --git a/files/fielddata/script/scr_seq/scr_seq_0841_T11R0802.s b/files/fielddata/script/scr_seq/scr_seq_0841_T11R0802.s index 07f1c2946..bef1064c5 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0841_T11R0802.s +++ b/files/fielddata/script/scr_seq/scr_seq_0841_T11R0802.s @@ -74,7 +74,7 @@ _00BD: _00E9: takeitem ITEM_LOST_ITEM, 1, VAR_SPECIAL_RESULT npc_msg msg_0541_T11R0802_00006 - clearflag FLAG_UNK_2FB + clearflag FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL show_person obj_T11R0802_mono_pip giveitem_no_check ITEM_PASS, 1 npc_msg msg_0541_T11R0802_00008 @@ -312,7 +312,7 @@ scr_seq_T11R0802_002: end scr_seq_T11R0802_006: - goto_if_set FLAG_UNK_2FB, _0431 + goto_if_set FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL, _0431 compare VAR_UNK_40FF, 2 goto_if_eq _0433 simple_npc_msg msg_0541_T11R0802_00016 diff --git a/include/constants/flags.h b/include/constants/flags.h index edc891c3e..ea51fe90e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -781,7 +781,7 @@ #define FLAG_HIDE_VIRIDIAN_CITY_OLD_MAN_OUTSIDE_GYM_LOCKED 0x2F8 #define FLAG_HIDE_VIRIDIAN_CITY_OLD_MAN_OUTSIDE_GYM_UNLOCKED 0x2F9 #define FLAG_HIDE_SAFFRON_CITY_STEVEN 0x2FA -#define FLAG_UNK_2FB 0x2FB +#define FLAG_HIDE_SAFFRON_CITY_COPYCAT_HOUSE_CLEFAIRY_DOLL 0x2FB #define FLAG_HIDE_VERMILION_FAN_CLUB_LOST_ITEM 0x2FC #define FLAG_HIDE_VERMILION_CITY_STEVEN 0x2FD #define FLAG_HIDE_OAKS_LAB_BULBASAUR_BALL 0x2FE