Merge pull request #39 from rglezg/fix/38_HM_malfunction

Add missing check for HM item.

src/field_player_avatar.c

@@ -8,6 +8,7 @@
 #include "field_effect_helpers.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
+#include "item.h"
 #include "menu.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
@@ -1284,7 +1285,7 @@ bool8 PartyHasMonWithSurf(void)
 {
     u8 i;
 
-    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && CheckBagHasItem(ITEM_HM03_SURF, 1))
     {
         for (i = 0; i < PARTY_SIZE; i++)
         {
@@ -1302,6 +1303,8 @@ void CheckPlayerHasMonWithHM(u16 hm)
     u8 i;
 
     gSpecialVar_Result = PARTY_SIZE;
+    if (!CheckBagHasItem(hm, 1))
+        return;
     for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);