summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-20 20:50:11 -0400
committerGitHub <noreply@github.com>2017-06-20 20:50:11 -0400
commit42ae04c74fe07d05175efb4df143dbcf1b2752bc (patch)
tree5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src
parentb22e5219ba01c70da9a03397430bff10d0b99060 (diff)
parent4ba573ed1eba7c37160ce6107d95447f42902385 (diff)
Merge pull request #309 from Wack0/patch-1
item.c: Replace item identifier with item enum
Diffstat (limited to 'src')
-rw-r--r--src/item.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/item.c b/src/item.c
index 920670e8f..2eb013490 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "item.h"
+#include "items.h"
#include "berry.h"
#include "string_util.h"
#include "strings.h"
@@ -28,9 +29,9 @@ static void CompactPCItems(void);
void CopyItemName(u16 itemId, u8 *string)
{
- if (itemId == 0xAF)
+ if (itemId == ITEM_ENIGMA_BERRY)
{
- StringCopy(string, GetBerryInfo(0x2B)->name);
+ StringCopy(string, GetBerryInfo(0x2B)->name); // berry 0x2b = enigma berry
StringAppend(string, gOtherText_Berry2);
}
else