Begin item expansion

This commit is contained in:
DizzyEggg 2019-04-13 13:14:45 +02:00
parent 518f9c0638
commit 896602db5b
18 changed files with 3363 additions and 1754 deletions

View File

@ -19,10 +19,10 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_SUPER_REPEL
.2byte ITEM_X_SPECIAL
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_NONE

View File

@ -35,9 +35,9 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C
.align 2
LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
.2byte ITEM_X_SPEED
.2byte ITEM_X_SPECIAL
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_X_ACCURACY

View File

@ -25,7 +25,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_X_SPEED
.2byte ITEM_X_ACCURACY
.2byte ITEM_SUPER_REPEL

View File

@ -21,7 +21,7 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100
.2byte ITEM_AWAKENING
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_GUARD_SPEC
.2byte ITEM_DIRE_HIT
.2byte ITEM_X_ACCURACY

View File

@ -21,7 +21,7 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
.2byte ITEM_REVIVE
.2byte ITEM_MAX_REPEL
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_NONE
release
end

View File

@ -23,7 +23,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_ORANGE_MAIL
.2byte ITEM_NONE
release
@ -48,7 +48,7 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_ORANGE_MAIL
.2byte ITEM_NONE
release

View File

@ -26,7 +26,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_NONE
release
end
@ -50,7 +50,7 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_NONE
release
end

View File

@ -19,7 +19,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
.2byte ITEM_REVIVE
.2byte ITEM_MAX_REPEL
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_SHADOW_MAIL
.2byte ITEM_NONE
release

View File

@ -276,9 +276,9 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_X_SPEED
.2byte ITEM_X_SPECIAL
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_X_ACCURACY
@ -300,9 +300,9 @@ TrainerHill_Entrance_Pokemart_268414: @ 8268414
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_X_SPEED
.2byte ITEM_X_SPECIAL
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFEND
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_X_ACCURACY

View File

@ -22,7 +22,7 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0
.2byte ITEM_BURN_HEAL
.2byte ITEM_ICE_HEAL
.2byte ITEM_REPEL
.2byte ITEM_X_SPECIAL
.2byte ITEM_X_SP_ATK
.2byte ITEM_FLUFFY_TAIL
.2byte ITEM_NONE
release

View File

@ -127,7 +127,7 @@ Route115_EventScript_ItemPPUp:: @ 8290E6B
end
Route116_EventScript_ItemXSpecial:: @ 8290E78
giveitem_std ITEM_X_SPECIAL, 1, 1
giveitem_std ITEM_X_SP_ATK, 1, 1
end
Route116_EventScript_ItemEther:: @ 8290E85
@ -315,7 +315,7 @@ MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
end
RustboroCity_EventScript_ItemXDefend:: @ 82910DB
giveitem_std ITEM_X_DEFEND, 1, 1
giveitem_std ITEM_X_DEFENSE, 1, 1
end
LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8

View File

@ -1,6 +1,8 @@
#ifndef GUARD_BERRY_H
#define GUARD_BERRY_H
#include "constants/items.h"
#define BERRY_NONE 0
enum
@ -34,7 +36,7 @@ enum
BERRY_STAGE_SPARKLING = 0xFF,
};
#define NUM_BERRIES 44
#define NUM_BERRIES (LAST_BERRY_INDEX - FIRST_BERRY_INDEX)
extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];

View File

@ -69,4 +69,57 @@
#define HOLD_EFFECT_THICK_CLUB 65
#define HOLD_EFFECT_STICK 66
// Gen4 hold effects.
#define HOLD_EFFECT_CHOICE_SCARF 67
#define HOLD_EFFECT_CHOICE_SPECS 68
#define HOLD_EFFECT_DAMP_ROCK 69
#define HOLD_EFFECT_GRIP_CLAW 70
#define HOLD_EFFECT_HEAT_ROCK 71
#define HOLD_EFFECT_ICY_ROCK 72
#define HOLD_EFFECT_LIGHT_CLAY 73
#define HOLD_EFFECT_SMOOTH_ROCK 74
#define HOLD_EFFECT_POWER_HERB 75
#define HOLD_EFFECT_BIG_ROOT 76
#define HOLD_EFFECT_EXPERT_BELT 77
#define HOLD_EFFECT_LIFE_ORB 78
#define HOLD_EFFECT_METRONOME 79
#define HOLD_EFFECT_MUSCLE_BAND 80
#define HOLD_EFFECT_WIDE_LENS 81
#define HOLD_EFFECT_WISE_GLASSES 82
#define HOLD_EFFECT_ZOOM_LENS 83
#define HOLD_EFFECT_LAGGING_TAIL 84
#define HOLD_EFFECT_FOCUS_SASH 85
#define HOLD_EFFECT_FLAME_ORB 86
#define HOLD_EFFECT_TOXIC_ORB 87
#define HOLD_EFFECT_STICKY_BARB 88
#define HOLD_EFFECT_IRON_BALL 89
#define HOLD_EFFECT_BLACK_SLUDGE 90
#define HOLD_EFFECT_DESTINY_KNOT 91
#define HOLD_EFFECT_SHED_SHELL 92
#define HOLD_EFFECT_QUICK_POWDER 93
#define HOLD_EFFECT_ADAMANT_ORB 94
#define HOLD_EFFECT_LUSTROUS_ORB 95
#define HOLD_EFFECT_GRISEOUS_ORB 96
// Gen5 hold effects
#define HOLD_EFFECT_FLOAT_STONE 115
#define HOLD_EFFECT_EVIOLITE 116
#define HOLD_EFFECT_ASSAULT_VEST 117
#define HOLD_EFFECT_BINDING_BAND 118
#define HOLD_EFFECT_DRIVE 119
#define HOLD_EFFECT_GEMS 120
// Gen6 hold effects
#define HOLD_EFFECT_FAIRY_POWER 129
#define HOLD_EFFECT_MEGA_STONE 130
#define HOLD_EFFECT_SAFETY_GOOGLES 131
// Gen7 hold effects
#define HOLD_EFFECT_PROTECTIVE_PADS 149
#define HOLD_EFFECT_TERRAIN_EXTENDER 150
#define HOLD_EFFECT_SEEDS 151
#define HOLD_EFFECT_ADRENALINE_ORB 152
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))
#endif // GUARD_HOLD_EFFECTS_H

