diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 16:44:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 16:44:16 -0400 |
| commit | 95c7e3d067b7ac8e6cb8ef76f58713b0c8b128ec (patch) | |
| tree | e65a787459bcd091537e250c4e5640f67b69228c /include/global.fieldmap.h | |
| parent | 301ef72cf8f3fa38a732fbd7c63d2b6b041f3f13 (diff) | |
Update player avatar state enums
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 80331804b..6baa6a6bc 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -279,24 +279,24 @@ enum { PLAYER_AVATAR_STATE_ACRO_BIKE, PLAYER_AVATAR_STATE_SURFING, PLAYER_AVATAR_STATE_UNDERWATER, - PLAYER_AVATAR_STATE_FIELD_MOVE, - PLAYER_AVATAR_STATE_FISHING, - PLAYER_AVATAR_STATE_WATERING, + PLAYER_AVATAR_STATE_CONTROLLABLE, + PLAYER_AVATAR_STATE_FORCED, + PLAYER_AVATAR_STATE_DASH, }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) -#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) -#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) -#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) -#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) -#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) +#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) +#define PLAYER_AVATAR_FLAG_CONTROLLABLE (1 << PLAYER_AVATAR_STATE_CONTROLLABLE) +#define PLAYER_AVATAR_FLAG_FORCED (1 << PLAYER_AVATAR_STATE_FORCED) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_DASH) enum { PLAYER_AVATAR_GFX_NORMAL, PLAYER_AVATAR_GFX_BIKE, - PLAYER_AVATAR_GFX_SURF, + PLAYER_AVATAR_GFX_RIDE, PLAYER_AVATAR_GFX_FIELD_MOVE, PLAYER_AVATAR_GFX_FISH, PLAYER_AVATAR_GFX_VSSEEKER, |