diff options
Diffstat (limited to 'arm9/src/pokemon.c')
| -rw-r--r-- | arm9/src/pokemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index a15d20c1..8be66329 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -972,7 +972,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_TYPE_1: case MON_DATA_TYPE_2: if (blockA->species == SPECIES_ARCEUS && blockA->ability == ABILITY_MULTITYPE) - ret = (u32)GetArceusTypeByHeldItemEffect((u16)FUN_0206E7B8(blockA->heldItem, 1, 0)); + ret = (u32)GetArceusTypeByHeldItemEffect((u16)GetItemAttr(blockA->heldItem, 1, 0)); else { ret = (u32)GetMonBaseStat_HandleFormeConversion(blockA->species, blockB->alternateForm, (enum BaseStat)(attr - MON_DATA_TYPE_1 + BASE_TYPE1)); @@ -2060,7 +2060,7 @@ void MonApplyFriendshipMod(struct Pokemon * pokemon, u32 kind, u32 location) if (species == SPECIES_NONE || species == SPECIES_EGG) return; - effect = (u8)FUN_0206E7B8((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, 0); + effect = (u8)GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, 0); r4 = 0; friendship = (s16)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (friendship >= 100) @@ -2514,7 +2514,7 @@ u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 co personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); beauty = (u8)GetMonData(pokemon, MON_DATA_BEAUTY, NULL); pid_hi = (u16)((personality & 0xFFFF0000) >> 16); - r1 = (u8)FUN_0206E7B8(heldItem, 1, 0); + r1 = (u8)GetItemAttr(heldItem, 1, 0); if (species != SPECIES_KADABRA && r1 == 0x3F && context != 3) return SPECIES_NONE; if (method_ret == NULL) @@ -3248,7 +3248,7 @@ void FUN_02069ECC(struct BoxPokemon * boxmon) u32 forme; if (species == SPECIES_ARCEUS && ability == ABILITY_MULTITYPE) { - forme = GetArceusTypeByHeldItemEffect((u16)FUN_0206E7B8((u16)heldItem, 1, 0)); + forme = GetArceusTypeByHeldItemEffect((u16)GetItemAttr((u16)heldItem, 1, 0)); SetBoxMonData(boxmon, MON_DATA_FORME, &forme); } } |