File diff suppressed because it is too large Load Diff

View File

@ -319,23 +319,23 @@ static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_SP_ATK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_SP_ATK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
};
static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
@ -343,23 +343,23 @@ static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_SP_ATK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_SP_ATK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
{ITEM_HYPER_POTION, ITEM_X_DEFENSE, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
};
static const u8 sPickupItemSlots[][2] =

View File

@ -55,18 +55,6 @@ const u32 *const gItemIconTable[][2] =
[ITEM_BLUE_SHARD] = {gItemIcon_Shard, gItemIconPalette_BlueShard},
[ITEM_YELLOW_SHARD] = {gItemIcon_Shard, gItemIconPalette_YellowShard},
[ITEM_GREEN_SHARD] = {gItemIcon_Shard, gItemIconPalette_GreenShard},
// ????????
[ITEM_034] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_035] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_036] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_037] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_038] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_039] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_03A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_03B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_03C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_03D] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_03E] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Vitamins
[ITEM_HP_UP] = {gItemIcon_HPUp, gItemIconPalette_HPUp},
[ITEM_PROTEIN] = {gItemIcon_Vitamin, gItemIconPalette_Protein},
@ -77,32 +65,21 @@ const u32 *const gItemIconTable[][2] =
[ITEM_PP_UP] = {gItemIcon_PPUp, gItemIconPalette_PPUp},
[ITEM_ZINC] = {gItemIcon_Vitamin, gItemIconPalette_Zinc},
[ITEM_PP_MAX] = {gItemIcon_PPMax, gItemIconPalette_PPMax},
// ????????
[ITEM_048] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Battle items
[ITEM_GUARD_SPEC] = {gItemIcon_BattleStatItem, gItemIconPalette_GuardSpec},
[ITEM_DIRE_HIT] = {gItemIcon_BattleStatItem, gItemIconPalette_DireHit},
[ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack},
[ITEM_X_DEFEND] = {gItemIcon_BattleStatItem, gItemIconPalette_XDefend},
[ITEM_X_DEFENSE] = {gItemIcon_BattleStatItem, gItemIconPalette_XDefend},
[ITEM_X_SPEED] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpeed},
[ITEM_X_ACCURACY] = {gItemIcon_BattleStatItem, gItemIconPalette_XAccuracy},
[ITEM_X_SPECIAL] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpecial},
[ITEM_X_SP_ATK] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpecial},
[ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll},
[ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail},
// ????????
[ITEM_052] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Field items
[ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel},
[ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel},
[ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope},
[ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel},
// ????????
[ITEM_057] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_058] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_059] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_05A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_05B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_05C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Evolution stones
[ITEM_SUN_STONE] = {gItemIcon_SunStone, gItemIconPalette_SunStone},
[ITEM_MOON_STONE] = {gItemIcon_MoonStone, gItemIconPalette_MoonStone},
@ -110,31 +87,15 @@ const u32 *const gItemIconTable[][2] =
[ITEM_THUNDER_STONE] = {gItemIcon_ThunderStone, gItemIconPalette_ThunderStone},
[ITEM_WATER_STONE] = {gItemIcon_WaterStone, gItemIconPalette_WaterStone},
[ITEM_LEAF_STONE] = {gItemIcon_LeafStone, gItemIconPalette_LeafStone},
// ????????
[ITEM_063] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_064] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_065] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_066] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Valuables
[ITEM_TINY_MUSHROOM] = {gItemIcon_TinyMushroom, gItemIconPalette_Mushroom},
[ITEM_BIG_MUSHROOM] = {gItemIcon_BigMushroom, gItemIconPalette_Mushroom},
[ITEM_069] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl},
[ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl},
[ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star},
[ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star},
[ITEM_NUGGET] = {gItemIcon_Nugget, gItemIconPalette_Nugget},
[ITEM_HEART_SCALE] = {gItemIcon_HeartScale, gItemIconPalette_HeartScale},
// ????????
[ITEM_070] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_071] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_072] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_073] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_074] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_075] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_076] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_077] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_078] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Mail
[ITEM_ORANGE_MAIL] = {gItemIcon_OrangeMail, gItemIconPalette_OrangeMail},
[ITEM_HARBOR_MAIL] = {gItemIcon_HarborMail, gItemIconPalette_HarborMail},
@ -192,10 +153,6 @@ const u32 *const gItemIconTable[][2] =
[ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry},
[ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry},
[ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry},
// ????????
[ITEM_0B0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0B1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0B2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Hold items
[ITEM_BRIGHT_POWDER] = {gItemIcon_BrightPowder, gItemIconPalette_BrightPowder},
[ITEM_WHITE_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb},
@ -244,35 +201,6 @@ const u32 *const gItemIconTable[][2] =
[ITEM_METAL_POWDER] = {gItemIcon_MetalPowder, gItemIconPalette_MetalPowder},
[ITEM_THICK_CLUB] = {gItemIcon_ThickClub, gItemIconPalette_ThickClub},
[ITEM_STICK] = {gItemIcon_Stick, gItemIconPalette_Stick},
// ????????
[ITEM_0E2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0E9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0EA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0EB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0EC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0ED] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0EE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0EF] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0F9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0FA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0FB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0FC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_0FD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Contest hold items
[ITEM_RED_SCARF] = {gItemIcon_Scarf, gItemIconPalette_RedScarf},
[ITEM_BLUE_SCARF] = {gItemIcon_Scarf, gItemIconPalette_BlueScarf},
@ -369,9 +297,6 @@ const u32 *const gItemIconTable[][2] =
[ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM},
[ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
[ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
// ????????
[ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// FireRed/LeafGreen key items
[ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel},
[ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute},
@ -404,4 +329,138 @@ const u32 *const gItemIconTable[][2] =
[ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap},
// Return to field arrow
[ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
// New items
[ITEM_WIDE_LENS] = {gItemIcon_WideLens, gItemIconPalette_WideLens},
[ITEM_MUSCLE_BAND] = {gItemIcon_MuscleBand, gItemIconPalette_MuscleBand},
[ITEM_WISE_GLASSES] = {gItemIcon_WiseGlasses, gItemIconPalette_WiseGlasses},
[ITEM_EXPERT_BELT] = {gItemIcon_ExpertBelt, gItemIconPalette_ExpertBelt},
[ITEM_LIGHT_CLAY] = {gItemIcon_LightClay, gItemIconPalette_LightClay},
[ITEM_LIFE_ORB] = {gItemIcon_LifeOrb, gItemIconPalette_LifeOrb},
[ITEM_POWER_HERB] = {gItemIcon_PowerHerb, gItemIconPalette_PowerHerb},
[ITEM_TOXIC_ORB] = {gItemIcon_ToxicOrb, gItemIconPalette_ToxicOrb},
[ITEM_FLAME_ORB] = {gItemIcon_FlameOrb, gItemIconPalette_FlameOrb},
[ITEM_QUICK_POWDER] = {gItemIcon_QuickPowder, gItemIconPalette_QuickPowder},
[ITEM_FOCUS_SASH] = {gItemIcon_FocusSash, gItemIconPalette_FocusSash},
[ITEM_ZOOM_LENS] = {gItemIcon_ZoomLens, gItemIconPalette_ZoomLens},
[ITEM_METRONOME] = {gItemIcon_Metronome, gItemIconPalette_Metronome},
[ITEM_IRON_BALL] = {gItemIcon_IronBall, gItemIconPalette_IronBall},
[ITEM_LAGGING_TAIL] = {gItemIcon_LaggingTail, gItemIconPalette_LaggingTail},
[ITEM_DESTINY_KNOT] = {gItemIcon_DestinyKnot, gItemIconPalette_DestinyKnot},
[ITEM_BLACK_SLUDGE] = {gItemIcon_BlackSludge, gItemIconPalette_BlackSludge},
[ITEM_ICY_ROCK] = {gItemIcon_IcyRock, gItemIconPalette_IcyRock},
[ITEM_SMOOTH_ROCK] = {gItemIcon_SmoothRock, gItemIconPalette_SmoothRock},
[ITEM_HEAT_ROCK] = {gItemIcon_HeatRock, gItemIconPalette_HeatRock},
[ITEM_DAMP_ROCK] = {gItemIcon_DampRock, gItemIconPalette_DampRock},
[ITEM_GRIP_CLAW] = {gItemIcon_GripClaw, gItemIconPalette_GripClaw},
[ITEM_CHOICE_SCARF] = {gItemIcon_ChoiceScarf, gItemIconPalette_ChoiceScarf},
[ITEM_STICKY_BARB] = {gItemIcon_StickyBarb, gItemIconPalette_StickyBarb},
[ITEM_SHED_SHELL] = {gItemIcon_ShedShell, gItemIconPalette_ShedShell},
[ITEM_BIG_ROOT] = {gItemIcon_BigRoot, gItemIconPalette_BigRoot},
[ITEM_CHOICE_SPECS] = {gItemIcon_ChoiceSpecs, gItemIconPalette_ChoiceSpecs},
[ITEM_ADAMANT_ORB] = {gItemIcon_AdamantOrb, gItemIconPalette_AdamantOrb},
[ITEM_LUSTROUS_ORB] = {gItemIcon_LustrousOrb, gItemIconPalette_LustrousOrb},
[ITEM_GRISEOUS_ORB] = {gItemIcon_GriseousOrb, gItemIconPalette_GriseousOrb},
[ITEM_FLAME_PLATE] = {gItemIcon_FlamePlate, gItemIconPalette_FlamePlate},
[ITEM_SPLASH_PLATE] = {gItemIcon_SplashPlate, gItemIconPalette_SplashPlate},
[ITEM_ZAP_PLATE] = {gItemIcon_ZapPlate, gItemIconPalette_ZapPlate},
[ITEM_MEADOW_PLATE] = {gItemIcon_MeadowPlate, gItemIconPalette_MeadowPlate},
[ITEM_ICICLE_PLATE] = {gItemIcon_IciclePlate, gItemIconPalette_IciclePlate},
[ITEM_FIST_PLATE] = {gItemIcon_FistPlate, gItemIconPalette_FistPlate},
[ITEM_TOXIC_PLATE] = {gItemIcon_ToxicPlate, gItemIconPalette_ToxicPlate},
[ITEM_EARTH_PLATE] = {gItemIcon_EarthPlate, gItemIconPalette_EarthPlate},
[ITEM_SKY_PLATE] = {gItemIcon_SkyPlate, gItemIconPalette_SkyPlate},
[ITEM_MIND_PLATE] = {gItemIcon_MindPlate, gItemIconPalette_MindPlate},
[ITEM_INSECT_PLATE] = {gItemIcon_InsectPlate, gItemIconPalette_InsectPlate},
[ITEM_STONE_PLATE] = {gItemIcon_StonePlate, gItemIconPalette_StonePlate},
[ITEM_SPOOKY_PLATE] = {gItemIcon_SpookyPlate, gItemIconPalette_SpookyPlate},
[ITEM_DRACO_PLATE] = {gItemIcon_DracoPlate, gItemIconPalette_DracoPlate},
[ITEM_DREAD_PLATE] = {gItemIcon_DreadPlate, gItemIconPalette_DreadPlate},
[ITEM_IRON_PLATE] = {gItemIcon_IronPlate, gItemIconPalette_IronPlate},
[ITEM_HONEY] = {gItemIcon_Honey, gItemIconPalette_Honey},
// Gen 5 Items
[ITEM_EVIOLITE] = {gItemIcon_Eviolite, gItemIconPalette_Eviolite},
[ITEM_FLOAT_STONE] = {gItemIcon_FloatStone, gItemIconPalette_FloatStone},
[ITEM_BINDING_BAND] = {gItemIcon_BindingBand, gItemIconPalette_BindingBand},
[ITEM_DOUSE_DRIVE] = {gItemIcon_DouseDrive, gItemIconPalette_DouseDrive},
[ITEM_SHOCK_DRIVE] = {gItemIcon_ShockDrive, gItemIconPalette_ShockDrive},
[ITEM_BURN_DRIVE] = {gItemIcon_BurnDrive, gItemIconPalette_BurnDrive},
[ITEM_CHILL_DRIVE] = {gItemIcon_ChillDrive, gItemIconPalette_ChillDrive},
[ITEM_FIRE_GEM] = {gItemIcon_FireGem, gItemIconPalette_FireGem},
[ITEM_WATER_GEM] = {gItemIcon_WaterGem, gItemIconPalette_WaterGem},
[ITEM_ELECTRIC_GEM] = {gItemIcon_ElectricGem, gItemIconPalette_ElectricGem},
[ITEM_GRASS_GEM] = {gItemIcon_GrassGem, gItemIconPalette_GrassGem},
[ITEM_ICE_GEM] = {gItemIcon_IceGem, gItemIconPalette_IceGem},
[ITEM_FIGHTING_GEM] = {gItemIcon_FightingGem, gItemIconPalette_FightingGem},
[ITEM_POISON_GEM] = {gItemIcon_PoisonGem, gItemIconPalette_PoisonGem},
[ITEM_GROUND_GEM] = {gItemIcon_GroundGem, gItemIconPalette_GroundGem},
[ITEM_FLYING_GEM] = {gItemIcon_FlyingGem, gItemIconPalette_FlyingGem},
[ITEM_PSYCHIC_GEM] = {gItemIcon_PsychicGem, gItemIconPalette_PsychicGem},
[ITEM_BUG_GEM] = {gItemIcon_BugGem, gItemIconPalette_BugGem},
[ITEM_ROCK_GEM] = {gItemIcon_RockGem, gItemIconPalette_RockGem},
[ITEM_GHOST_GEM] = {gItemIcon_GhostGem, gItemIconPalette_GhostGem},
[ITEM_DRAGON_GEM] = {gItemIcon_DragonGem, gItemIconPalette_DragonGem},
[ITEM_DARK_GEM] = {gItemIcon_DarkGem, gItemIconPalette_DarkGem},
[ITEM_STEEL_GEM] = {gItemIcon_SteelGem, gItemIconPalette_SteelGem},
[ITEM_NORMAL_GEM] = {gItemIcon_NormalGem, gItemIconPalette_NormalGem},
[ITEM_FAIRY_GEM] = {gItemIcon_FairyGem, gItemIconPalette_FairyGem},
// Gen 6 Items
[ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest},
[ITEM_PIXIE_PLATE] = {gItemIcon_PixiePlate, gItemIconPalette_PixiePlate},
[ITEM_SAFETY_GOGGLES] = {gItemIcon_SafetyGoggles, gItemIconPalette_SafetyGoggles},
[ITEM_GENGARITE] = {gItemIcon_Gengarite, gItemIconPalette_Gengarite},
[ITEM_GARDEVOIRITE] = {gItemIcon_Gardevoirite, gItemIconPalette_Gardevoirite},
[ITEM_AMPHAROSITE] = {gItemIcon_Ampharosite, gItemIconPalette_Ampharosite},
[ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite},
[ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX},
[ITEM_BLASTOISINITE] = {gItemIcon_Blastoisinite, gItemIconPalette_Blastoisinite},
[ITEM_MEWTWONITE_X] = {gItemIcon_MewtwoniteX, gItemIconPalette_MewtwoniteX},
[ITEM_MEWTWONITE_Y] = {gItemIcon_MewtwoniteY, gItemIconPalette_MewtwoniteY},
[ITEM_BLAZIKENITE] = {gItemIcon_Blazikenite, gItemIconPalette_Blazikenite},
[ITEM_MEDICHAMITE] = {gItemIcon_Medichamite, gItemIconPalette_Medichamite},
[ITEM_HOUNDOOMINITE] = {gItemIcon_Houndoominite, gItemIconPalette_Houndoominite},
[ITEM_AGGRONITE] = {gItemIcon_Aggronite, gItemIconPalette_Aggronite},
[ITEM_BANETTITE] = {gItemIcon_Banettite, gItemIconPalette_Banettite},
[ITEM_TYRANITARITE] = {gItemIcon_Tyranitarite, gItemIconPalette_Tyranitarite},
[ITEM_SCIZORITE] = {gItemIcon_Scizorite, gItemIconPalette_Scizorite},
[ITEM_PINSIRITE] = {gItemIcon_Pinsirite, gItemIconPalette_Pinsirite},
[ITEM_AERODACTYLITE] = {gItemIcon_Aerodactylite, gItemIconPalette_Aerodactylite},
[ITEM_LUCARIONITE] = {gItemIcon_Lucarionite, gItemIconPalette_Lucarionite},
[ITEM_ABOMASITE] = {gItemIcon_Abomasite, gItemIconPalette_Abomasite},
[ITEM_KANGASKHANITE] = {gItemIcon_Kangaskhanite, gItemIconPalette_Kangaskhanite},
[ITEM_GYARADOSITE] = {gItemIcon_Gyaradosite, gItemIconPalette_Gyaradosite},
[ITEM_ABSOLITE] = {gItemIcon_Absolite, gItemIconPalette_Absolite},
[ITEM_CHARIZARDITE_Y] = {gItemIcon_CharizarditeY, gItemIconPalette_CharizarditeY},
[ITEM_ALAKAZITE] = {gItemIcon_Alakazite, gItemIconPalette_Alakazite},
[ITEM_HERACRONITE] = {gItemIcon_Heracronite, gItemIconPalette_Heracronite},
[ITEM_MAWILITE] = {gItemIcon_Mawilite, gItemIconPalette_Mawilite},
[ITEM_MANECTITE] = {gItemIcon_Manectite, gItemIconPalette_Manectite},
[ITEM_GARCHOMPITE] = {gItemIcon_Garchompite, gItemIconPalette_Garchompite},
[ITEM_LATIASITE] = {gItemIcon_Latiasite, gItemIconPalette_Latiasite},
[ITEM_LATIOSITE] = {gItemIcon_Latiosite, gItemIconPalette_Latiosite},
[ITEM_SWAMPERTITE] = {gItemIcon_Swampertite, gItemIconPalette_Swampertite},
[ITEM_SCEPTILITE] = {gItemIcon_Sceptilite, gItemIconPalette_Sceptilite},
[ITEM_SABLENITE] = {gItemIcon_Sablenite, gItemIconPalette_Sablenite},
[ITEM_ALTARIANITE] = {gItemIcon_Altarianite, gItemIconPalette_Altarianite},
[ITEM_GALLADITE] = {gItemIcon_Galladite, gItemIconPalette_Galladite},
[ITEM_AUDINITE] = {gItemIcon_Audinite, gItemIconPalette_Audinite},
[ITEM_METAGROSSITE] = {gItemIcon_Metagrossite, gItemIconPalette_Metagrossite},
[ITEM_SHARPEDONITE] = {gItemIcon_Sharpedonite, gItemIconPalette_Sharpedonite},
[ITEM_SLOWBRONITE] = {gItemIcon_Slowbronite, gItemIconPalette_Slowbronite},
[ITEM_STEELIXITE] = {gItemIcon_Steelixite, gItemIconPalette_Steelixite},
[ITEM_PIDGEOTITE] = {gItemIcon_Pidgeotite, gItemIconPalette_Pidgeotite},
[ITEM_GLALITITE] = {gItemIcon_Glalitite, gItemIconPalette_Glalitite},
[ITEM_DIANCITE] = {gItemIcon_Diancite, gItemIconPalette_Diancite},
[ITEM_CAMERUPTITE] = {gItemIcon_Cameruptite, gItemIconPalette_Cameruptite},
[ITEM_LOPUNNITE] = {gItemIcon_Lopunnite, gItemIconPalette_Lopunnite},
[ITEM_SALAMENCITE] = {gItemIcon_Salamencite, gItemIconPalette_Salamencite},
[ITEM_BEEDRILLITE] = {gItemIcon_Beedrillite, gItemIconPalette_Beedrillite},
[ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet},
// Gen 7 Items
[ITEM_PROTECTIVE_PADS] = {gItemIcon_ProtectivePads, gItemIconPalette_ProtectivePads},
[ITEM_TERRAIN_EXTENDER] = {gItemIcon_TerrainExtender, gItemIconPalette_TerrainExtender},
[ITEM_ELECTRIC_SEED] = {gItemIcon_ElectricSeed, gItemIconPalette_ElectricSeed},
[ITEM_GRASSY_SEED] = {gItemIcon_GrassySeed, gItemIconPalette_GrassySeed},
[ITEM_MISTY_SEED] = {gItemIcon_MistySeed, gItemIconPalette_MistySeed},
[ITEM_PSYCHIC_SEED] = {gItemIcon_PsychicSeed, gItemIconPalette_PsychicSeed},
[ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb},
};

File diff suppressed because it is too large Load Diff

View File

@ -324,3 +324,132 @@ const u8 gSapphireItemDescription[] = _("A brilliant blue gem\nthat symbolizes\n
// Emerald-specific key items
const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA's mark.");
const u8 gOldSeaMapItemDescription[] = _("A faded sea chart\nthat shows the way\nto a certain island.");
// New items
const u8 gWideLensItemDescription[] = _("A magnifying lens\nthat boosts the\naccuracy of moves.");
const u8 gMuscleBandItemDescription[] = _("A headband that\nboosts the power of\nphysical moves.");
const u8 gWiseGlassesItemDescription[] = _("A pair of glasses\nthat boosts the power\nof special moves.");
const u8 gExpertBeltItemDescription[] = _("A belt that boosts\nthe power of super\neffective moves.");
const u8 gLightClayItemDescription[] = _("Extends the duration\nof barrier moves\nused by the holder.");
const u8 gLifeOrbItemDescription[] = _("Boosts the power of\nmoves at the cost\nof some HP per turn.");
const u8 gPowerHerbItemDescription[] = _("Allows the immediate\nuse of a move that\ncharges first.");
const u8 gToxicOrbItemDescription[] = _("A bizarre orb that\nbadly poisons the\nholder in battle.");
const u8 gFlameOrbItemDescription[] = _("A bizarre orb that\ninflicts a burn on\nholder in battle.");
const u8 gQuickPowderItemDescription[] = _("An item to be held\nby Ditto. This odd\npowder boosts Speed.");
const u8 gFocusSashItemDescription[] = _("If the holder has\nfull HP, it endures\nKO attacks with 1 HP.");
const u8 gZoomLensItemDescription[] = _("If the holder moves\nafter the foe, its\naccuracy is boosted.");
const u8 gMetronomeItemDescription[] = _("A held item that\nboosts a move used\nconsecutively.");
const u8 gIronBallItemDescription[] = _("Lowers Speed and\nlets Flying-types be\nhit by Ground moves.");
const u8 gLaggingTailItemDescription[] = _("A held item that\nmakes the holder\nmove slower.");
const u8 gDestinyKnotItemDescription[] = _("If the holder becomes\ninfatuated, the\nfoe does too.");
const u8 gBlackSludgeItemDescription[] = _("Gradually restores\nHP of Poison-types.\nDamages others.");
const u8 gIcyRockItemDescription[] = _("Extends the duration\nof the move Hail\nused by the holder.");
const u8 gSmoothRockItemDescription[] = _("Extends the duration\nof Sandstorm if\nused by the holder.");
const u8 gHeatRockItemDescription[] = _("Extends the duration\nof Sunny Day if\nused by the holder.");
const u8 gDampRockItemDescription[] = _("Extends the duration\nof Rain Dance if\nused by the holder.");
const u8 gGripClawItemDescription[] = _("Makes binding moves\nused by the holder\ngo on for 7 turns.");
const u8 gChoiceScarfItemDescription[] = _("Boosts Speed, but\nallows the use of\nonly one move.");
const u8 gStickyBarbItemDescription[] = _("Damages the holder\neach turn. May latch\non to foes.");
const u8 gShedShellItemDescription[] = _("Enables the holder\nto switch out of\nbattle without fail.");
const u8 gBigRootItemDescription[] = _("A held item that\nboosts the power of\nHP-stealing moves.");
const u8 gChoiceSpecsItemDescription[] = _("Boosts Sp. Atk, but\nallows the use of\nonly one move.");
const u8 gAdamantOrbItemDescription[] = _("Boosts the power of\nDialga's Dragon and\nSteel-type moves.");
const u8 gLustrousOrbItemDescription[] = _("Boosts the power of\nPalkia's Dragon and\nWater-type moves.");
const u8 gGriseousOrbItemDescription[] = _("Boosts the power of\nGiratina's Dragon\nand Ghost-type moves.");
const u8 gFlamePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFire-type moves.");
const u8 gSplashPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nWater-type moves.");
const u8 gZapPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nElectric-type moves.");
const u8 gMeadowPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nGrass-type moves.");
const u8 gIciclePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nIce-type moves.");
const u8 gFistPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFighting-type moves.");
const u8 gToxicPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nPoison-type moves.");
const u8 gEarthPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nGround-type moves.");
const u8 gSkyPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFlying-type moves.");
const u8 gMindPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nPsychic-type moves.");
const u8 gInsectPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nBug-type moves.");
const u8 gStonePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nRock-type moves.");
const u8 gSpookyPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nGhost-type moves.");
const u8 gDracoPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nDragon-type moves.");
const u8 gDreadPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nDark-type moves.");
const u8 gIronPlateItemDescription[] = _("A stone tablet that\nboosts the power of\nSteel-type moves.");
const u8 gEvioliteItemDescription[] = _("Raises the Def and\nSp. Def of Pokémon\nthat can still evolve.");
const u8 gFloatStoneItemDescription[] = _("A light stone that\nreduces the weight\nof Pokémon when held.");
const u8 gBindingBandItemDescription[] = _("This band increases\nthe power of binding\nmoves when held.");
const u8 gDouseDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Water type.");
const u8 gShockDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Electric type.");
const u8 gBurnDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Fire type.");
const u8 gChillDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Ice type.");
const u8 gFireGemItemDescription[] = _("Increases the\npower of Fire\nType moves.");
const u8 gWaterGemItemDescription[] = _("Increases the\npower of Water\nType moves.");
const u8 gElectricGemItemDescription[] = _("Increases the\npower of Electric\nType moves.");
const u8 gGrassGemItemDescription[] = _("Increases the\npower of Grass\nType moves.");
const u8 gIceGemItemDescription[] = _("Increases the\npower of Ice\nType moves.");
const u8 gFightingGemItemDescription[] = _("Increases the\npower of Fighting\nType moves.");
const u8 gPoisonGemItemDescription[] = _("Increases the\npower of Poison\nType moves.");
const u8 gGroundGemItemDescription[] = _("Increases the\npower of Ground\nType moves.");
const u8 gFlyingGemItemDescription[] = _("Increases the\npower of Flying\nType moves.");
const u8 gPsychicGemItemDescription[] = _("Increases the\npower of Psychic\nType moves.");
const u8 gBugGemItemDescription[] = _("Increases the\npower of Bug\nType moves.");
const u8 gRockGemItemDescription[] = _("Increases the\npower of Rock\nType moves.");
const u8 gGhostGemItemDescription[] = _("Increases the\npower of Ghost\nType moves.");
const u8 gDragonGemItemDescription[] = _("Increases the\npower of Dragon\nType moves.");
const u8 gDarkGemItemDescription[] = _("Increases the\npower of Dark\nType moves.");
const u8 gSteelGemItemDescription[] = _("Increases the\npower of Steel\nType moves.");
const u8 gNormalGemItemDescription[] = _("Increases the\npower of Normal\nType moves.");
const u8 gFairyGemItemDescription[] = _("Increases the\npower of Fairy\nType moves.");
const u8 gAssaultVestItemDescription[] = _("Raises Sp. Def but\nprevents the use of\nstatus moves.");
const u8 gPixiePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFairy-type moves.");
const u8 gSafetyGogglesItemDescription[] = _("Protect from\nweather damage and\npowder moves.");
const u8 gGengariteItemDescription[] = _("This stone enables\nGengar to Mega\nEvolve in battle.");
const u8 gGardevoiriteItemDescription[] = _("This stone enables\nGardevoir to Mega\nEvolve in battle.");
const u8 gAmpharositeItemDescription[] = _("This stone enables\nAmpharos to Mega\nEvolve in battle.");
const u8 gVenusauriteItemDescription[] = _("This stone enables\nVenusaur to Mega\nEvolve in battle.");
const u8 gCharizarditeItemDescription[] = _("This stone enables\nCharizard to Mega\nEvolve in battle.");
const u8 gBlastoisiniteItemDescription[] = _("This stone enables\nBlastoise to Mega\nEvolve in battle.");
const u8 gMewtwoniteItemDescription[] = _("This stone enables\nMewtwo to Mega\nEvolve in battle.");
const u8 gBlazikeniteItemDescription[] = _("This stone enables\nBlaziken to Mega\nEvolve in battle.");
const u8 gMedichamiteItemDescription[] = _("This stone enables\nMedicham to Mega\nEvolve in battle.");
const u8 gHoundoominiteItemDescription[] = _("This stone enables\nHoundoom to Mega\nEvolve in battle.");
const u8 gAggroniteItemDescription[] = _("This stone enables\nAggron to Mega\nEvolve in battle.");
const u8 gBanettiteItemDescription[] = _("This stone enables\nBanette to Mega\nEvolve in battle.");
const u8 gTyranitariteItemDescription[] = _("This stone enables\nTyranitar to Mega\nEvolve in battle.");
const u8 gScizoriteItemDescription[] = _("This stone enables\nScizor to Mega\nEvolve in battle.");
const u8 gPinsiriteItemDescription[] = _("This stone enables\nPinsir to Mega\nEvolve in battle.");
const u8 gAerodactyliteItemDescription[] = _("This stone enables\nAerodactyl to Mega\nEvolve in battle.");
const u8 gLucarioniteItemDescription[] = _("This stone enables\nLucario to Mega\nEvolve in battle.");
const u8 gAbomasiteItemDescription[] = _("This stone enables\nAbomasnow to Mega\nEvolve in battle.");
const u8 gKangaskhaniteItemDescription[] = _("This stone enables\nKangaskhan to Mega\nEvolve in battle.");
const u8 gGyaradositeItemDescription[] = _("This stone enables\nGyarados to Mega\nEvolve in battle.");
const u8 gAbsoliteItemDescription[] = _("This stone enables\nAbsol to Mega\nEvolve in battle.");
const u8 gAlakaziteItemDescription[] = _("This stone enables\nAlakazam to Mega\nEvolve in battle.");
const u8 gHeracroniteItemDescription[] = _("This stone enables\nHeracross to Mega\nEvolve in battle.");
const u8 gMawiliteItemDescription[] = _("This stone enables\nMawile to Mega\nEvolve in battle.");
const u8 gManectiteItemDescription[] = _("This stone enables\nManectric to Mega\nEvolve in battle.");
const u8 gGarchompiteItemDescription[] = _("This stone enables\nGarchomp to Mega\nEvolve in battle.");
const u8 gLatiasiteItemDescription[] = _("This stone enables\nLatias to Mega\nEvolve in battle.");
const u8 gLatiositeItemDescription[] = _("This stone enables\nLatios to Mega\nEvolve in battle.");
const u8 gSwampertiteItemDescription[] = _("This stone enables\nSwampert to Mega\nEvolve in battle.");
const u8 gSceptiliteItemDescription[] = _("This stone enables\nSceptile to Mega\nEvolve in battle.");
const u8 gSableniteItemDescription[] = _("This stone enables\nSableye to Mega\nEvolve in battle.");
const u8 gAltarianiteItemDescription[] = _("This stone enables\nAltaria to Mega\nEvolve in battle.");
const u8 gGalladiteItemDescription[] = _("This stone enables\nGallade to Mega\nEvolve in battle.");
const u8 gAudiniteItemDescription[] = _("This stone enables\nAudino to Mega\nEvolve in battle.");
const u8 gMetagrossiteItemDescription[] = _("This stone enables\nMetagross to Mega\nEvolve in battle.");
const u8 gSharpedoniteItemDescription[] = _("This stone enables\nSharpedo to Mega\nEvolve in battle.");
const u8 gSlowbroniteItemDescription[] = _("This stone enables\nSlowbro to Mega\nEvolve in battle.");
const u8 gSteelixiteItemDescription[] = _("This stone enables\nSteelix to Mega\nEvolve in battle.");
const u8 gPidgeotiteItemDescription[] = _("This stone enables\nPidgeot to Mega\nEvolve in battle.");
const u8 gGlalititeItemDescription[] = _("This stone enables\nGlalie to Mega\nEvolve in battle.");
const u8 gDianciteItemDescription[] = _("This stone enables\nDiancie to Mega\nEvolve in battle.");
const u8 gCameruptiteItemDescription[] = _("This stone enables\nCamerupt to Mega\nEvolve in battle.");
const u8 gLopunniteItemDescription[] = _("This stone enables\nLopunny to Mega\nEvolve in battle.");
const u8 gSalamenciteItemDescription[] = _("This stone enables\nSalamence to Mega\nEvolve in battle.");
const u8 gBeedrilliteItemDescription[] = _("This stone enables\nBeedrill to Mega\nEvolve in battle.");
const u8 gMegaBraceletItemDescription[] = _("Allows Pokémon holding\na Mega Stone to Mega\nEvolve in battle.");
const u8 gProtectPadsItemDescription[] = _("Guard the holder\nfrom contact move\neffects.");
const u8 gTerrainExtenderItemDescription[] = _("Extends the length\nof the active\nbattle terrain.");
const u8 gElectricSeedItemDescription[] = _("Boosts Defense on\nElectric Terrain,\nbut only one time.");
const u8 gGrassySeedItemDescription[] = _("Boosts Defense on\nGrassy Terrain,\nbut only one time.");
const u8 gMistySeedItemDescription[] = _("Boosts Sp. Def. on\nMisty Terrain,\nbut only one time.");
const u8 gPsychicSeedItemDescription[] = _("Boosts Sp. Def. on\nPsychic Terrain,\nbut only one time.");
const u8 gAdrenalineOrbItemDescription[] = _("Boosts Speed if the\nuser is intimidated,\nbut only one time.");
const u8 gHoneyItemDescription[] = _("A sweet honey that\nattracts wild Pokémon\nin grass or on trees.");