summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 09:23:30 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-27 09:23:30 -0600
commitd34de50d34d18ee64c95232202751532534c2ed9 (patch)
treef2aaa9e93f8b8671491eda458963aee1027924c2
parent0eb231352a820aa6597bb6a69ef920e3864931ab (diff)
Use descriptive name for the BLACK GLASSES hidden item flag
-rw-r--r--data/maps/events/Route116.inc2
-rw-r--r--include/constants/flags.h2
-rw-r--r--src/field/field_specials.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index ef301e51d..ff5ad2643 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -41,7 +41,7 @@ Route116_MapBGEvents:: @ 83833A8
bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D
- bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60
+ bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES
Route116_MapEvents:: @ 838342C
map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0e8c766f0..a8067f6ca 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -353,7 +353,7 @@
#define FLAG_HIDDEN_ITEM_5D 0x2B5
#define FLAG_HIDDEN_ITEM_5E 0x2B6
#define FLAG_HIDDEN_ITEM_5F 0x2B7
-#define FLAG_HIDDEN_ITEM_60 0x2B8
+#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x2B8
#define FLAG_HIDDEN_ITEM_61 0x2B9
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 37a413c93..1a4ebe1af 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -1997,7 +1997,7 @@ static void sub_810F814(u8 taskId)
bool8 FoundBlackGlasses(void)
{
- return FlagGet(FLAG_HIDDEN_ITEM_60);
+ return FlagGet(FLAG_HIDDEN_ITEM_BLACK_GLASSES);
}
void SetRoute119Weather(void)