summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/gfx_constants.asm4
-rw-r--r--constants/map_constants.asm5
-rw-r--r--constants/misc_constants.asm4
-rw-r--r--constants/sprite_constants.asm12
4 files changed, 20 insertions, 5 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 5e7583f8e..c774faa95 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -39,4 +39,8 @@ const_value SET 1
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST
+
+LEN_2BPP_TILE EQU 16
+LEN_1BPP_TILE EQU 8
+TILES_PER_FRAME EQU 6
TILESIZE EQU $10
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 35a26b9e2..799410e17 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -587,7 +587,10 @@ OW_RIGHT EQU RIGHT << 2
const EMOTE_BOLT ; 5
const EMOTE_SLEEP ; 6
const EMOTE_FISH ; 7
- const EMOTE_ROD ; 8 - add directional constant
+ const EMOTE_08 ; 8
+ const EMOTE_09 ; 9
+ const EMOTE_0A ; 10
+ const EMOTE_0B ; 11
EMOTE_MEM EQU -1
const_def
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index b2db8f5e2..173f0145f 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -164,7 +164,3 @@ HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111
NUM_MON_SUBMENU_ITEMS EQU 8
-
-LEN_2BPP_TILE EQU 16
-LEN_1BPP_TILE EQU 8
-TILES_PER_FRAME EQU 6
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index a355877f2..6f1d5d1d5 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -170,6 +170,16 @@ const_value SET 1
const STANDING_SPRITE
const STILL_SPRITE
+; sprite header fields
+ const_def
+ const SPRITEHEADER_ADDR_LO
+ const SPRITEHEADER_ADDR_HI
+ const SPRITEHEADER_SIZE
+ const SPRITEHEADER_BANK
+ const SPRITEHEADER_TYPE
+ const SPRITEHEADER_PALETTE
+NUM_SPRITEHEADER_FIELDS EQU const_value
+
; sprite palettes
const_def
const PAL_OW_RED
@@ -252,3 +262,5 @@ const_value SET 1
const SPRITEMOVEFN_19
const SPRITEMOVEFN_1A
const SPRITEMOVEFN_1B
+
+MAX_OUTDOOR_SPRITES EQU 23