diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
| commit | 9c5473e965520f672640daf4ee76622640e0de15 (patch) | |
| tree | 33d513a05a026cb6c094eb7ee73ad52ee36d0888 /constants/map_constants.asm | |
| parent | 1c1fe276ca59726bb0008c60006c6b48cd093573 (diff) | |
| parent | 40802da3cf27a453f62c8c4b712e876b06a9d834 (diff) | |
Merge pull request #326 from PikalaxALT/master
Reopen #325
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0880a4f1e..c98c64ff9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -494,6 +494,11 @@ MAP_NONE EQU 0 const _ROOF ; connection directions + const_def + const EAST_F + const WEST_F + const SOUTH_F + const NORTH_F const_def shift_const EAST @@ -540,7 +545,7 @@ const_value SET 1 const OBJECT_SPRITE_Y const OBJECT_SPRITE_X_OFFSET const OBJECT_SPRITE_Y_OFFSET - const OBJECT_27 + const OBJECT_MOVEMENT_BYTE_INDEX const OBJECT_28 const OBJECT_29 const OBJECT_30 @@ -566,11 +571,10 @@ const_value SET 1 const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused +OBJECT_LENGTH EQU const_value MAPOBJECT_SCREEN_HEIGHT EQU 11 MAPOBJECT_SCREEN_WIDTH EQU 12 -OBJECT_STRUCT_3_DATA_WIDTH EQU 6 -OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 OW_DOWN EQU DOWN << 2 OW_UP EQU UP << 2 @@ -586,7 +590,10 @@ OW_RIGHT EQU RIGHT << 2 const EMOTE_BOLT ; 5 const EMOTE_SLEEP ; 6 const EMOTE_FISH ; 7 - const EMOTE_ROD ; 8 - add directional constant + const EMOTE_08 ; 8 + const EMOTE_09 ; 9 + const EMOTE_0A ; 10 + const EMOTE_0B ; 11 EMOTE_MEM EQU -1 const_def |