diff options
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 1b553c783..0880a4f1e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -516,9 +516,9 @@ const_value SET 1 const OBJECT_SPRITE const OBJECT_MAP_OBJECT_INDEX const OBJECT_SPRITE_TILE - const OBJECT_03 - const OBJECT_04 - const OBJECT_FLAGS + const OBJECT_MOVEMENTTYPE + const OBJECT_FLAGS1 + const OBJECT_FLAGS2 const OBJECT_PALETTE const OBJECT_DIRECTION_WALKING const OBJECT_FACING @@ -572,10 +572,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12 OBJECT_STRUCT_3_DATA_WIDTH EQU 6 OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 -OW_DOWN EQU $0 -OW_UP EQU $4 -OW_LEFT EQU $8 -OW_RIGHT EQU $c +OW_DOWN EQU DOWN << 2 +OW_UP EQU UP << 2 +OW_LEFT EQU LEFT << 2 +OW_RIGHT EQU RIGHT << 2 const_def const EMOTE_SHOCK ; 0 @@ -586,10 +586,8 @@ OW_RIGHT EQU $c const EMOTE_BOLT ; 5 const EMOTE_SLEEP ; 6 const EMOTE_FISH ; 7 - const EMOTE_ROD_DOWN ; 8 - const EMOTE_ROD_UP ; 9 - const EMOTE_ROD_LEFT ; a - const EMOTE_ROD_RIGHT ; b + const EMOTE_ROD ; 8 - add directional constant +EMOTE_MEM EQU -1 const_def const SIGNPOST_READ |