diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-08 16:55:44 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-08 16:55:44 -0500 |
| commit | d25196154fe1c4b4cf1bfa13c62c6b85d8c5c4da (patch) | |
| tree | bf3114b2debfed3b8e6d90f283eca26390f9cf61 /src/quest_log_8150454.c | |
| parent | b3caa183bfcad0f80a1ad94d0edcf3359903c4ac (diff) | |
Sync Ruby/Sapphire Battle Tower structs
Diffstat (limited to 'src/quest_log_8150454.c')
| -rw-r--r-- | src/quest_log_8150454.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c index 0e603bf63..09cf47f93 100644 --- a/src/quest_log_8150454.c +++ b/src/quest_log_8150454.c @@ -60,7 +60,7 @@ static void sub_81504A8(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_81507BC(mapObject, sub_805C808(0)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x01); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } static void sub_81504E8(void) @@ -68,7 +68,7 @@ static void sub_81504E8(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_81507BC(mapObject, sub_805C808(1)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x02); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); sub_80BD620(0, 0); } @@ -122,7 +122,7 @@ static void sub_81505C4(u8 taskId) sub_805D9C4(sprite); if (sprite->animEnded) { - if (!(gPlayerAvatar.flags & 8)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) sub_81507BC(mapObject, sub_805C808(0)); else sub_81507BC(mapObject, sub_805C808(2)); @@ -141,11 +141,11 @@ static void sub_8150708(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; u8 fieldEffectId; - if (!(gPlayerAvatar.flags & 0x08)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) { sub_81507BC(mapObject, sub_805C808(2)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x08); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); gFieldEffectArguments[0] = mapObject->coords2.x; gFieldEffectArguments[1] = mapObject->coords2.y; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; |