summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2021-03-08 07:01:30 -0800
committerGitHub <noreply@github.com>2021-03-08 07:01:30 -0800
commitf9431c6aab479601ee0229a109154fa4f8b8b889 (patch)
tree39a5c61fd37951b562c35db534d16146d531a7e5 /engine/items
parentfb3e541e86ac6c95ad027d9c5dac055f00643aa7 (diff)
parente950809640f81c5d621c39becc4dcce15a82c064 (diff)
Merge pull request #69 from Rangi42/tables
Verify data table sizes with table_width and assert_table_length macros
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm18
1 files changed, 17 insertions, 1 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 77828b60..ae169553 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -12,7 +12,8 @@ _DoItemEffect::
ret
ItemEffects:
-; entries correspond to item ids
+; entries correspond to item ids (see constants/item_constants.asm)
+ table_width 2, ItemEffects
dw PokeBallEffect ; MASTER_BALL
dw PokeBallEffect ; ULTRA_BALL
dw NoEffect ; BRIGHTPOWDER
@@ -192,6 +193,21 @@ ItemEffects:
dw PokeBallEffect ; PARK_BALL
dw NoEffect ; RAINBOW_WING
dw NoEffect ; ITEM_B3
+ assert_table_length ITEM_B3
+; The items past ITEM_B3 do not have effect entries:
+; BRICK_PIECE
+; SURF_MAIL
+; LITEBLUEMAIL
+; PORTRAITMAIL
+; LOVELY_MAIL
+; EON_MAIL
+; MORPH_MAIL
+; BLUESKY_MAIL
+; MUSIC_MAIL
+; MIRAGE_MAIL
+; ITEM_BE
+; They all have the ITEMMENU_NOUSE attribute so they can't be used anyway.
+; NoEffect would be appropriate, with the table then being NUM_ITEMS long.
PokeBallEffect:
ld a, [wBattleMode]