use player avatar flag constants

4 files changed, 14 insertions, 14 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 312dcdbeb..eb8016b5b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -332,7 +332,7 @@ s8 sub_8081D3C(void)
         return 5;
     if (sub_80574D8(tileBehavior))
         return 6;
-    if (TestPlayerAvatarFlags(8))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
     {
         if (sub_8057450(tileBehavior))
             return 5;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index c46df3dbd..708544b87 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -852,7 +852,7 @@ void sub_80597F4(void)
     
     npc_clear_strange_bits(playerMapObj);
     FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18);
-    if (TestPlayerAvatarFlags(6))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
     {
         sub_80E6084();
         sub_80E6010(0);
@@ -914,7 +914,7 @@ bool8 PartyHasMonWithSurf(void)
 {
     u8 i;
     
-    if (!TestPlayerAvatarFlags(8))
+    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
     {
         for (i = 0; i < 6; i++)
         {
@@ -929,7 +929,7 @@ bool8 PartyHasMonWithSurf(void)
 
 bool8 IsPlayerSurfingNorth(void)
 {
-    if (player_get_direction_upper_nybble() == 2 && TestPlayerAvatarFlags(8))
+    if (player_get_direction_upper_nybble() == 2 && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         return TRUE;
     else
         return FALSE;
@@ -1029,7 +1029,7 @@ void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d)
 void sub_8059B88(u8 a)
 {
     gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = a;
-    if (TestPlayerAvatarFlags(8))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         gSprites[gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A].invisible = a;
 }
 
diff --git a/src/rom4.c b/src/rom4.c
index 2fdee966c..8b1aa1b4d 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -590,13 +590,13 @@ void walkrun_find_lowest_active_bit_in_bitfield(void)
 {
     gUnknown_02029810.player_field_1 = player_get_direction_lower_nybble();
 
-    if (TestPlayerAvatarFlags(2))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
         gUnknown_02029810.player_field_0 = 2;
-    else if (TestPlayerAvatarFlags(4))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
         gUnknown_02029810.player_field_0 = 4;
-    else if (TestPlayerAvatarFlags(8))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         gUnknown_02029810.player_field_0 = 8;
-    else if (TestPlayerAvatarFlags(0x10))
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
         gUnknown_02029810.player_field_0 = 16;
     else
         gUnknown_02029810.player_field_0 = 1;
@@ -803,7 +803,7 @@ void sub_8053E90(void)
             music = gSaveBlock1.battleMusic;
         else if (sav1_map_get_light_level() == 5)
             music = BGM_DEEPDEEP;
-        else if (TestPlayerAvatarFlags(8))
+        else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
             music = BGM_NAMINORI;
     }
 
@@ -831,12 +831,12 @@ void sub_8053F0C(void)
         {
             if (currentMusic == BGM_DEEPDEEP || currentMusic == BGM_NAMINORI)
                 return;
-            if (TestPlayerAvatarFlags(8))
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
                 newMusic = BGM_NAMINORI;
         }
         if (newMusic != currentMusic)
         {
-            if (TestPlayerAvatarFlags(6))
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
                 FadeOutAndFadeInNewMapMusic(newMusic, 4, 4);
             else
                 FadeOutAndPlayNewMapMusic(newMusic, 8);
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 84943b0d5..48fe3c116 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -388,7 +388,7 @@ static bool8 DoWildEncounterRateDiceRoll(u16 encounterRate)
 static bool8 DoWildEncounterTest(u32 encounterRate, bool8 ignoreAbility)
 {
     encounterRate *= 16;
-    if (TestPlayerAvatarFlags(6))
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
         encounterRate = encounterRate * 80 / 100;
     ApplyFluteEncounterRateMod(&encounterRate);
     ApplyCleanseTagEncounterRateMod(&encounterRate);
@@ -463,7 +463,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                 }
             }
             else if (MetatileBehavior_IsWaterWildEncounter(a) == TRUE
-             || (TestPlayerAvatarFlags(8) && MetatileBehavior_IsBridge(a) == TRUE))
+             || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(a) == TRUE))
             {
                 if (gWildMonHeaders[headerNum].waterMonsInfo)
                 {