diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-05 20:39:55 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-05 20:39:55 -0800 |
| commit | c1b2c31a4a935f6c452596d5f2fad2e2cb588d4d (patch) | |
| tree | c9a1a7102a97ccfff96388b2205003d13a3ec8ce /src/pokemon_1.c | |
| parent | 746b12fb99bb435ea5fcd06b12032d40e088c6c9 (diff) | |
item constants
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index d6f475171..b8735fbc4 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -8,6 +8,7 @@ #include "main.h" #include "rng.h" #include "sprite.h" +#include "items.h" //Extracts the upper 16 bits of a 32-bit number #define HIHALF(n) (((n) & 0xFFFF0000) >> 16) @@ -341,7 +342,7 @@ void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest) dest->species = GetMonData(mon, MON_DATA_SPECIES, NULL); heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); - if (heldItem == 175) + if (heldItem == ITEM_ENIGMA_BERRY) heldItem = 0; dest->heldItem = heldItem; |