diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 15:46:38 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 16:00:53 -0400 |
| commit | e674869018ffe8f9be2351b2b569eb7300910e6a (patch) | |
| tree | 77c5dae1a972a4bd03e448f0514341fe5ce927b7 /constants/map_constants.asm | |
| parent | 0fcef5fc087dc30817410d7692d53e2c382828d5 (diff) | |
Updated signpost items and person_event flags
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ed4a781f5..6f5b71310 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -233,7 +233,7 @@ MAP_N_A EQU -1 mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 - mapgroup DAY_CARE, 4, 5 + mapgroup DAYCARE, 4, 5 newgroup mapgroup ROUTE_6, 9, 10 @@ -700,9 +700,9 @@ const_value SET 1 const OBJECT_32 ; 33-39 are not used - +; map object struct const_def - const MAPOBJECT_VRAM_ID ; 0 + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 const MAPOBJECT_SPRITE ; 1 const MAPOBJECT_Y_COORD ; 2 const MAPOBJECT_X_COORD ; 3 @@ -712,9 +712,9 @@ const_value SET 1 const MAPOBJECT_TIMEOFDAY ; 7 const MAPOBJECT_COLOR ; 8 const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_POINTER_LO ; a + const MAPOBJECT_SCRIPT_POINTER ; a const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_FLAG_LO ; c + const MAPOBJECT_EVENT_FLAG ; c const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused @@ -725,6 +725,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_RIGHT EQU $4 +OW_UP EQU $8 +OW_LEFT EQU $c const_def const EMOTE_SHOCK ; 0 @@ -748,5 +752,5 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 const SIGNPOST_LEFT const SIGNPOST_IFSET const SIGNPOST_IFNOTSET - const SIGNPOST_ITEMIFSET + const SIGNPOST_ITEM const SIGNPOST_COPY |