diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
commit | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (patch) | |
tree | 8e131411fca696d59f68a0116e59751e53d2b55b /src/pokemon.c | |
parent | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (diff) | |
parent | 9a6c2c25d08ef157cc4800014651bd0c679f6fc5 (diff) |
Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers
Diffstat (limited to 'src/pokemon.c')
-rw-r--r-- | src/pokemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 5a4e6df08..6dd09902d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5079,7 +5079,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5105,7 +5105,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5130,7 +5130,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; |