From 24f18af338cd8608719e6b7b87424286331c6bba Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 11 Feb 2022 14:43:38 -0500 Subject: Add missing map constant usage --- src/menu_helpers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/menu_helpers.c') diff --git a/src/menu_helpers.c b/src/menu_helpers.c index a64a4a0cd..11d26f204 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -10,6 +10,7 @@ #include "field_specials.h" #include "constants/songs.h" #include "constants/items.h" +#include "constants/maps.h" static EWRAM_DATA const struct YesNoFuncTable *gUnknown_20399C8 = NULL; static EWRAM_DATA TaskFunc gUnknown_20399CC = NULL; @@ -94,7 +95,8 @@ bool8 itemid_link_can_give_berry(u16 itemId) { if (itemId != ITEM_ENIGMA_BERRY) return TRUE; - else if (!gSaveBlock1Ptr->location.mapGroup && gSaveBlock1Ptr->location.mapNum == 1) + else if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER)) return FALSE; else if (InUnionRoom() != TRUE) return TRUE; -- cgit v1.2.3