summaryrefslogtreecommitdiff
path: root/constants/deco_constants.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2021-03-23 09:38:23 -0400
committerGitHub <noreply@github.com>2021-03-23 09:38:23 -0400
commite2838892d69c12fdafe3a40bd7386e7b26506282 (patch)
tree4eb89c1047a1aea1806b52763f05ba2846be0676 /constants/deco_constants.asm
parentdbe2360ecd3eb11fd144168427e1323f5e1b2ec2 (diff)
parent94057c7726995b0da484a39c22497876b7c22997 (diff)
Merge pull request #816 from Rangi42/lists
Verify uneven list sizes with list_start, li, and assert_list_length macros
Diffstat (limited to 'constants/deco_constants.asm')
-rw-r--r--constants/deco_constants.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 27fa09f2c..8ed1b2934 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -18,7 +18,8 @@ DECOATTR_STRUCT_LENGTH EQU _RS
NUM_DECO_TYPES EQU const_value - 1
; DecorationNames indexes (see data/decorations/names.asm)
- const_def 1
+ const_def
+ const CANCEL_DECO
const PUT_IT_AWAY
const MAGNAPLANT
const TROPICPLANT
@@ -44,6 +45,7 @@ NUM_DECO_TYPES EQU const_value - 1
const BLUE_CARPET
const YELLOW_CARPET
const GREEN_CARPET
+NUM_DECO_NAMES EQU const_value
; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm)
const_def 1