diff options
Diffstat (limited to 'berry_fix/payload/include')
| -rw-r--r-- | berry_fix/payload/include/global.fieldmap.h | 6 | ||||
| -rw-r--r-- | berry_fix/payload/include/global.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h index f5a5173c6..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_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_6 (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 { diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h index 63b4e0391..ef161c249 100644 --- a/berry_fix/payload/include/global.h +++ b/berry_fix/payload/include/global.h @@ -639,8 +639,8 @@ struct SaveBlock1 /* 0x02025734 */ { /*0x00*/ struct Coords16 pos; /*0x04*/ struct WarpData location; - /*0x0C*/ struct WarpData warp1; - /*0x14*/ struct WarpData warp2; + /*0x0C*/ struct WarpData continueGameWarp; + /*0x14*/ struct WarpData dynamicWarp; /*0x1C*/ struct WarpData lastHealLocation; /*0x24*/ struct WarpData warp4; /*0x2C*/ u16 savedMusic; |