diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
commit | e2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch) | |
tree | 5705aaca2ef0713f55ca22a4a814161e26aa4582 /include/global.fieldmap.h | |
parent | 1ce33843b645e3139bd414c2d048c628967f4e07 (diff) | |
parent | f75c048434d5dc7538e628206c29a0730404db81 (diff) |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r-- | include/global.fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index fceec9daf..a266b8ce1 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -94,7 +94,7 @@ struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; - /*0x02*/ u8 unk2; + /*0x02*/ u8 inConnection; /*0x04*/ s16 x; /*0x06*/ s16 y; /*0x08*/ u8 elevation; @@ -304,7 +304,7 @@ enum { #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_WATERING (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) enum { |