diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
| commit | c5d18de8ff9b587a7987cc2cde793386f1eaf217 (patch) | |
| tree | 5f5341f802eeaefe3d867a39742808ae441434ee /constants | |
| parent | 32b92ca51c73f1ad9be169bef476b9c93687e2a4 (diff) | |
Use known sprite movement data flag constants
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 43207a4dd..5a6c446c8 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -44,16 +44,24 @@ OW_LEFT EQU LEFT << 2 OW_RIGHT EQU RIGHT << 2 ; object_struct OBJECT_FLAGS1 bit flags -INVISIBLE EQU 0 -FIXED_FACING EQU 2 -SLIDING EQU 3 -EMOTE_OBJECT EQU 7 +INVISIBLE_F EQU 0 +FIXED_FACING_F EQU 2 +SLIDING_F EQU 3 +EMOTE_OBJECT_F EQU 7 + +INVISIBLE EQU 1 << INVISIBLE_F +FIXED_FACING EQU 1 << FIXED_FACING_F +SLIDING EQU 1 << SLIDING_F +EMOTE_OBJECT EQU 1 << EMOTE_OBJECT_F ; object_struct OBJECT_FLAGS2 bit flags -LOW_PRIORITY EQU 0 -HIGH_PRIORITY EQU 1 -OVERHEAD EQU 3 +LOW_PRIORITY_F EQU 0 +HIGH_PRIORITY_F EQU 1 +OVERHEAD_F EQU 3 +LOW_PRIORITY EQU 1 << LOW_PRIORITY_F +HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F +OVERHEAD EQU 1 << OVERHEAD_F ; map_object struct members (see macros/wram.asm) const_def |