diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:28:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:28:43 -0500 |
| commit | 1912b0cf0a0f42f23200ecffcb22651015478ef6 (patch) | |
| tree | d855404809d36965aaa76784bae08bdf6ea92cc7 /src/data/items.h | |
| parent | 2dfa84c10ff497d73b3a201480fa568ba62e5a38 (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-rtcscreen
Diffstat (limited to 'src/data/items.h')
| -rw-r--r-- | src/data/items.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/data/items.h b/src/data/items.h index 443c45f1a..e4e7e0fbc 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1479,7 +1479,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_ORANGE_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_ORANGE_MAIL), }, [ITEM_HARBOR_MAIL] = @@ -1491,7 +1491,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_HARBOR_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_HARBOR_MAIL), }, [ITEM_GLITTER_MAIL] = @@ -1503,7 +1503,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_GLITTER_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_GLITTER_MAIL), }, [ITEM_MECH_MAIL] = @@ -1515,7 +1515,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_MECH_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_MECH_MAIL), }, [ITEM_WOOD_MAIL] = @@ -1527,7 +1527,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_WOOD_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_WOOD_MAIL), }, [ITEM_WAVE_MAIL] = @@ -1539,7 +1539,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_WAVE_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_WAVE_MAIL), }, [ITEM_BEAD_MAIL] = @@ -1551,7 +1551,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_BEAD_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_BEAD_MAIL), }, [ITEM_SHADOW_MAIL] = @@ -1563,7 +1563,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_SHADOW_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_SHADOW_MAIL), }, [ITEM_TROPIC_MAIL] = @@ -1575,7 +1575,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_TROPIC_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_TROPIC_MAIL), }, [ITEM_DREAM_MAIL] = @@ -1587,7 +1587,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_DREAM_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_DREAM_MAIL), }, [ITEM_FAB_MAIL] = @@ -1599,7 +1599,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_FAB_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_FAB_MAIL), }, [ITEM_RETRO_MAIL] = @@ -1611,7 +1611,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = ITEM_RETRO_MAIL - FIRST_MAIL_INDEX, + .secondaryId = ITEM_TO_MAIL(ITEM_RETRO_MAIL), }, // Berries |