diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/gfx_constants.asm | 2 | ||||
| -rw-r--r-- | constants/item_constants.asm | 43 | ||||
| -rw-r--r-- | constants/map_constants.asm | 20 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 49 |
5 files changed, 96 insertions, 20 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index c5f8517ac..5e7583f8e 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -38,3 +38,5 @@ const_value SET 1 const ANIM_GFX_ANGELS const ANIM_GFX_WAVE const ANIM_GFX_AEROBLAST + +TILESIZE EQU $10 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 80f27a5f6..4a144515f 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -369,3 +369,46 @@ ITEMMENU_NOUSE EQU 0 ITEMMENU_CURRENT EQU 4 ITEMMENU_PARTY EQU 5 ITEMMENU_CLOSE EQU 6 + + const_def + const MARTTYPE_STANDARD + const MARTTYPE_BITTER + const MARTTYPE_BARGAIN + const MARTTYPE_PHARMACY + const MARTTYPE_ROOFTOP + + const_def + const MART_CHERRYGROVE + const MART_CHERRYGROVE_DEX + const MART_VIOLET + const MART_AZALEA + const MART_CIANWOOD + const MART_GOLDENROD_2F_1 + const MART_GOLDENROD_2F_2 + const MART_GOLDENROD_3F + const MART_GOLDENROD_4F + const MART_GOLDENROD_5F_1 + const MART_GOLDENROD_5F_2 + const MART_GOLDENROD_5F_3 + const MART_GOLDENROD_5F_4 + const MART_OLIVINE + const MART_ECRUTEAK + const MART_MAHOGANY_1 + const MART_MAHOGANY_2 + const MART_BLACKTHORN + const MART_VIRIDIAN + const MART_PEWTER + const MART_CERULEAN + const MART_LAVENDER + const MART_VERMILION + const MART_CELADON_2F_1 + const MART_CELADON_2F_2 + const MART_CELADON_3F + const MART_CELADON_4F + const MART_CELADON_5F_1 + const MART_CELADON_5F_2 + const MART_FUCHSIA + const MART_SAFFRON + const MART_MT_MOON + const MART_INDIGO_PLATEAU + const MART_UNDERGROUND 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 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 833c84377..d8e5fc9e5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -1,5 +1,3 @@ -NONE EQU 0 - PARTY_LENGTH EQU 6 MAX_ITEMS EQU 20 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index f0fb8d6ad..a355877f2 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -181,7 +181,48 @@ const_value SET 1 const PAL_OW_TREE const PAL_OW_ROCK -; sprite movements +; sprite movement data table indices + const_def + const SPRITEMOVEDATA_00 + const SPRITEMOVEDATA_01 + const SPRITEMOVEDATA_02 + const SPRITEMOVEDATA_03 + const SPRITEMOVEDATA_WALK_UP_DOWN + const SPRITEMOVEDATA_WALK_LEFT_RIGHT + const SPRITEMOVEDATA_STANDING_DOWN + const SPRITEMOVEDATA_STANDING_UP + const SPRITEMOVEDATA_STANDING_LEFT + const SPRITEMOVEDATA_STANDING_RIGHT + const SPRITEMOVEDATA_0A + const SPRITEMOVEDATA_0B + const SPRITEMOVEDATA_0C + const SPRITEMOVEDATA_0D + const SPRITEMOVEDATA_0E + const SPRITEMOVEDATA_0F + const SPRITEMOVEDATA_10 + const SPRITEMOVEDATA_11 + const SPRITEMOVEDATA_12 + const SPRITEMOVEDATA_13 + const SPRITEMOVEDATA_14 + const SPRITEMOVEDATA_15 + const SPRITEMOVEDATA_16 + const SPRITEMOVEDATA_17 + const SPRITEMOVEDATA_18 + const SPRITEMOVEDATA_19 + const SPRITEMOVEDATA_1A + const SPRITEMOVEDATA_1B + const SPRITEMOVEDATA_1C + const SPRITEMOVEDATA_1D + const SPRITEMOVEDATA_1E + const SPRITEMOVEDATA_1F + const SPRITEMOVEDATA_20 + const SPRITEMOVEDATA_21 + const SPRITEMOVEDATA_22 + const SPRITEMOVEDATA_23 + const SPRITEMOVEDATA_24 + const SPRITEMOVEDATA_25 + +; sprite movement functions const_def const SPRITEMOVEFN_00 const SPRITEMOVEFN_01 @@ -211,9 +252,3 @@ const_value SET 1 const SPRITEMOVEFN_19 const SPRITEMOVEFN_1A const SPRITEMOVEFN_1B - const SPRITEMOVEFN_1C - const SPRITEMOVEFN_1D - const SPRITEMOVEFN_1E - const SPRITEMOVEFN_1F - const SPRITEMOVEFN_20 - const SPRITEMOVEFN_21 |