diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-03-08 07:01:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 07:01:31 -0800 |
| commit | e791c5392b19f589c51afd98666d19e778278847 (patch) | |
| tree | 4392cbecdd5166484f3a8ec8799939434159bae3 /engine/items | |
| parent | fb35fe6aba5e4e4ce7edf5b345fdf2afec4b6b49 (diff) | |
| parent | 98da09b3e90b6a132ce6d2431999485593aef0c9 (diff) | |
Merge pull request #806 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.asm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d4a969c24..b7d979fd9 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] |