diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
| commit | bb23128b77a01d3c39b11aef978acf437ae71974 (patch) | |
| tree | f6de6f5278cc10fba0c7ab159365d3ed16ab6bf9 /src/script_pokemon_util_80F87D8.c | |
| parent | 144c5888a11115c93ed065c738a8ab395d71a798 (diff) | |
| parent | a081124a20896a0cc2ee4fac2df6d4b5440125ef (diff) | |
Merge conflict resolves into review changes
Diffstat (limited to 'src/script_pokemon_util_80F87D8.c')
| -rwxr-xr-x | src/script_pokemon_util_80F87D8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index a80fe49ff..f8206797b 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -610,7 +610,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item) return FALSE; } -bool8 sub_80F9370(void) +bool8 DoesPartyHaveEnigmaBerry(void) { bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY); if (hasItem == TRUE) |