From dbac777d95875b49e98da94551a89616c2addf3c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Mar 2020 20:17:47 -0400 Subject: through CheckMovementInputNotOnBike --- berry_fix/payload/include/global.fieldmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'berry_fix') diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h index f5a5173c6..d001f9b45 100644 --- a/berry_fix/payload/include/global.fieldmap.h +++ b/berry_fix/payload/include/global.fieldmap.h @@ -231,8 +231,8 @@ struct ObjectEventGraphicsInfo #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3) #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) -#define PLAYER_AVATAR_FLAG_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_6 (1 << 6) +#define PLAYER_AVATAR_FLAG_FORCED_MVMT_DISABLED (1 << 5) +#define PLAYER_AVATAR_FLAG_MVMT_IS_FORCED (1 << 6) #define PLAYER_AVATAR_FLAG_DASH (1 << 7) enum -- cgit v1.2.3 From 9cb08e34750ad591daf69900d9f857cb8a4ddfbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Mar 2020 20:40:44 -0400 Subject: Document player avatar fields --- berry_fix/payload/include/global.fieldmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'berry_fix') diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h index d001f9b45..ccc7e19c4 100644 --- a/berry_fix/payload/include/global.fieldmap.h +++ b/berry_fix/payload/include/global.fieldmap.h @@ -231,9 +231,9 @@ struct ObjectEventGraphicsInfo #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3) #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) -#define PLAYER_AVATAR_FLAG_FORCED_MVMT_DISABLED (1 << 5) -#define PLAYER_AVATAR_FLAG_MVMT_IS_FORCED (1 << 6) -#define PLAYER_AVATAR_FLAG_DASH (1 << 7) +#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << 5) +#define PLAYER_AVATAR_FLAG_FISHING (1 << 6) +#define PLAYER_AVATAR_FLAG_WATERING (1 << 7) enum { -- cgit v1.2.3 From d69a051df50232dbc0c2d0b595d5eeb0d5fb3133 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 26 Mar 2020 08:31:24 -0400 Subject: Fix alignment in berry_fix global header --- berry_fix/payload/include/global.fieldmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'berry_fix') diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h index ccc7e19c4..f68ca9125 100644 --- a/berry_fix/payload/include/global.fieldmap.h +++ b/berry_fix/payload/include/global.fieldmap.h @@ -231,9 +231,9 @@ struct ObjectEventGraphicsInfo #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3) #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) -#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << 5) -#define PLAYER_AVATAR_FLAG_FISHING (1 << 6) -#define PLAYER_AVATAR_FLAG_WATERING (1 << 7) +#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << 5) +#define PLAYER_AVATAR_FLAG_FISHING (1 << 6) +#define PLAYER_AVATAR_FLAG_WATERING (1 << 7) enum { -- cgit v1.2.3