diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-14 23:02:38 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-14 23:02:38 -0500 |
| commit | b921226aea7e624655f0d32436638ea3ffd63419 (patch) | |
| tree | 633a43b363c5cfa23ab4ace0b178d8037541a31d /constants | |
| parent | ed44de4bb4688f6b8c83aeb4f5fd8658d17615fb (diff) | |
More map object, swap StandingTile and NextTile
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 10 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 71 |
2 files changed, 50 insertions, 31 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7891b10f9..2b5a139c7 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -527,13 +527,13 @@ const_value SET 1 const OBJECT_PALETTE const OBJECT_DIRECTION_WALKING const OBJECT_FACING - const OBJECT_09 + const OBJECT_STEP_TYPE const OBJECT_STEP_DURATION const OBJECT_ACTION const OBJECT_12 const OBJECT_FACING_STEP - const OBJECT_STANDING_TILE const OBJECT_NEXT_TILE + const OBJECT_STANDING_TILE const OBJECT_NEXT_MAP_X const OBJECT_NEXT_MAP_Y const OBJECT_MAP_X @@ -590,9 +590,9 @@ OW_RIGHT EQU RIGHT << 2 const EMOTE_BOLT ; 5 const EMOTE_SLEEP ; 6 const EMOTE_FISH ; 7 - const EMOTE_08 ; 8 - const EMOTE_09 ; 9 - const EMOTE_0A ; 10 + const EMOTE_SHADOW ; 8 + const EMOTE_ROD ; 9 + const EMOTE_BOULDER_DUST ; 10 const EMOTE_0B ; 11 EMOTE_MEM EQU -1 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 1310b0565..f507ad6f6 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -268,29 +268,48 @@ SPRITEMOVEDATA_FIELDS EQU 6 MAX_OUTDOOR_SPRITES EQU 23 const_def - const OBJECT_09_VALUE_00 - 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 - const OBJECT_09_VALUE_07 - const OBJECT_09_VALUE_08 - const OBJECT_09_VALUE_09 - const OBJECT_09_VALUE_0A - const OBJECT_09_VALUE_0B - const OBJECT_09_VALUE_0C - const OBJECT_09_VALUE_0D - const OBJECT_09_VALUE_0E - const OBJECT_09_VALUE_0F - const OBJECT_09_VALUE_10 - const OBJECT_09_VALUE_11 - const OBJECT_09_VALUE_12 - const OBJECT_09_VALUE_13 - const OBJECT_09_VALUE_14 - const OBJECT_09_VALUE_15 - const OBJECT_09_VALUE_16 - const OBJECT_09_VALUE_17 - const OBJECT_09_VALUE_18 - const OBJECT_09_VALUE_19 + const STEP_TYPE_00 + const STEP_TYPE_01 ; standing + const STEP_TYPE_02 ; walking + const STEP_TYPE_03 ; bumping + const STEP_TYPE_04 + const STEP_TYPE_05 + const STEP_TYPE_06 + const STEP_TYPE_07 + const STEP_TYPE_08 + const STEP_TYPE_09 + const STEP_TYPE_0A + const STEP_TYPE_0B + const STEP_TYPE_0C + const STEP_TYPE_0D + const STEP_TYPE_0E + const STEP_TYPE_0F + const STEP_TYPE_10 + const STEP_TYPE_11 + const STEP_TYPE_12 + const STEP_TYPE_13 + const STEP_TYPE_14 + const STEP_TYPE_15 + const STEP_TYPE_16 + const STEP_TYPE_17 + const STEP_TYPE_18 + const STEP_TYPE_19 + + const_def + const PERSON_ACTION_00 + const PERSON_ACTION_01 + const PERSON_ACTION_02 + const PERSON_ACTION_03 + const PERSON_ACTION_04 + const PERSON_ACTION_05 + const PERSON_ACTION_06 + const PERSON_ACTION_07 + const PERSON_ACTION_08 + const PERSON_ACTION_09 + const PERSON_ACTION_0A + const PERSON_ACTION_0B + const PERSON_ACTION_0C + const PERSON_ACTION_0D + const PERSON_ACTION_0E + const PERSON_ACTION_0F + const PERSON_ACTION_10 |