diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 16 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 26 |
2 files changed, 22 insertions, 20 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c98c64ff9..7891b10f9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -529,18 +529,18 @@ const_value SET 1 const OBJECT_FACING const OBJECT_09 const OBJECT_STEP_DURATION - const OBJECT_11 + const OBJECT_ACTION const OBJECT_12 const OBJECT_FACING_STEP const OBJECT_STANDING_TILE const OBJECT_NEXT_TILE - const OBJECT_MAP_X - const OBJECT_MAP_Y const OBJECT_NEXT_MAP_X const OBJECT_NEXT_MAP_Y - const OBJECT_20 - const OBJECT_21 - const OBJECT_22 + const OBJECT_MAP_X + const OBJECT_MAP_Y + const OBJECT_INIT_X + const OBJECT_INIT_Y + const OBJECT_RADIUS const OBJECT_SPRITE_X const OBJECT_SPRITE_Y const OBJECT_SPRITE_X_OFFSET @@ -550,7 +550,7 @@ const_value SET 1 const OBJECT_29 const OBJECT_30 const OBJECT_31 - const OBJECT_32 + const OBJECT_RANGE ; 33-39 are not used ; map object struct @@ -651,3 +651,5 @@ NUM_SPAWNS EQU const_value const PALETTE_NITE const PALETTE_MORN const PALETTE_DARK + +FIXED_FACING EQU 2 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index d42f0f5d8..1310b0565 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -220,15 +220,15 @@ NUM_SPRITEHEADER_FIELDS EQU const_value const SPRITEMOVEDATA_SMASHABLE_ROCK const SPRITEMOVEDATA_STRENGTH_BOULDER const SPRITEMOVEDATA_FOLLOWNOTEXACT - const SPRITEMOVEDATA_1B - const SPRITEMOVEDATA_1C - const SPRITEMOVEDATA_1D + const SPRITEMOVEDATA_SHADOW + const SPRITEMOVEDATA_EMOTE + const SPRITEMOVEDATA_SCREENSHAKE const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE const SPRITEMOVEDATA_SPINCLOCKWISE const SPRITEMOVEDATA_20 const SPRITEMOVEDATA_BIGDOLL - const SPRITEMOVEDATA_22 - const SPRITEMOVEDATA_23 + const SPRITEMOVEDATA_BOULDERDUST + const SPRITEMOVEDATA_GRASS const SPRITEMOVEDATA_LAPRAS const SPRITEMOVEDATA_25 NUM_SPRITEMOVEDATA EQU const_value +- 1 @@ -255,23 +255,23 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITEMOVEFN_SCRIPTED const SPRITEMOVEFN_STRENGTH const SPRITEMOVEFN_FOLLOWNOTEXACT - const SPRITEMOVEFN_13 - const SPRITEMOVEFN_14 + const SPRITEMOVEFN_SHADOW + const SPRITEMOVEFN_EMOTE const SPRITEMOVEFN_BIG_SNORLAX const SPRITEMOVEFN_BOUNCE - const SPRITEMOVEFN_17 + const SPRITEMOVEFN_SCREENSHAKE const SPRITEMOVEFN_SPIN_CLOCKWISE const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE - const SPRITEMOVEFN_1A - const SPRITEMOVEFN_1B + const SPRITEMOVEFN_BOULDERDUST + const SPRITEMOVEFN_GRASS MAX_OUTDOOR_SPRITES EQU 23 const_def const OBJECT_09_VALUE_00 - const OBJECT_09_VALUE_01 - const OBJECT_09_VALUE_02 - const OBJECT_09_VALUE_03 + const OBJECT_09_VALUE_01 ; standing + const OBJECT_09_VALUE_02 ; walking + const OBJECT_09_VALUE_03 ; bumping const OBJECT_09_VALUE_04 const OBJECT_09_VALUE_05 const OBJECT_09_VALUE_06 |