diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
| commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
| tree | db4ae87659baced2022e440109306266c1c80e3b /src/menu_helpers.c | |
| parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
| parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) | |
Merge branch 'master' into tag-none
Diffstat (limited to 'src/menu_helpers.c')
| -rw-r--r-- | src/menu_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 95b67f78c..331755590 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -280,7 +280,7 @@ bool8 IsHoldingItemAllowed(u16 itemId) // Enigma Berry can't be held in link areas if (itemId != ITEM_ENIGMA_BERRY) return TRUE; - else if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) + else if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER)) return FALSE; else if (InUnionRoom() != TRUE) |