From 896602db5ba42f7fa9654455328c03c77dd83251 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 13 Apr 2019 13:14:45 +0200 Subject: [PATCH 01/52] Begin item expansion --- data/maps/FallarborTown_Mart/scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- data/maps/MauvilleCity_Mart/scripts.inc | 2 +- data/maps/MossdeepCity_Mart/scripts.inc | 2 +- data/maps/PetalburgCity_Mart/scripts.inc | 4 +- data/maps/RustboroCity_Mart/scripts.inc | 4 +- data/maps/SootopolisCity_Mart/scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 8 +- data/maps/VerdanturfTown_Mart/scripts.inc | 2 +- data/scripts/item_ball_scripts.inc | 4 +- include/berry.h | 4 +- include/constants/hold_effects.h | 53 + include/constants/items.h | 1104 +++-- src/battle_pyramid.c | 20 +- src/data/item_icon_table.h | 213 +- src/data/items.h | 3556 +++++++++++------ src/data/text/item_descriptions.h | 129 + 18 files changed, 3363 insertions(+), 1754 deletions(-) diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index bd9de930c..f4947288d 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -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 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 053ff4632..e05814280 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -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 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 7cab0f1fa..c4e7a4095 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -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 diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 44e36489a..77bb92890 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -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 diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 11c911c45..bc7546049 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -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 diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 2bd72b69e..26b7e0f3c 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -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 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index a5693847c..3e1e758dc 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -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 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index fe0270d62..a09447581 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -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 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 60dc2149a..994bec935 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -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 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 6457aa626..109f3219f 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -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 diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 045fbb5a7..d1ee1c69b 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -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 diff --git a/include/berry.h b/include/berry.h index ee581b9c1..e6da0517d 100644 --- a/include/berry.h +++ b/include/berry.h @@ -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[]; diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index b653f5a92..84368ae91 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -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 diff --git a/include/constants/items.h b/include/constants/items.h index 294499c8b..5418ceee0 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -2,7 +2,6 @@ #define GUARD_CONSTANTS_ITEMS_H #define ITEM_NONE 0 - // Balls #define ITEM_MASTER_BALL 1 #define ITEM_ULTRA_BALL 2 @@ -15,464 +14,695 @@ #define ITEM_REPEAT_BALL 9 #define ITEM_TIMER_BALL 10 #define ITEM_LUXURY_BALL 11 -#define ITEM_PREMIER_BALL 12 - +#define ITEM_DUSK_BALL 12 +#define ITEM_HEAL_BALL 13 +#define ITEM_QUICK_BALL 14 +#define ITEM_CHERISH_BALL 15 +#define ITEM_FAST_BALL 16 +#define ITEM_LEVEL_BALL 17 +#define ITEM_LURE_BALL 18 +#define ITEM_HEAVY_BALL 19 +#define ITEM_LOVE_BALL 20 +#define ITEM_FRIEND_BALL 21 +#define ITEM_MOON_BALL 22 +#define ITEM_SPORT_BALL 23 +#define ITEM_PARK_BALL 24 +#define ITEM_DREAM_BALL 25 +#define ITEM_BEAST_BALL 26 +#define ITEM_PREMIER_BALL 27 // Pokemon Items -#define ITEM_POTION 13 -#define ITEM_ANTIDOTE 14 -#define ITEM_BURN_HEAL 15 -#define ITEM_ICE_HEAL 16 -#define ITEM_AWAKENING 17 -#define ITEM_PARALYZE_HEAL 18 -#define ITEM_FULL_RESTORE 19 -#define ITEM_MAX_POTION 20 -#define ITEM_HYPER_POTION 21 -#define ITEM_SUPER_POTION 22 -#define ITEM_FULL_HEAL 23 -#define ITEM_REVIVE 24 -#define ITEM_MAX_REVIVE 25 -#define ITEM_FRESH_WATER 26 -#define ITEM_SODA_POP 27 -#define ITEM_LEMONADE 28 -#define ITEM_MOOMOO_MILK 29 -#define ITEM_ENERGY_POWDER 30 -#define ITEM_ENERGY_ROOT 31 -#define ITEM_HEAL_POWDER 32 -#define ITEM_REVIVAL_HERB 33 -#define ITEM_ETHER 34 -#define ITEM_MAX_ETHER 35 -#define ITEM_ELIXIR 36 -#define ITEM_MAX_ELIXIR 37 -#define ITEM_LAVA_COOKIE 38 -#define ITEM_BLUE_FLUTE 39 -#define ITEM_YELLOW_FLUTE 40 -#define ITEM_RED_FLUTE 41 -#define ITEM_BLACK_FLUTE 42 -#define ITEM_WHITE_FLUTE 43 -#define ITEM_BERRY_JUICE 44 -#define ITEM_SACRED_ASH 45 -#define ITEM_SHOAL_SALT 46 -#define ITEM_SHOAL_SHELL 47 -#define ITEM_RED_SHARD 48 -#define ITEM_BLUE_SHARD 49 -#define ITEM_YELLOW_SHARD 50 -#define ITEM_GREEN_SHARD 51 -#define ITEM_034 52 -#define ITEM_035 53 -#define ITEM_036 54 -#define ITEM_037 55 -#define ITEM_038 56 -#define ITEM_039 57 -#define ITEM_03A 58 -#define ITEM_03B 59 -#define ITEM_03C 60 -#define ITEM_03D 61 -#define ITEM_03E 62 -#define ITEM_HP_UP 63 -#define ITEM_PROTEIN 64 -#define ITEM_IRON 65 -#define ITEM_CARBOS 66 -#define ITEM_CALCIUM 67 -#define ITEM_RARE_CANDY 68 -#define ITEM_PP_UP 69 -#define ITEM_ZINC 70 -#define ITEM_PP_MAX 71 -#define ITEM_048 72 -#define ITEM_GUARD_SPEC 73 -#define ITEM_DIRE_HIT 74 -#define ITEM_X_ATTACK 75 -#define ITEM_X_DEFEND 76 -#define ITEM_X_SPEED 77 -#define ITEM_X_ACCURACY 78 -#define ITEM_X_SPECIAL 79 -#define ITEM_POKE_DOLL 80 -#define ITEM_FLUFFY_TAIL 81 -#define ITEM_052 82 -#define ITEM_SUPER_REPEL 83 -#define ITEM_MAX_REPEL 84 -#define ITEM_ESCAPE_ROPE 85 -#define ITEM_REPEL 86 -#define ITEM_057 87 -#define ITEM_058 88 -#define ITEM_059 89 -#define ITEM_05A 90 -#define ITEM_05B 91 -#define ITEM_05C 92 -#define ITEM_SUN_STONE 93 -#define ITEM_MOON_STONE 94 -#define ITEM_FIRE_STONE 95 -#define ITEM_THUNDER_STONE 96 -#define ITEM_WATER_STONE 97 -#define ITEM_LEAF_STONE 98 -#define ITEM_063 99 -#define ITEM_064 100 -#define ITEM_065 101 -#define ITEM_066 102 - +#define ITEM_POTION 28 +#define ITEM_ANTIDOTE 29 +#define ITEM_BURN_HEAL 30 +#define ITEM_ICE_HEAL 31 +#define ITEM_AWAKENING 32 +#define ITEM_PARALYZE_HEAL 33 +#define ITEM_FULL_RESTORE 34 +#define ITEM_MAX_POTION 35 +#define ITEM_HYPER_POTION 36 +#define ITEM_SUPER_POTION 37 +#define ITEM_FULL_HEAL 38 +#define ITEM_REVIVE 39 +#define ITEM_MAX_REVIVE 40 +#define ITEM_FRESH_WATER 41 +#define ITEM_SODA_POP 42 +#define ITEM_LEMONADE 43 +#define ITEM_MOOMOO_MILK 44 +#define ITEM_ENERGY_POWDER 45 +#define ITEM_ENERGY_ROOT 46 +#define ITEM_HEAL_POWDER 47 +#define ITEM_REVIVAL_HERB 48 +#define ITEM_ETHER 49 +#define ITEM_MAX_ETHER 50 +#define ITEM_ELIXIR 51 +#define ITEM_MAX_ELIXIR 52 +#define ITEM_LAVA_COOKIE 53 +#define ITEM_BLUE_FLUTE 54 +#define ITEM_YELLOW_FLUTE 55 +#define ITEM_RED_FLUTE 56 +#define ITEM_BLACK_FLUTE 57 +#define ITEM_WHITE_FLUTE 58 +#define ITEM_BERRY_JUICE 59 +#define ITEM_SWEET_HEART 60 +#define ITEM_BIG_MALASADA 61 +#define ITEM_OLD_GATEAU 62 +#define ITEM_SACRED_ASH 63 +#define ITEM_SHOAL_SALT 64 +#define ITEM_SHOAL_SHELL 65 +#define ITEM_RED_SHARD 66 +#define ITEM_BLUE_SHARD 67 +#define ITEM_YELLOW_SHARD 68 +#define ITEM_GREEN_SHARD 69 +#define ITEM_HP_UP 70 +#define ITEM_PROTEIN 71 +#define ITEM_IRON 72 +#define ITEM_CARBOS 73 +#define ITEM_CALCIUM 74 +#define ITEM_RARE_CANDY 75 +#define ITEM_PP_UP 76 +#define ITEM_ZINC 77 +#define ITEM_PP_MAX 78 +#define ITEM_GUARD_SPEC 79 +#define ITEM_DIRE_HIT 80 +#define ITEM_X_ATTACK 81 +#define ITEM_X_DEFENSE 82 +#define ITEM_X_SPEED 83 +#define ITEM_X_ACCURACY 84 +#define ITEM_X_SP_ATK 85 +#define ITEM_X_SP_DEF 86 +#define ITEM_POKE_DOLL 87 +#define ITEM_FLUFFY_TAIL 88 +#define ITEM_ESCAPE_ROPE 89 +#define ITEM_REPEL 90 +#define ITEM_SUPER_REPEL 91 +#define ITEM_MAX_REPEL 92 +#define ITEM_ABILITY_CAPSULE 93 +// Evolution stones +#define ITEM_SUN_STONE 94 +#define ITEM_MOON_STONE 95 +#define ITEM_FIRE_STONE 96 +#define ITEM_THUNDER_STONE 97 +#define ITEM_WATER_STONE 98 +#define ITEM_LEAF_STONE 99 +#define ITEM_DAWN_STONE 100 +#define ITEM_DUSK_STONE 101 +#define ITEM_SHINY_STONE 102 +#define ITEM_ICE_STONE 103 // Unusable -#define ITEM_TINY_MUSHROOM 103 -#define ITEM_BIG_MUSHROOM 104 -#define ITEM_069 105 -#define ITEM_PEARL 106 -#define ITEM_BIG_PEARL 107 -#define ITEM_STARDUST 108 -#define ITEM_STAR_PIECE 109 -#define ITEM_NUGGET 110 -#define ITEM_HEART_SCALE 111 -#define ITEM_070 112 -#define ITEM_071 113 -#define ITEM_072 114 -#define ITEM_073 115 -#define ITEM_074 116 -#define ITEM_075 117 -#define ITEM_076 118 -#define ITEM_077 119 -#define ITEM_078 120 - +#define ITEM_RED_APRICORN 104 +#define ITEM_BLUE_APRICORN 105 +#define ITEM_YELLOW_APRICORN 106 +#define ITEM_GREEN_APRICORN 107 +#define ITEM_PINK_APRICORN 108 +#define ITEM_WHITE_APRICORN 109 +#define ITEM_BLACK_APRICORN 110 +#define ITEM_TINY_MUSHROOM 111 +#define ITEM_BIG_MUSHROOM 112 +#define ITEM_PEARL 113 +#define ITEM_BIG_PEARL 114 +#define ITEM_STARDUST 115 +#define ITEM_STAR_PIECE 116 +#define ITEM_NUGGET 117 +#define ITEM_HEART_SCALE 118 +#define ITEM_RED_NECTAR 119 +#define ITEM_YELLOW_NECTAR 120 +#define ITEM_PINK_NECTAR 121 +#define ITEM_PURPLE_NECTAR 122 +#define ITEM_HONEY 123 +#define ITEM_RARE_BONE 124 // Mails -#define ITEM_ORANGE_MAIL 121 -#define ITEM_HARBOR_MAIL 122 -#define ITEM_GLITTER_MAIL 123 -#define ITEM_MECH_MAIL 124 -#define ITEM_WOOD_MAIL 125 -#define ITEM_WAVE_MAIL 126 -#define ITEM_BEAD_MAIL 127 -#define ITEM_SHADOW_MAIL 128 -#define ITEM_TROPIC_MAIL 129 -#define ITEM_DREAM_MAIL 130 -#define ITEM_FAB_MAIL 131 -#define ITEM_RETRO_MAIL 132 - +#define ITEM_ORANGE_MAIL 125 +#define ITEM_HARBOR_MAIL 126 +#define ITEM_GLITTER_MAIL 127 +#define ITEM_MECH_MAIL 128 +#define ITEM_WOOD_MAIL 129 +#define ITEM_WAVE_MAIL 130 +#define ITEM_BEAD_MAIL 131 +#define ITEM_SHADOW_MAIL 132 +#define ITEM_TROPIC_MAIL 133 +#define ITEM_DREAM_MAIL 134 +#define ITEM_FAB_MAIL 135 +#define ITEM_RETRO_MAIL 136 // Berries -#define ITEM_CHERI_BERRY 133 -#define ITEM_CHESTO_BERRY 134 -#define ITEM_PECHA_BERRY 135 -#define ITEM_RAWST_BERRY 136 -#define ITEM_ASPEAR_BERRY 137 -#define ITEM_LEPPA_BERRY 138 -#define ITEM_ORAN_BERRY 139 -#define ITEM_PERSIM_BERRY 140 -#define ITEM_LUM_BERRY 141 -#define ITEM_SITRUS_BERRY 142 -#define ITEM_FIGY_BERRY 143 -#define ITEM_WIKI_BERRY 144 -#define ITEM_MAGO_BERRY 145 -#define ITEM_AGUAV_BERRY 146 -#define ITEM_IAPAPA_BERRY 147 -#define ITEM_RAZZ_BERRY 148 -#define ITEM_BLUK_BERRY 149 -#define ITEM_NANAB_BERRY 150 -#define ITEM_WEPEAR_BERRY 151 -#define ITEM_PINAP_BERRY 152 -#define ITEM_POMEG_BERRY 153 -#define ITEM_KELPSY_BERRY 154 -#define ITEM_QUALOT_BERRY 155 -#define ITEM_HONDEW_BERRY 156 -#define ITEM_GREPA_BERRY 157 -#define ITEM_TAMATO_BERRY 158 -#define ITEM_CORNN_BERRY 159 -#define ITEM_MAGOST_BERRY 160 -#define ITEM_RABUTA_BERRY 161 -#define ITEM_NOMEL_BERRY 162 -#define ITEM_SPELON_BERRY 163 -#define ITEM_PAMTRE_BERRY 164 -#define ITEM_WATMEL_BERRY 165 -#define ITEM_DURIN_BERRY 166 -#define ITEM_BELUE_BERRY 167 -#define ITEM_LIECHI_BERRY 168 -#define ITEM_GANLON_BERRY 169 -#define ITEM_SALAC_BERRY 170 -#define ITEM_PETAYA_BERRY 171 -#define ITEM_APICOT_BERRY 172 -#define ITEM_LANSAT_BERRY 173 -#define ITEM_STARF_BERRY 174 -#define ITEM_ENIGMA_BERRY 175 -#define ITEM_0B0 176 -#define ITEM_0B1 177 -#define ITEM_0B2 178 - +#define ITEM_CHERI_BERRY 137 +#define ITEM_CHESTO_BERRY 138 +#define ITEM_PECHA_BERRY 139 +#define ITEM_RAWST_BERRY 140 +#define ITEM_ASPEAR_BERRY 141 +#define ITEM_LEPPA_BERRY 142 +#define ITEM_ORAN_BERRY 143 +#define ITEM_PERSIM_BERRY 144 +#define ITEM_LUM_BERRY 145 +#define ITEM_SITRUS_BERRY 146 +#define ITEM_FIGY_BERRY 147 +#define ITEM_WIKI_BERRY 148 +#define ITEM_MAGO_BERRY 149 +#define ITEM_AGUAV_BERRY 150 +#define ITEM_IAPAPA_BERRY 151 +#define ITEM_RAZZ_BERRY 152 +#define ITEM_BLUK_BERRY 153 +#define ITEM_NANAB_BERRY 154 +#define ITEM_WEPEAR_BERRY 155 +#define ITEM_PINAP_BERRY 156 +#define ITEM_POMEG_BERRY 157 +#define ITEM_KELPSY_BERRY 158 +#define ITEM_QUALOT_BERRY 159 +#define ITEM_HONDEW_BERRY 160 +#define ITEM_GREPA_BERRY 161 +#define ITEM_TAMATO_BERRY 162 +#define ITEM_CORNN_BERRY 163 +#define ITEM_MAGOST_BERRY 164 +#define ITEM_RABUTA_BERRY 165 +#define ITEM_NOMEL_BERRY 166 +#define ITEM_SPELON_BERRY 167 +#define ITEM_PAMTRE_BERRY 168 +#define ITEM_WATMEL_BERRY 169 +#define ITEM_DURIN_BERRY 170 +#define ITEM_BELUE_BERRY 171 +#define ITEM_OCCA_BERRY 172 +#define ITEM_PASSHO_BERRY 173 +#define ITEM_WACAN_BERRY 174 +#define ITEM_RINDO_BERRY 175 +#define ITEM_YACHE_BERRY 176 +#define ITEM_CHOPLE_BERRY 177 +#define ITEM_KEBIA_BERRY 178 +#define ITEM_SHUCA_BERRY 179 +#define ITEM_COBA_BERRY 180 +#define ITEM_PAYAPA_BERRY 181 +#define ITEM_TANGA_BERRY 182 +#define ITEM_CHARTI_BERRY 183 +#define ITEM_KASIB_BERRY 184 +#define ITEM_HABAN_BERRY 185 +#define ITEM_COLBUR_BERRY 186 +#define ITEM_BABIRI_BERRY 187 +#define ITEM_CHILAN_BERRY 188 +#define ITEM_LIECHI_BERRY 189 +#define ITEM_GANLON_BERRY 190 +#define ITEM_SALAC_BERRY 191 +#define ITEM_PETAYA_BERRY 192 +#define ITEM_APICOT_BERRY 193 +#define ITEM_LANSAT_BERRY 194 +#define ITEM_STARF_BERRY 195 +#define ITEM_ENIGMA_BERRY 196 +#define ITEM_MICLE_BERRY 197 +#define ITEM_CUSTAP_BERRY 198 +#define ITEM_JABOCA_BERRY 199 +#define ITEM_ROWAP_BERRY 200 +#define ITEM_ROSELI_BERRY 201 +#define ITEM_KEE_BERRY 202 +#define ITEM_MARANGA_BERRY 203 // Battle Held items -#define ITEM_BRIGHT_POWDER 179 -#define ITEM_WHITE_HERB 180 -#define ITEM_MACHO_BRACE 181 -#define ITEM_EXP_SHARE 182 -#define ITEM_QUICK_CLAW 183 -#define ITEM_SOOTHE_BELL 184 -#define ITEM_MENTAL_HERB 185 -#define ITEM_CHOICE_BAND 186 -#define ITEM_KINGS_ROCK 187 -#define ITEM_SILVER_POWDER 188 -#define ITEM_AMULET_COIN 189 -#define ITEM_CLEANSE_TAG 190 -#define ITEM_SOUL_DEW 191 -#define ITEM_DEEP_SEA_TOOTH 192 -#define ITEM_DEEP_SEA_SCALE 193 -#define ITEM_SMOKE_BALL 194 -#define ITEM_EVERSTONE 195 -#define ITEM_FOCUS_BAND 196 -#define ITEM_LUCKY_EGG 197 -#define ITEM_SCOPE_LENS 198 -#define ITEM_METAL_COAT 199 -#define ITEM_LEFTOVERS 200 -#define ITEM_DRAGON_SCALE 201 -#define ITEM_LIGHT_BALL 202 -#define ITEM_SOFT_SAND 203 -#define ITEM_HARD_STONE 204 -#define ITEM_MIRACLE_SEED 205 -#define ITEM_BLACK_GLASSES 206 -#define ITEM_BLACK_BELT 207 -#define ITEM_MAGNET 208 -#define ITEM_MYSTIC_WATER 209 -#define ITEM_SHARP_BEAK 210 -#define ITEM_POISON_BARB 211 -#define ITEM_NEVER_MELT_ICE 212 -#define ITEM_SPELL_TAG 213 -#define ITEM_TWISTED_SPOON 214 -#define ITEM_CHARCOAL 215 -#define ITEM_DRAGON_FANG 216 -#define ITEM_SILK_SCARF 217 -#define ITEM_UP_GRADE 218 -#define ITEM_SHELL_BELL 219 -#define ITEM_SEA_INCENSE 220 -#define ITEM_LAX_INCENSE 221 -#define ITEM_LUCKY_PUNCH 222 -#define ITEM_METAL_POWDER 223 -#define ITEM_THICK_CLUB 224 -#define ITEM_STICK 225 -#define ITEM_0E2 226 -#define ITEM_0E3 227 -#define ITEM_0E4 228 -#define ITEM_0E5 229 -#define ITEM_0E6 230 -#define ITEM_0E7 231 -#define ITEM_0E8 232 -#define ITEM_0E9 233 -#define ITEM_0EA 234 -#define ITEM_0EB 235 -#define ITEM_0EC 236 -#define ITEM_0ED 237 -#define ITEM_0EE 238 -#define ITEM_0EF 239 -#define ITEM_0F0 240 -#define ITEM_0F1 241 -#define ITEM_0F2 242 -#define ITEM_0F3 243 -#define ITEM_0F4 244 -#define ITEM_0F5 245 -#define ITEM_0F6 246 -#define ITEM_0F7 247 -#define ITEM_0F8 248 -#define ITEM_0F9 249 -#define ITEM_0FA 250 -#define ITEM_0FB 251 -#define ITEM_0FC 252 -#define ITEM_0FD 253 - +#define ITEM_BRIGHT_POWDER 204 +#define ITEM_WHITE_HERB 205 +#define ITEM_MACHO_BRACE 206 +#define ITEM_EXP_SHARE 207 +#define ITEM_QUICK_CLAW 208 +#define ITEM_SOOTHE_BELL 209 +#define ITEM_MENTAL_HERB 210 +#define ITEM_CHOICE_BAND 211 +#define ITEM_KINGS_ROCK 212 +#define ITEM_SILVER_POWDER 213 +#define ITEM_AMULET_COIN 214 +#define ITEM_CLEANSE_TAG 215 +#define ITEM_SMOKE_BALL 216 +#define ITEM_EVERSTONE 217 +#define ITEM_FOCUS_BAND 218 +#define ITEM_LUCKY_EGG 219 +#define ITEM_SCOPE_LENS 220 +#define ITEM_METAL_COAT 221 +#define ITEM_LEFTOVERS 222 +#define ITEM_DRAGON_SCALE 223 +#define ITEM_OVAL_STONE 224 +#define ITEM_PROTECTOR 225 +#define ITEM_ELECTIRIZER 226 +#define ITEM_MAGMARIZER 227 +#define ITEM_DUBIOUS_DISC 228 +#define ITEM_REAPER_CLOTH 229 +#define ITEM_RAZOR_CLAW 230 +#define ITEM_RAZOR_FANG 231 +#define ITEM_PRISM_SCALE 232 +#define ITEM_WHIPPED_DREAM 233 +#define ITEM_SACHET 234 +#define ITEM_SOFT_SAND 235 +#define ITEM_HARD_STONE 236 +#define ITEM_MIRACLE_SEED 237 +#define ITEM_BLACK_GLASSES 238 +#define ITEM_BLACK_BELT 239 +#define ITEM_MAGNET 240 +#define ITEM_MYSTIC_WATER 241 +#define ITEM_SHARP_BEAK 242 +#define ITEM_POISON_BARB 243 +#define ITEM_NEVER_MELT_ICE 244 +#define ITEM_SPELL_TAG 245 +#define ITEM_TWISTED_SPOON 246 +#define ITEM_CHARCOAL 247 +#define ITEM_DRAGON_FANG 248 +#define ITEM_SILK_SCARF 249 +#define ITEM_UP_GRADE 250 +#define ITEM_SHELL_BELL 251 +#define ITEM_POWER_BRACER 252 +#define ITEM_POWER_BELT 253 +#define ITEM_POWER_LENS 254 +#define ITEM_POWER_BAND 255 +#define ITEM_POWER_ANKLET 256 +#define ITEM_POWER_WEIGHT 257 +#define ITEM_POWER_HERB 258 +#define ITEM_CHOICE_SCARF 259 +#define ITEM_CHOICE_SPECS 260 +#define ITEM_FOCUS_SASH 261 +#define ITEM_WIDE_LENS 262 +#define ITEM_ZOOM_LENS 263 +#define ITEM_METRONOME 264 +#define ITEM_MUSCLE_BAND 265 +#define ITEM_WISE_GLASSES 266 +#define ITEM_EXPERT_BELT 267 +#define ITEM_LIGHT_CLAY 268 +#define ITEM_ICY_ROCK 269 +#define ITEM_SMOOTH_ROCK 270 +#define ITEM_HEAT_ROCK 271 +#define ITEM_DAMP_ROCK 272 +#define ITEM_DESTINY_KNOT 273 +#define ITEM_GRIP_CLAW 274 +#define ITEM_LIFE_ORB 275 +#define ITEM_TOXIC_ORB 276 +#define ITEM_FLAME_ORB 277 +#define ITEM_STICKY_BARB 278 +#define ITEM_BLACK_SLUDGE 279 +#define ITEM_IRON_BALL 280 +#define ITEM_LAGGING_TAIL 281 +#define ITEM_SHED_SHELL 282 +#define ITEM_BIG_ROOT 283 +#define ITEM_EVIOLITE 284 +#define ITEM_FLOAT_STONE 285 +#define ITEM_ROCKY_HELMET 286 +#define ITEM_AIR_BALLOON 287 +#define ITEM_RED_CARD 288 +#define ITEM_RING_TARGET 289 +#define ITEM_BINDING_BAND 290 +#define ITEM_EJECT_BUTTON 291 +#define ITEM_ABSORB_BULB 292 +#define ITEM_CELL_BATTERY 293 +#define ITEM_LUMINOUS_MOSS 294 +#define ITEM_SNOWBALL 295 +#define ITEM_WEAKNESS_POLICY 296 +#define ITEM_ASSAULT_VEST 297 +#define ITEM_SAFETY_GOGGLES 298 +#define ITEM_ADRENALINE_ORB 299 +#define ITEM_TERRAIN_EXTENDER 300 +#define ITEM_PROTECTIVE_PADS 301 +#define ITEM_ELECTRIC_SEED 302 +#define ITEM_PSYCHIC_SEED 303 +#define ITEM_MISTY_SEED 304 +#define ITEM_GRASSY_SEED 305 +// Incenses +#define ITEM_SEA_INCENSE 306 +#define ITEM_LAX_INCENSE 307 +#define ITEM_ODD_INCENSE 308 +#define ITEM_ROCK_INCENSE 309 +#define ITEM_FULL_INCENSE 310 +#define ITEM_WAVE_INCENSE 311 +#define ITEM_ROSE_INCENSE 312 +#define ITEM_LUCK_INCENSE 313 +#define ITEM_PURE_INCENSE 314 +// Plates +#define ITEM_INSECT_PLATE 315 +#define ITEM_DREAD_PLATE 316 +#define ITEM_DRACO_PLATE 317 +#define ITEM_ZAP_PLATE 318 +#define ITEM_PIXIE_PLATE 319 +#define ITEM_FIST_PLATE 320 +#define ITEM_FLAME_PLATE 321 +#define ITEM_SKY_PLATE 322 +#define ITEM_SPOOKY_PLATE 323 +#define ITEM_MEADOW_PLATE 324 +#define ITEM_EARTH_PLATE 325 +#define ITEM_ICICLE_PLATE 326 +#define ITEM_TOXIC_PLATE 327 +#define ITEM_MIND_PLATE 328 +#define ITEM_STONE_PLATE 329 +#define ITEM_IRON_PLATE 330 +#define ITEM_SPLASH_PLATE 331 +// Gems +#define ITEM_BUG_GEM 332 +#define ITEM_DARK_GEM 333 +#define ITEM_DRAGON_GEM 334 +#define ITEM_ELECTRIC_GEM 335 +#define ITEM_FAIRY_GEM 336 +#define ITEM_FIGHTING_GEM 337 +#define ITEM_FIRE_GEM 338 +#define ITEM_FLYING_GEM 339 +#define ITEM_GHOST_GEM 340 +#define ITEM_GRASS_GEM 341 +#define ITEM_GROUND_GEM 342 +#define ITEM_ICE_GEM 343 +#define ITEM_NORMAL_GEM 344 +#define ITEM_POISON_GEM 345 +#define ITEM_PSYCHIC_GEM 346 +#define ITEM_ROCK_GEM 347 +#define ITEM_STEEL_GEM 348 +#define ITEM_WATER_GEM 349 +// Mon specific +#define ITEM_SOUL_DEW 350 +#define ITEM_DEEP_SEA_TOOTH 351 +#define ITEM_DEEP_SEA_SCALE 352 +#define ITEM_LUCKY_PUNCH 353 +#define ITEM_METAL_POWDER 354 +#define ITEM_THICK_CLUB 355 +#define ITEM_STICK 356 +#define ITEM_LIGHT_BALL 357 +#define ITEM_QUICK_POWDER 358 +#define ITEM_ODD_KEYSTONE 359 +#define ITEM_ADAMANT_ORB 360 +#define ITEM_LUSTROUS_ORB 361 +#define ITEM_GRISEOUS_ORB 362 +#define ITEM_GRACIDEA 363 +// Memories +#define ITEM_BUG_MEMORY 364 +#define ITEM_DARK_MEMORY 365 +#define ITEM_DRAGON_MEMORY 366 +#define ITEM_ELECTRIC_MEMORY 367 +#define ITEM_FAIRY_MEMORY 368 +#define ITEM_FIGHTING_MEMORY 369 +#define ITEM_FIRE_MEMORY 370 +#define ITEM_FLYING_MEMORY 371 +#define ITEM_GHOST_MEMORY 372 +#define ITEM_GRASS_MEMORY 373 +#define ITEM_GROUND_MEMORY 374 +#define ITEM_ICE_MEMORY 375 +#define ITEM_POISON_MEMORY 376 +#define ITEM_PSYCHIC_MEMORY 377 +#define ITEM_ROCK_MEMORY 378 +#define ITEM_STEEL_MEMORY 379 +#define ITEM_WATER_MEMORY 380 +// Drives +#define ITEM_DOUSE_DRIVE 381 +#define ITEM_SHOCK_DRIVE 382 +#define ITEM_BURN_DRIVE 383 +#define ITEM_CHILL_DRIVE 384 // Contest held items -#define ITEM_RED_SCARF 254 -#define ITEM_BLUE_SCARF 255 -#define ITEM_PINK_SCARF 256 -#define ITEM_GREEN_SCARF 257 -#define ITEM_YELLOW_SCARF 258 - +#define ITEM_RED_SCARF 385 +#define ITEM_BLUE_SCARF 386 +#define ITEM_PINK_SCARF 387 +#define ITEM_GREEN_SCARF 388 +#define ITEM_YELLOW_SCARF 389 +// Mega stones +#define ITEM_ABOMASITE 390 +#define ITEM_ABSOLITE 391 +#define ITEM_AERODACTYLITE 392 +#define ITEM_AGGRONITE 393 +#define ITEM_ALAKAZITE 394 +#define ITEM_ALTARIANITE 395 +#define ITEM_AMPHAROSITE 396 +#define ITEM_AUDINITE 397 +#define ITEM_BANETTITE 398 +#define ITEM_BEEDRILLITE 399 +#define ITEM_BLASTOISINITE 400 +#define ITEM_BLAZIKENITE 401 +#define ITEM_CAMERUPTITE 402 +#define ITEM_CHARIZARDITE_X 403 +#define ITEM_CHARIZARDITE_Y 404 +#define ITEM_DIANCITE 405 +#define ITEM_GALLADITE 406 +#define ITEM_GARCHOMPITE 407 +#define ITEM_GARDEVOIRITE 408 +#define ITEM_GENGARITE 409 +#define ITEM_GLALITITE 410 +#define ITEM_GYARADOSITE 411 +#define ITEM_HERACRONITE 412 +#define ITEM_HOUNDOOMINITE 413 +#define ITEM_KANGASKHANITE 414 +#define ITEM_LATIASITE 415 +#define ITEM_LATIOSITE 416 +#define ITEM_LOPUNNITE 417 +#define ITEM_LUCARIONITE 418 +#define ITEM_MANECTITE 419 +#define ITEM_MAWILITE 420 +#define ITEM_MEDICHAMITE 421 +#define ITEM_METAGROSSITE 422 +#define ITEM_MEWTWONITE_X 423 +#define ITEM_MEWTWONITE_Y 424 +#define ITEM_PIDGEOTITE 425 +#define ITEM_PINSIRITE 426 +#define ITEM_SABLENITE 427 +#define ITEM_SALAMENCITE 428 +#define ITEM_SCEPTILITE 429 +#define ITEM_SCIZORITE 430 +#define ITEM_SHARPEDONITE 431 +#define ITEM_SLOWBRONITE 432 +#define ITEM_STEELIXITE 433 +#define ITEM_SWAMPERTITE 434 +#define ITEM_TYRANITARITE 435 +#define ITEM_VENUSAURITE 436 +#define ITEM_MEGA_BRACELET 437 +// Fossils +#define ITEM_ARMOR_FOSSIL 438 +#define ITEM_SKULL_FOSSIL 439 +#define ITEM_HELIX_FOSSIL 440 +#define ITEM_DOME_FOSSIL 441 +#define ITEM_COVER_FOSSIL 442 +#define ITEM_PLUME_FOSSIL 443 +#define ITEM_JAW_FOSSIL 444 +#define ITEM_SAIL_FOSSIL 445 +#define ITEM_ROOT_FOSSIL 446 +#define ITEM_CLAW_FOSSIL 447 // Key Items -#define ITEM_MACH_BIKE 259 -#define ITEM_COIN_CASE 260 -#define ITEM_ITEMFINDER 261 -#define ITEM_OLD_ROD 262 -#define ITEM_GOOD_ROD 263 -#define ITEM_SUPER_ROD 264 -#define ITEM_SS_TICKET 265 -#define ITEM_CONTEST_PASS 266 -#define ITEM_10B 267 -#define ITEM_WAILMER_PAIL 268 -#define ITEM_DEVON_GOODS 269 -#define ITEM_SOOT_SACK 270 -#define ITEM_BASEMENT_KEY 271 -#define ITEM_ACRO_BIKE 272 -#define ITEM_POKEBLOCK_CASE 273 -#define ITEM_LETTER 274 -#define ITEM_EON_TICKET 275 -#define ITEM_RED_ORB 276 -#define ITEM_BLUE_ORB 277 -#define ITEM_SCANNER 278 -#define ITEM_GO_GOGGLES 279 -#define ITEM_METEORITE 280 -#define ITEM_ROOM_1_KEY 281 -#define ITEM_ROOM_2_KEY 282 -#define ITEM_ROOM_4_KEY 283 -#define ITEM_ROOM_6_KEY 284 -#define ITEM_STORAGE_KEY 285 -#define ITEM_ROOT_FOSSIL 286 -#define ITEM_CLAW_FOSSIL 287 -#define ITEM_DEVON_SCOPE 288 - +#define ITEM_MACH_BIKE 448 +#define ITEM_COIN_CASE 449 +#define ITEM_ITEMFINDER 450 +#define ITEM_OLD_ROD 451 +#define ITEM_GOOD_ROD 452 +#define ITEM_SUPER_ROD 453 +#define ITEM_SS_TICKET 454 +#define ITEM_CONTEST_PASS 455 +#define ITEM_WAILMER_PAIL 456 +#define ITEM_DEVON_GOODS 457 +#define ITEM_SOOT_SACK 458 +#define ITEM_BASEMENT_KEY 459 +#define ITEM_ACRO_BIKE 460 +#define ITEM_POKEBLOCK_CASE 461 +#define ITEM_LETTER 462 +#define ITEM_EON_TICKET 463 +#define ITEM_RED_ORB 464 +#define ITEM_BLUE_ORB 465 +#define ITEM_SCANNER 466 +#define ITEM_GO_GOGGLES 467 +#define ITEM_METEORITE 468 +#define ITEM_ROOM_1_KEY 469 +#define ITEM_ROOM_2_KEY 470 +#define ITEM_ROOM_4_KEY 471 +#define ITEM_ROOM_6_KEY 472 +#define ITEM_STORAGE_KEY 473 +#define ITEM_DEVON_SCOPE 474 // TMs/HMs -#define ITEM_TM01 289 -#define ITEM_TM02 290 -#define ITEM_TM03 291 -#define ITEM_TM04 292 -#define ITEM_TM05 293 -#define ITEM_TM06 294 -#define ITEM_TM07 295 -#define ITEM_TM08 296 -#define ITEM_TM09 297 -#define ITEM_TM10 298 -#define ITEM_TM11 299 -#define ITEM_TM12 300 -#define ITEM_TM13 301 -#define ITEM_TM14 302 -#define ITEM_TM15 303 -#define ITEM_TM16 304 -#define ITEM_TM17 305 -#define ITEM_TM18 306 -#define ITEM_TM19 307 -#define ITEM_TM20 308 -#define ITEM_TM21 309 -#define ITEM_TM22 310 -#define ITEM_TM23 311 -#define ITEM_TM24 312 -#define ITEM_TM25 313 -#define ITEM_TM26 314 -#define ITEM_TM27 315 -#define ITEM_TM28 316 -#define ITEM_TM29 317 -#define ITEM_TM30 318 -#define ITEM_TM31 319 -#define ITEM_TM32 320 -#define ITEM_TM33 321 -#define ITEM_TM34 322 -#define ITEM_TM35 323 -#define ITEM_TM36 324 -#define ITEM_TM37 325 -#define ITEM_TM38 326 -#define ITEM_TM39 327 -#define ITEM_TM40 328 -#define ITEM_TM41 329 -#define ITEM_TM42 330 -#define ITEM_TM43 331 -#define ITEM_TM44 332 -#define ITEM_TM45 333 -#define ITEM_TM46 334 -#define ITEM_TM47 335 -#define ITEM_TM48 336 -#define ITEM_TM49 337 -#define ITEM_TM50 338 -#define ITEM_HM01 339 -#define ITEM_HM02 340 -#define ITEM_HM03 341 -#define ITEM_HM04 342 -#define ITEM_HM05 343 -#define ITEM_HM06 344 -#define ITEM_HM07 345 -#define ITEM_HM08 346 +#define ITEM_TM01 475 +#define ITEM_TM02 476 +#define ITEM_TM03 477 +#define ITEM_TM04 478 +#define ITEM_TM05 479 +#define ITEM_TM06 480 +#define ITEM_TM07 481 +#define ITEM_TM08 482 +#define ITEM_TM09 483 +#define ITEM_TM10 484 +#define ITEM_TM11 485 +#define ITEM_TM12 486 +#define ITEM_TM13 487 +#define ITEM_TM14 488 +#define ITEM_TM15 489 +#define ITEM_TM16 490 +#define ITEM_TM17 491 +#define ITEM_TM18 492 +#define ITEM_TM19 493 +#define ITEM_TM20 494 +#define ITEM_TM21 495 +#define ITEM_TM22 496 +#define ITEM_TM23 497 +#define ITEM_TM24 498 +#define ITEM_TM25 499 +#define ITEM_TM26 500 +#define ITEM_TM27 501 +#define ITEM_TM28 502 +#define ITEM_TM29 503 +#define ITEM_TM30 504 +#define ITEM_TM31 505 +#define ITEM_TM32 506 +#define ITEM_TM33 507 +#define ITEM_TM34 508 +#define ITEM_TM35 509 +#define ITEM_TM36 510 +#define ITEM_TM37 511 +#define ITEM_TM38 512 +#define ITEM_TM39 513 +#define ITEM_TM40 514 +#define ITEM_TM41 515 +#define ITEM_TM42 516 +#define ITEM_TM43 517 +#define ITEM_TM44 518 +#define ITEM_TM45 519 +#define ITEM_TM46 520 +#define ITEM_TM47 521 +#define ITEM_TM48 522 +#define ITEM_TM49 523 +#define ITEM_TM50 524 +#define ITEM_TM51 525 +#define ITEM_TM52 526 +#define ITEM_TM53 527 +#define ITEM_TM54 528 +#define ITEM_TM55 529 +#define ITEM_TM56 530 +#define ITEM_TM57 531 +#define ITEM_TM58 532 +#define ITEM_TM59 533 +#define ITEM_TM60 534 +#define ITEM_TM61 535 +#define ITEM_TM62 536 +#define ITEM_TM63 537 +#define ITEM_TM64 538 +#define ITEM_TM65 539 +#define ITEM_TM66 540 +#define ITEM_TM67 541 +#define ITEM_TM68 542 +#define ITEM_TM69 543 +#define ITEM_TM70 544 +#define ITEM_TM71 545 +#define ITEM_TM72 546 +#define ITEM_TM73 547 +#define ITEM_TM74 548 +#define ITEM_TM75 549 +#define ITEM_TM76 550 +#define ITEM_TM77 551 +#define ITEM_TM78 552 +#define ITEM_TM79 553 +#define ITEM_TM80 554 +#define ITEM_TM81 555 +#define ITEM_TM82 556 +#define ITEM_TM83 557 +#define ITEM_TM84 558 +#define ITEM_TM85 559 +#define ITEM_TM86 560 +#define ITEM_TM87 561 +#define ITEM_TM88 562 +#define ITEM_TM89 563 +#define ITEM_TM90 564 +#define ITEM_TM91 565 +#define ITEM_TM92 566 +#define ITEM_TM93 567 +#define ITEM_TM94 568 +#define ITEM_TM95 569 +#define ITEM_TM96 570 +#define ITEM_TM97 571 +#define ITEM_TM98 572 +#define ITEM_TM99 573 +#define ITEM_TM100 574 -#define ITEM_TM01_FOCUS_PUNCH ITEM_TM01 -#define ITEM_TM02_DRAGON_CLAW ITEM_TM02 -#define ITEM_TM03_WATER_PULSE ITEM_TM03 -#define ITEM_TM04_CALM_MIND ITEM_TM04 -#define ITEM_TM05_ROAR ITEM_TM05 -#define ITEM_TM06_TOXIC ITEM_TM06 -#define ITEM_TM07_HAIL ITEM_TM07 -#define ITEM_TM08_BULK_UP ITEM_TM08 -#define ITEM_TM09_BULLET_SEED ITEM_TM09 -#define ITEM_TM10_HIDDEN_POWER ITEM_TM10 -#define ITEM_TM11_SUNNY_DAY ITEM_TM11 -#define ITEM_TM12_TAUNT ITEM_TM12 -#define ITEM_TM13_ICE_BEAM ITEM_TM13 -#define ITEM_TM14_BLIZZARD ITEM_TM14 -#define ITEM_TM15_HYPER_BEAM ITEM_TM15 -#define ITEM_TM16_LIGHT_SCREEN ITEM_TM16 -#define ITEM_TM17_PROTECT ITEM_TM17 -#define ITEM_TM18_RAIN_DANCE ITEM_TM18 -#define ITEM_TM19_GIGA_DRAIN ITEM_TM19 -#define ITEM_TM20_SAFEGUARD ITEM_TM20 -#define ITEM_TM21_FRUSTRATION ITEM_TM21 -#define ITEM_TM22_SOLARBEAM ITEM_TM22 -#define ITEM_TM23_IRON_TAIL ITEM_TM23 -#define ITEM_TM24_THUNDERBOLT ITEM_TM24 -#define ITEM_TM25_THUNDER ITEM_TM25 -#define ITEM_TM26_EARTHQUAKE ITEM_TM26 -#define ITEM_TM27_RETURN ITEM_TM27 -#define ITEM_TM28_DIG ITEM_TM28 -#define ITEM_TM29_PSYCHIC ITEM_TM29 -#define ITEM_TM30_SHADOW_BALL ITEM_TM30 -#define ITEM_TM31_BRICK_BREAK ITEM_TM31 -#define ITEM_TM32_DOUBLE_TEAM ITEM_TM32 -#define ITEM_TM33_REFLECT ITEM_TM33 -#define ITEM_TM34_SHOCK_WAVE ITEM_TM34 -#define ITEM_TM35_FLAMETHROWER ITEM_TM35 -#define ITEM_TM36_SLUDGE_BOMB ITEM_TM36 -#define ITEM_TM37_SANDSTORM ITEM_TM37 -#define ITEM_TM38_FIRE_BLAST ITEM_TM38 -#define ITEM_TM39_ROCK_TOMB ITEM_TM39 -#define ITEM_TM40_AERIAL_ACE ITEM_TM40 -#define ITEM_TM41_TORMENT ITEM_TM41 -#define ITEM_TM42_FACADE ITEM_TM42 -#define ITEM_TM43_SECRET_POWER ITEM_TM43 -#define ITEM_TM44_REST ITEM_TM44 -#define ITEM_TM45_ATTRACT ITEM_TM45 -#define ITEM_TM46_THIEF ITEM_TM46 -#define ITEM_TM47_STEEL_WING ITEM_TM47 -#define ITEM_TM48_SKILL_SWAP ITEM_TM48 -#define ITEM_TM49_SNATCH ITEM_TM49 -#define ITEM_TM50_OVERHEAT ITEM_TM50 -#define ITEM_HM01_CUT ITEM_HM01 -#define ITEM_HM02_FLY ITEM_HM02 -#define ITEM_HM03_SURF ITEM_HM03 -#define ITEM_HM04_STRENGTH ITEM_HM04 -#define ITEM_HM05_FLASH ITEM_HM05 -#define ITEM_HM06_ROCK_SMASH ITEM_HM06 -#define ITEM_HM07_WATERFALL ITEM_HM07 -#define ITEM_HM08_DIVE ITEM_HM08 +#define ITEM_HM01 525 +#define ITEM_HM02 526 +#define ITEM_HM03 527 +#define ITEM_HM04 528 +#define ITEM_HM05 529 +#define ITEM_HM06 530 +#define ITEM_HM07 531 +#define ITEM_HM08 532 -// Unknown -#define ITEM_15B 347 -#define ITEM_15C 348 +#define ITEM_TM01_FOCUS_PUNCH 475 +#define ITEM_TM02_DRAGON_CLAW 476 +#define ITEM_TM03_WATER_PULSE 477 +#define ITEM_TM04_CALM_MIND 478 +#define ITEM_TM05_ROAR 479 +#define ITEM_TM06_TOXIC 480 +#define ITEM_TM07_HAIL 481 +#define ITEM_TM08_BULK_UP 482 +#define ITEM_TM09_BULLET_SEED 483 +#define ITEM_TM10_HIDDEN_POWER 484 +#define ITEM_TM11_SUNNY_DAY 485 +#define ITEM_TM12_TAUNT 486 +#define ITEM_TM13_ICE_BEAM 487 +#define ITEM_TM14_BLIZZARD 488 +#define ITEM_TM15_HYPER_BEAM 489 +#define ITEM_TM16_LIGHT_SCREEN 490 +#define ITEM_TM17_PROTECT 491 +#define ITEM_TM18_RAIN_DANCE 492 +#define ITEM_TM19_GIGA_DRAIN 493 +#define ITEM_TM20_SAFEGUARD 494 +#define ITEM_TM21_FRUSTRATION 495 +#define ITEM_TM22_SOLARBEAM 496 +#define ITEM_TM23_IRON_TAIL 497 +#define ITEM_TM24_THUNDERBOLT 498 +#define ITEM_TM25_THUNDER 499 +#define ITEM_TM26_EARTHQUAKE 500 +#define ITEM_TM27_RETURN 501 +#define ITEM_TM28_DIG 502 +#define ITEM_TM29_PSYCHIC 503 +#define ITEM_TM30_SHADOW_BALL 504 +#define ITEM_TM31_BRICK_BREAK 505 +#define ITEM_TM32_DOUBLE_TEAM 506 +#define ITEM_TM33_REFLECT 507 +#define ITEM_TM34_SHOCK_WAVE 508 +#define ITEM_TM35_FLAMETHROWER 509 +#define ITEM_TM36_SLUDGE_BOMB 510 +#define ITEM_TM37_SANDSTORM 511 +#define ITEM_TM38_FIRE_BLAST 512 +#define ITEM_TM39_ROCK_TOMB 513 +#define ITEM_TM40_AERIAL_ACE 514 +#define ITEM_TM41_TORMENT 515 +#define ITEM_TM42_FACADE 516 +#define ITEM_TM43_SECRET_POWER 517 +#define ITEM_TM44_REST 518 +#define ITEM_TM45_ATTRACT 519 +#define ITEM_TM46_THIEF 520 +#define ITEM_TM47_STEEL_WING 521 +#define ITEM_TM48_SKILL_SWAP 522 +#define ITEM_TM49_SNATCH 523 +#define ITEM_TM50_OVERHEAT 524 +#define ITEM_HM01_CUT 525 +#define ITEM_HM02_FLY 526 +#define ITEM_HM03_SURF 527 +#define ITEM_HM04_STRENGTH 528 +#define ITEM_HM05_FLASH 529 +#define ITEM_HM06_ROCK_SMASH 530 +#define ITEM_HM07_WATERFALL 531 +#define ITEM_HM08_DIVE 532 // FireRed/LeafGreen -#define ITEM_OAKS_PARCEL 349 -#define ITEM_POKE_FLUTE 350 -#define ITEM_SECRET_KEY 351 -#define ITEM_BIKE_VOUCHER 352 -#define ITEM_GOLD_TEETH 353 -#define ITEM_OLD_AMBER 354 -#define ITEM_CARD_KEY 355 -#define ITEM_LIFT_KEY 356 -#define ITEM_HELIX_FOSSIL 357 -#define ITEM_DOME_FOSSIL 358 -#define ITEM_SILPH_SCOPE 359 -#define ITEM_BICYCLE 360 -#define ITEM_TOWN_MAP 361 -#define ITEM_VS_SEEKER 362 -#define ITEM_FAME_CHECKER 363 -#define ITEM_TM_CASE 364 -#define ITEM_BERRY_POUCH 365 -#define ITEM_TEACHY_TV 366 -#define ITEM_TRI_PASS 367 -#define ITEM_RAINBOW_PASS 368 -#define ITEM_TEA 369 -#define ITEM_MYSTIC_TICKET 370 -#define ITEM_AURORA_TICKET 371 -#define ITEM_POWDER_JAR 372 -#define ITEM_RUBY 373 -#define ITEM_SAPPHIRE 374 - +#define ITEM_OAKS_PARCEL 583 +#define ITEM_POKE_FLUTE 584 +#define ITEM_SECRET_KEY 585 +#define ITEM_BIKE_VOUCHER 586 +#define ITEM_GOLD_TEETH 587 +#define ITEM_OLD_AMBER 588 +#define ITEM_CARD_KEY 589 +#define ITEM_LIFT_KEY 590 +#define ITEM_SILPH_SCOPE 591 +#define ITEM_BICYCLE 592 +#define ITEM_TOWN_MAP 593 +#define ITEM_VS_SEEKER 594 +#define ITEM_FAME_CHECKER 595 +#define ITEM_TM_CASE 596 +#define ITEM_BERRY_POUCH 597 +#define ITEM_TEACHY_TV 598 +#define ITEM_TRI_PASS 599 +#define ITEM_RAINBOW_PASS 600 +#define ITEM_TEA 601 +#define ITEM_MYSTIC_TICKET 602 +#define ITEM_AURORA_TICKET 603 +#define ITEM_POWDER_JAR 604 +#define ITEM_RUBY 605 +#define ITEM_SAPPHIRE 606 // Emerald -#define ITEM_MAGMA_EMBLEM 375 -#define ITEM_OLD_SEA_MAP 376 +#define ITEM_MAGMA_EMBLEM 607 +#define ITEM_OLD_SEA_MAP 608 -#define ITEMS_COUNT 377 +#define ITEMS_COUNT 609 #define ITEM_FIELD_ARROW ITEMS_COUNT #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY -#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define LAST_BERRY_INDEX ITEM_MARANGA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 // Check if the item is one that can be used on a Pokemon. -#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX) #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 34da3a25d..7312f3c79 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -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] = diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index c36969ab5..eeb03a9d1 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -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}, }; diff --git a/src/data/items.h b/src/data/items.h index 7d7caa289..af22cb489 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -942,204 +942,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_034] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_035] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_036] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_037] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_038] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_039] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_03A] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_03B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_03C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_03D] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_03E] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Vitamins [ITEM_HP_UP] = @@ -1304,24 +1106,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_048] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Battle items [ITEM_GUARD_SPEC] = @@ -1378,10 +1162,10 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_X_DEFEND] = + [ITEM_X_DEFENSE] = { .name = _("X DEFEND"), - .itemId = ITEM_X_DEFEND, + .itemId = ITEM_X_DEFENSE, .price = 550, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -1432,10 +1216,10 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_X_SPECIAL] = + [ITEM_X_SP_ATK] = { .name = _("X SPECIAL"), - .itemId = ITEM_X_SPECIAL, + .itemId = ITEM_X_SP_ATK, .price = 350, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -1486,24 +1270,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_052] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Field items [ITEM_SUPER_REPEL] = @@ -1578,114 +1344,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_057] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_058] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_059] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_05A] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_05B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_05C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Evolution stones [ITEM_SUN_STONE] = @@ -1796,78 +1454,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_063] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_064] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_065] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_066] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Valuable items [ITEM_TINY_MUSHROOM] = @@ -1906,24 +1492,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_069] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - [ITEM_PEARL] = { .name = _("PEARL"), @@ -2032,168 +1600,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_070] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_071] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_072] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_073] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_074] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_075] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_076] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_077] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_078] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Mail [ITEM_ORANGE_MAIL] = { @@ -3187,60 +2593,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_0B0] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0B1] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0B2] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // Hold items [ITEM_BRIGHT_POWDER] = @@ -4089,510 +3441,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_0E2] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E3] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E4] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E5] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E6] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E7] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E8] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0E9] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0EA] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0EB] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0EC] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0ED] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0EE] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0EF] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F0] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F1] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F2] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F3] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F4] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F5] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F6] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F7] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F8] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0F9] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0FA] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0FB] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0FC] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_0FD] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - [ITEM_RED_SCARF] = { .name = _("RED SCARF"), @@ -4829,24 +3677,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_10B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - [ITEM_WAILMER_PAIL] = { .name = _("WAILMER PAIL"), @@ -6271,42 +5101,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_15B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - - [ITEM_15C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, - .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, - .secondaryId = 0, - }, - // FireRed/LeafGreen key items [ITEM_OAKS_PARCEL] = @@ -6814,4 +5608,2346 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + +// New items + + [ITEM_WIDE_LENS] = + { + .name = _("Wide Lens"), + .itemId = ITEM_WIDE_LENS, + .price = 200, + .holdEffect = HOLD_EFFECT_WIDE_LENS, + .holdEffectParam = 10, + .description = gWideLensItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MUSCLE_BAND] = + { + .name = _("Muscle Band"), + .itemId = ITEM_MUSCLE_BAND, + .price = 200, + .holdEffect = HOLD_EFFECT_MUSCLE_BAND, + .holdEffectParam = 10, + .description = gMuscleBandItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_WISE_GLASSES] = + { + .name = _("Wise Glasses"), + .itemId = ITEM_WISE_GLASSES, + .price = 200, + .holdEffect = HOLD_EFFECT_WISE_GLASSES, + .holdEffectParam = 10, + .description = gWiseGlassesItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_EXPERT_BELT] = + { + .name = _("Expert Belt"), + .itemId = ITEM_EXPERT_BELT, + .price = 200, + .holdEffect = HOLD_EFFECT_EXPERT_BELT, + .holdEffectParam = 20, + .description = gExpertBeltItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LIGHT_CLAY] = + { + .name = _("Light Clay"), + .itemId = ITEM_LIGHT_CLAY, + .price = 200, + .holdEffect = HOLD_EFFECT_LIGHT_CLAY, + .holdEffectParam = 0, + .description = gLightClayItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LIFE_ORB] = + { + .name = _("Life Orb"), + .itemId = ITEM_LIFE_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_LIFE_ORB, + .holdEffectParam = 0, + .description = gLifeOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_POWER_HERB] = + { + .name = _("Power Herb"), + .itemId = ITEM_POWER_HERB, + .price = 200, + .holdEffect = HOLD_EFFECT_POWER_HERB, + .holdEffectParam = 0, + .description = gPowerHerbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_TOXIC_ORB] = + { + .name = _("Toxic Orb"), + .itemId = ITEM_TOXIC_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_TOXIC_ORB, + .holdEffectParam = 0, + .description = gToxicOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FLAME_ORB] = + { + .name = _("Flame Orb"), + .itemId = ITEM_FLAME_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_FLAME_ORB, + .holdEffectParam = 0, + .description = gFlameOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_QUICK_POWDER] = + { + .name = _("Quick Powder"), + .itemId = ITEM_QUICK_POWDER, + .price = 200, + .holdEffect = HOLD_EFFECT_QUICK_POWDER, + .holdEffectParam = 0, + .description = gQuickPowderItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FOCUS_SASH] = + { + .name = _("Focus Sash"), + .itemId = ITEM_FOCUS_SASH, + .price = 200, + .holdEffect = HOLD_EFFECT_FOCUS_SASH, + .holdEffectParam = 0, + .description = gFocusSashItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ZOOM_LENS] = + { + .name = _("Zoom Lens"), + .itemId = ITEM_ZOOM_LENS, + .price = 200, + .holdEffect = HOLD_EFFECT_ZOOM_LENS, + .holdEffectParam = 20, + .description = gZoomLensItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_METRONOME] = + { + .name = _("Metronome"), + .itemId = ITEM_METRONOME, + .price = 200, + .holdEffect = HOLD_EFFECT_METRONOME, + .holdEffectParam = 20, + .description = gMetronomeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_IRON_BALL] = + { + .name = _("Iron Ball"), + .itemId = ITEM_IRON_BALL, + .price = 200, + .holdEffect = HOLD_EFFECT_IRON_BALL, + .holdEffectParam = 0, + .description = gIronBallItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LAGGING_TAIL] = + { + .name = _("Lagging Tail"), + .itemId = ITEM_LAGGING_TAIL, + .price = 200, + .holdEffect = HOLD_EFFECT_LAGGING_TAIL, + .holdEffectParam = 0, + .description = gLaggingTailItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DESTINY_KNOT] = + { + .name = _("Destiny Knot"), + .itemId = ITEM_DESTINY_KNOT, + .price = 200, + .holdEffect = HOLD_EFFECT_DESTINY_KNOT, + .holdEffectParam = 0, + .description = gDestinyKnotItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BLACK_SLUDGE] = + { + .name = _("Black Sludge"), + .itemId = ITEM_BLACK_SLUDGE, + .price = 200, + .holdEffect = HOLD_EFFECT_BLACK_SLUDGE, + .holdEffectParam = 0, + .description = gBlackSludgeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ICY_ROCK] = + { + .name = _("Icy Rock"), + .itemId = ITEM_ICY_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_ICY_ROCK, + .holdEffectParam = 0, + .description = gIcyRockItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SMOOTH_ROCK] = + { + .name = _("Smooth Rock"), + .itemId = ITEM_SMOOTH_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_SMOOTH_ROCK, + .holdEffectParam = 0, + .description = gSmoothRockItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_HEAT_ROCK] = + { + .name = _("Heat Rock"), + .itemId = ITEM_HEAT_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_HEAT_ROCK, + .holdEffectParam = 0, + .description = gHeatRockItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DAMP_ROCK] = + { + .name = _("Damp Rock"), + .itemId = ITEM_DAMP_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_DAMP_ROCK, + .holdEffectParam = 0, + .description = gDampRockItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GRIP_CLAW] = + { + .name = _("Grip Claw"), + .itemId = ITEM_GRIP_CLAW, + .price = 200, + .holdEffect = HOLD_EFFECT_GRIP_CLAW, + .holdEffectParam = 0, + .description = gGripClawItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CHOICE_SCARF] = + { + .name = _("Choice Scarf"), + .itemId = ITEM_CHOICE_SCARF, + .price = 200, + .holdEffect = HOLD_EFFECT_CHOICE_SCARF, + .holdEffectParam = 0, + .description = gChoiceScarfItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_STICKY_BARB] = + { + .name = _("Sticky Barb"), + .itemId = ITEM_STICKY_BARB, + .price = 200, + .holdEffect = HOLD_EFFECT_STICKY_BARB, + .holdEffectParam = 0, + .description = gStickyBarbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SHED_SHELL] = + { + .name = _("Shed Shell"), + .itemId = ITEM_SHED_SHELL, + .price = 200, + .holdEffect = HOLD_EFFECT_SHED_SHELL, + .holdEffectParam = 0, + .description = gShedShellItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BIG_ROOT] = + { + .name = _("Big Root"), + .itemId = ITEM_BIG_ROOT, + .price = 200, + .holdEffect = HOLD_EFFECT_BIG_ROOT, + .holdEffectParam = 30, + .description = gBigRootItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CHOICE_SPECS] = + { + .name = _("Choice Specs"), + .itemId = ITEM_CHOICE_SPECS, + .price = 200, + .holdEffect = HOLD_EFFECT_CHOICE_SPECS, + .holdEffectParam = 0, + .description = gChoiceSpecsItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ADAMANT_ORB] = + { + .name = _("Adamant Orb"), + .itemId = ITEM_ADAMANT_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_ADAMANT_ORB, + .holdEffectParam = 0, + .description = gAdamantOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LUSTROUS_ORB] = + { + .name = _("Lustrous Orb"), + .itemId = ITEM_LUSTROUS_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_LUSTROUS_ORB, + .holdEffectParam = 0, + .description = gLustrousOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GRISEOUS_ORB] = + { + .name = _("Griseous Orb"), + .itemId = ITEM_GRISEOUS_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_GRISEOUS_ORB, + .holdEffectParam = 0, + .description = gGriseousOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FLAME_PLATE] = + { + .name = _("Flame Plate"), + .itemId = ITEM_FLAME_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FIRE_POWER, + .holdEffectParam = 20, + .description = gFlamePlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SPLASH_PLATE] = + { + .name = _("Splash Plate"), + .itemId = ITEM_SPLASH_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_WATER_POWER, + .holdEffectParam = 20, + .description = gSplashPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ZAP_PLATE] = + { + .name = _("Zap Plate"), + .itemId = ITEM_ZAP_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, + .holdEffectParam = 20, + .description = gZapPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MEADOW_PLATE] = + { + .name = _("Meadow Plate"), + .itemId = ITEM_MEADOW_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GRASS_POWER, + .holdEffectParam = 20, + .description = gMeadowPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ICICLE_PLATE] = + { + .name = _("Icicle Plate"), + .itemId = ITEM_ICICLE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ICE_POWER, + .holdEffectParam = 20, + .description = gIciclePlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FIST_PLATE] = + { + .name = _("Fist Plate"), + .itemId = ITEM_FIST_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FIGHTING_POWER, + .holdEffectParam = 20, + .description = gFistPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_TOXIC_PLATE] = + { + .name = _("Toxic Plate"), + .itemId = ITEM_TOXIC_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_POISON_POWER, + .holdEffectParam = 20, + .description = gToxicPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_EARTH_PLATE] = + { + .name = _("Earth Plate"), + .itemId = ITEM_EARTH_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GROUND_POWER, + .holdEffectParam = 20, + .description = gEarthPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SKY_PLATE] = + { + .name = _("Sky Plate"), + .itemId = ITEM_SKY_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FLYING_POWER, + .holdEffectParam = 20, + .description = gSkyPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MIND_PLATE] = + { + .name = _("Mind Plate"), + .itemId = ITEM_MIND_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, + .holdEffectParam = 20, + .description = gMindPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_INSECT_PLATE] = + { + .name = _("Insect Plate"), + .itemId = ITEM_INSECT_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_BUG_POWER, + .holdEffectParam = 20, + .description = gInsectPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_STONE_PLATE] = + { + .name = _("Stone Plate"), + .itemId = ITEM_STONE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ROCK_POWER, + .holdEffectParam = 20, + .description = gStonePlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SPOOKY_PLATE] = + { + .name = _("Spooky Plate"), + .itemId = ITEM_SPOOKY_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GHOST_POWER, + .holdEffectParam = 20, + .description = gSpookyPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DRACO_PLATE] = + { + .name = _("Draco Plate"), + .itemId = ITEM_DRACO_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRAGON_POWER, + .holdEffectParam = 20, + .description = gDracoPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DREAD_PLATE] = + { + .name = _("Dread Plate"), + .itemId = ITEM_DREAD_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_DARK_POWER, + .holdEffectParam = 20, + .description = gDreadPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_IRON_PLATE] = + { + .name = _("Iron Plate"), + .itemId = ITEM_IRON_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_STEEL_POWER, + .holdEffectParam = 20, + .description = gIronPlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_EVIOLITE] = + { + .name = _("Eviolite"), + .itemId = ITEM_EVIOLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_EVIOLITE, + .holdEffectParam = 50, + .description = gEvioliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FLOAT_STONE] = + { + .name = _("Float Stone"), + .itemId = ITEM_FLOAT_STONE, + .price = 200, + .holdEffect = HOLD_EFFECT_FLOAT_STONE, + .holdEffectParam = 0, + .description = gFloatStoneItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BINDING_BAND] = + { + .name = _("Binding Band"), + .itemId = ITEM_BINDING_BAND, + .price = 200, + .holdEffect = HOLD_EFFECT_BINDING_BAND, + .holdEffectParam = 0, + .description = gBindingBandItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DOUSE_DRIVE] = + { + .name = _("Douse Drive"), + .itemId = ITEM_DOUSE_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .holdEffectParam = 0, + .description = gDouseDriveItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SHOCK_DRIVE] = + { + .name = _("Shock Drive"), + .itemId = ITEM_SHOCK_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .holdEffectParam = 0, + .description = gShockDriveItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BURN_DRIVE] = + { + .name = _("Burn Drive"), + .itemId = ITEM_BURN_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .holdEffectParam = 0, + .description = gBurnDriveItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CHILL_DRIVE] = + { + .name = _("Chill Drive"), + .itemId = ITEM_CHILL_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .holdEffectParam = 0, + .description = gChillDriveItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FIRE_GEM] = + { + .name = _("Fire Gem"), + .itemId = ITEM_FIRE_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gFireGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_WATER_GEM] = + { + .name = _("Water Gem"), + .itemId = ITEM_WATER_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gWaterGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ELECTRIC_GEM] = + { + .name = _("Electric Gem"), + .itemId = ITEM_ELECTRIC_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gElectricGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GRASS_GEM] = + { + .name = _("Grass Gem"), + .itemId = ITEM_GRASS_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gGrassGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ICE_GEM] = + { + .name = _("Ice Gem"), + .itemId = ITEM_ICE_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gIceGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FIGHTING_GEM] = + { + .name = _("Fighting Gem"), + .itemId = ITEM_FIGHTING_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gFightingGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_POISON_GEM] = + { + .name = _("Poison Gem"), + .itemId = ITEM_POISON_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gPoisonGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GROUND_GEM] = + { + .name = _("Ground Gem"), + .itemId = ITEM_GROUND_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gGroundGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FLYING_GEM] = + { + .name = _("Flying Gem"), + .itemId = ITEM_FLYING_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gFlyingGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PSYCHIC_GEM] = + { + .name = _("Psychic Gem"), + .itemId = ITEM_PSYCHIC_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gPsychicGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BUG_GEM] = + { + .name = _("Bug Gem"), + .itemId = ITEM_BUG_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gBugGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ROCK_GEM] = + { + .name = _("Rock Gem"), + .itemId = ITEM_ROCK_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gRockGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GHOST_GEM] = + { + .name = _("Ghost Gem"), + .itemId = ITEM_GHOST_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gGhostGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DRAGON_GEM] = + { + .name = _("Dragon Gem"), + .itemId = ITEM_DRAGON_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gDragonGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DARK_GEM] = + { + .name = _("Dark Gem"), + .itemId = ITEM_DARK_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gDarkGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_STEEL_GEM] = + { + .name = _("Steel Gem"), + .itemId = ITEM_STEEL_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gSteelGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_NORMAL_GEM] = + { + .name = _("Normal Gem"), + .itemId = ITEM_NORMAL_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gNormalGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_FAIRY_GEM] = + { + .name = _("Fairy Gem"), + .itemId = ITEM_FAIRY_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 0, + .description = gFairyGemItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ASSAULT_VEST] = + { + .name = _("Assault Vest"), + .itemId = ITEM_ASSAULT_VEST, + .price = 200, + .holdEffect = HOLD_EFFECT_ASSAULT_VEST, + .holdEffectParam = 50, + .description = gAssaultVestItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PIXIE_PLATE] = + { + .name = _("Pixie Plate"), + .itemId = ITEM_PIXIE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FAIRY_POWER, + .holdEffectParam = 20, + .description = gPixiePlateItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SAFETY_GOGGLES] = + { + .name = _("SafetyGoggles"), + .itemId = ITEM_SAFETY_GOGGLES, + .price = 4000, + .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES, + .holdEffectParam = 0, + .description = gSafetyGogglesItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GENGARITE] = + { + .name = _("Gengarite"), + .itemId = ITEM_GENGARITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGengariteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GARDEVOIRITE] = + { + .name = _("Gardevoirite"), + .itemId = ITEM_GARDEVOIRITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGardevoiriteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_AMPHAROSITE] = + { + .name = _("Ampharosite"), + .itemId = ITEM_AMPHAROSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAmpharositeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_VENUSAURITE] = + { + .name = _("Venusaurite"), + .itemId = ITEM_VENUSAURITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gVenusauriteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CHARIZARDITE_X] = + { + .name = _("CharizarditeX"), + .itemId = ITEM_CHARIZARDITE_X, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gCharizarditeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BLASTOISINITE] = + { + .name = _("Blastoisinite"), + .itemId = ITEM_BLASTOISINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gBlastoisiniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MEWTWONITE_X] = + { + .name = _("Mewtwonite X"), + .itemId = ITEM_MEWTWONITE_X, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gMewtwoniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MEWTWONITE_Y] = + { + .name = _("Mewtwonite Y"), + .itemId = ITEM_MEWTWONITE_Y, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gMewtwoniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BLAZIKENITE] = + { + .name = _("Blazikenite"), + .itemId = ITEM_BLAZIKENITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gBlazikeniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MEDICHAMITE] = + { + .name = _("Medichamite"), + .itemId = ITEM_MEDICHAMITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gMedichamiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_HOUNDOOMINITE] = + { + .name = _("Houndoominite"), + .itemId = ITEM_HOUNDOOMINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gHoundoominiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_AGGRONITE] = + { + .name = _("Aggronite"), + .itemId = ITEM_AGGRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAggroniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BANETTITE] = + { + .name = _("Banettite"), + .itemId = ITEM_BANETTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gBanettiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_TYRANITARITE] = + { + .name = _("Tyranitarite"), + .itemId = ITEM_TYRANITARITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gTyranitariteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SCIZORITE] = + { + .name = _("Scizorite"), + .itemId = ITEM_SCIZORITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gScizoriteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PINSIRITE] = + { + .name = _("Pinsirite"), + .itemId = ITEM_PINSIRITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gPinsiriteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_AERODACTYLITE] = + { + .name = _("Aerodactylite"), + .itemId = ITEM_AERODACTYLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAerodactyliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LUCARIONITE] = + { + .name = _("Lucarionite"), + .itemId = ITEM_LUCARIONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gLucarioniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ABOMASITE] = + { + .name = _("Abomasite"), + .itemId = ITEM_ABOMASITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAbomasiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_KANGASKHANITE] = + { + .name = _("Kangaskhanite"), + .itemId = ITEM_KANGASKHANITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gKangaskhaniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GYARADOSITE] = + { + .name = _("Gyaradosite"), + .itemId = ITEM_GYARADOSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGyaradositeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ABSOLITE] = + { + .name = _("Absolite"), + .itemId = ITEM_ABSOLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAbsoliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CHARIZARDITE_Y] = + { + .name = _("CharizarditeY"), + .itemId = ITEM_CHARIZARDITE_Y, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gCharizarditeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ALAKAZITE] = + { + .name = _("Alakazite"), + .itemId = ITEM_ALAKAZITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAlakaziteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_HERACRONITE] = + { + .name = _("Heracronite"), + .itemId = ITEM_HERACRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gHeracroniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MAWILITE] = + { + .name = _("Mawilite"), + .itemId = ITEM_MAWILITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gMawiliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MANECTITE] = + { + .name = _("Manectite"), + .itemId = ITEM_MANECTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gManectiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GARCHOMPITE] = + { + .name = _("Garchompite"), + .itemId = ITEM_GARCHOMPITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGarchompiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LATIASITE] = + { + .name = _("Latiasite"), + .itemId = ITEM_LATIASITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gLatiasiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LATIOSITE] = + { + .name = _("Latiosite"), + .itemId = ITEM_LATIOSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gLatiositeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SWAMPERTITE] = + { + .name = _("Swampertite"), + .itemId = ITEM_SWAMPERTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSwampertiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SCEPTILITE] = + { + .name = _("Sceptilite"), + .itemId = ITEM_SCEPTILITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSceptiliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SABLENITE] = + { + .name = _("Sablenite"), + .itemId = ITEM_SABLENITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSableniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ALTARIANITE] = + { + .name = _("Altarianite"), + .itemId = ITEM_ALTARIANITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAltarianiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GALLADITE] = + { + .name = _("Galladite"), + .itemId = ITEM_GALLADITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGalladiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_AUDINITE] = + { + .name = _("Audinite"), + .itemId = ITEM_AUDINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gAudiniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_METAGROSSITE] = + { + .name = _("Metagrossite"), + .itemId = ITEM_METAGROSSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gMetagrossiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SHARPEDONITE] = + { + .name = _("Sharpedonite"), + .itemId = ITEM_SHARPEDONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSharpedoniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SLOWBRONITE] = + { + .name = _("Slowbronite"), + .itemId = ITEM_SLOWBRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSlowbroniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_STEELIXITE] = + { + .name = _("Steelixite"), + .itemId = ITEM_STEELIXITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSteelixiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PIDGEOTITE] = + { + .name = _("Pidgeotite"), + .itemId = ITEM_PIDGEOTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gPidgeotiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GLALITITE] = + { + .name = _("Glalitite"), + .itemId = ITEM_GLALITITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gGlalititeItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_DIANCITE] = + { + .name = _("Diancite"), + .itemId = ITEM_DIANCITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gDianciteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_CAMERUPTITE] = + { + .name = _("Cameruptite"), + .itemId = ITEM_CAMERUPTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gCameruptiteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_LOPUNNITE] = + { + .name = _("Lopunnite"), + .itemId = ITEM_LOPUNNITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gLopunniteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_SALAMENCITE] = + { + .name = _("Salamencite"), + .itemId = ITEM_SALAMENCITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gSalamenciteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_BEEDRILLITE] = + { + .name = _("Beedrillite"), + .itemId = ITEM_BEEDRILLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .holdEffectParam = 0, + .description = gBeedrilliteItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MEGA_BRACELET] = + { + .name = _("Mega Bracelet"), + .itemId = ITEM_MEGA_BRACELET, + .price = 200, + .holdEffect = HOLD_EFFECT_NONE, + .holdEffectParam = 0, + .description = gMegaBraceletItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_KEY_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PROTECTIVE_PADS] = + { + .name = _("Protect Pads"), // Shortened name from Protective Pads + .itemId = ITEM_PROTECTIVE_PADS, + .price = 4000, + .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS, + .holdEffectParam = 0, + .description = gProtectPadsItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_TERRAIN_EXTENDER] = + { + .name = _("Terrain Exte."), + .itemId = ITEM_TERRAIN_EXTENDER, + .price = 4000, + .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER, + .holdEffectParam = 0, + .description = gTerrainExtenderItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ELECTRIC_SEED] = + { + .name = _("Electric Seed"), + .itemId = ITEM_ELECTRIC_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .holdEffectParam = 0, + .description = gElectricSeedItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_GRASSY_SEED] = + { + .name = _("Grassy Seed"), + .itemId = ITEM_GRASSY_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .holdEffectParam = 0, + .description = gGrassySeedItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_MISTY_SEED] = + { + .name = _("Misty Seed"), + .itemId = ITEM_MISTY_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .holdEffectParam = 0, + .description = gMistySeedItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_PSYCHIC_SEED] = + { + .name = _("Psychic Seed"), + .itemId = ITEM_PSYCHIC_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .holdEffectParam = 0, + .description = gPsychicSeedItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_ADRENALINE_ORB] = + { + .name = _("AdrenalineOrb"), + .itemId = ITEM_ADRENALINE_ORB, + .price = 300, + .holdEffect = HOLD_EFFECT_ADRENALINE_ORB, + .holdEffectParam = 0, + .description = gAdrenalineOrbItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, + + [ITEM_HONEY] = + { + .name = _("Honey"), + .itemId = ITEM_HONEY, + .price = 100, + .holdEffect = HOLD_EFFECT_NONE, + .holdEffectParam = 0, + .description = gHoneyItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + } }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 1f048e440..4558b0fa8 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -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."); From 0996404139bfc67f6146b5d5f2fd53abe2e1f21c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 13 Apr 2019 13:30:38 +0200 Subject: [PATCH 02/52] Get all availabe items data --- .../items/icon_palettes/Kangaskhanite.pal | 19 + graphics/items/icon_palettes/abomasite.pal | 19 + graphics/items/icon_palettes/absolite.pal | 19 + graphics/items/icon_palettes/adamant_orb.pal | 19 + .../items/icon_palettes/adrenaline_orb.pal | 19 + .../items/icon_palettes/aerodactylite.pal | 19 + graphics/items/icon_palettes/aggronite.pal | 19 + graphics/items/icon_palettes/alakazite.pal | 19 + graphics/items/icon_palettes/altarianite.pal | 19 + graphics/items/icon_palettes/ampharosite.pal | 19 + graphics/items/icon_palettes/assault_vest.pal | 19 + graphics/items/icon_palettes/audinite.pal | 19 + graphics/items/icon_palettes/banettite.pal | 19 + graphics/items/icon_palettes/beedrillite.pal | 19 + graphics/items/icon_palettes/big_root.pal | 19 + graphics/items/icon_palettes/binding_band.pal | 19 + graphics/items/icon_palettes/black_sludge.pal | 19 + .../items/icon_palettes/blastoisinite.pal | 19 + graphics/items/icon_palettes/blazikenite.pal | 19 + graphics/items/icon_palettes/bug_gem.pal | 19 + graphics/items/icon_palettes/burn_drive.pal | 19 + graphics/items/icon_palettes/cameruptite.pal | 19 + .../items/icon_palettes/charizardite_x.pal | 19 + .../items/icon_palettes/charizardite_y.pal | 19 + graphics/items/icon_palettes/chill_drive.pal | 19 + graphics/items/icon_palettes/choice_scarf.pal | 19 + graphics/items/icon_palettes/choice_specs.pal | 19 + graphics/items/icon_palettes/damp_rock.pal | 19 + graphics/items/icon_palettes/dark_gem.pal | 19 + graphics/items/icon_palettes/destiny_knot.pal | 19 + graphics/items/icon_palettes/diancite.pal | 19 + graphics/items/icon_palettes/douse_drive.pal | 19 + graphics/items/icon_palettes/draco_plate.pal | 19 + graphics/items/icon_palettes/dragon_gem.pal | 19 + graphics/items/icon_palettes/dread_plate.pal | 19 + graphics/items/icon_palettes/earth_plate.pal | 19 + graphics/items/icon_palettes/electric_gem.pal | 19 + .../items/icon_palettes/electric_seed.pal | 19 + graphics/items/icon_palettes/eviolite.pal | 19 + graphics/items/icon_palettes/expert_belt.pal | 19 + graphics/items/icon_palettes/fairy_gem.pal | 19 + graphics/items/icon_palettes/fighting_gem.pal | 19 + graphics/items/icon_palettes/fire_gem.pal | 19 + graphics/items/icon_palettes/fist_plate.pal | 19 + graphics/items/icon_palettes/flame_orb.pal | 19 + graphics/items/icon_palettes/flame_plate.pal | 19 + graphics/items/icon_palettes/float_stone.pal | 19 + graphics/items/icon_palettes/flying_gem.pal | 19 + graphics/items/icon_palettes/focus_sash.pal | 19 + graphics/items/icon_palettes/galladite.pal | 19 + graphics/items/icon_palettes/garchompite.pal | 19 + graphics/items/icon_palettes/gardevoirite.pal | 19 + graphics/items/icon_palettes/gengarite.pal | 19 + graphics/items/icon_palettes/ghost_gem.pal | 19 + graphics/items/icon_palettes/glalitite.pal | 19 + graphics/items/icon_palettes/grass_gem.pal | 19 + graphics/items/icon_palettes/grassy_seed.pal | 19 + graphics/items/icon_palettes/grip_claw.pal | 19 + graphics/items/icon_palettes/griseous_orb.pal | 19 + graphics/items/icon_palettes/ground_gem.pal | 19 + graphics/items/icon_palettes/gyaradosite.pal | 19 + graphics/items/icon_palettes/heat_rock.pal | 19 + graphics/items/icon_palettes/heracronite.pal | 19 + graphics/items/icon_palettes/honey.pal | 19 + .../items/icon_palettes/houndoominite.pal | 19 + graphics/items/icon_palettes/ice_gem.pal | 19 + graphics/items/icon_palettes/icicle_plate.pal | 19 + graphics/items/icon_palettes/icy_rock.pal | 19 + graphics/items/icon_palettes/insect_plate.pal | 19 + graphics/items/icon_palettes/iron_ball.pal | 19 + graphics/items/icon_palettes/iron_plate.pal | 19 + graphics/items/icon_palettes/lagging_tail.pal | 19 + graphics/items/icon_palettes/latiasite.pal | 19 + graphics/items/icon_palettes/latiosite.pal | 19 + graphics/items/icon_palettes/life_orb.pal | 19 + graphics/items/icon_palettes/light_clay.pal | 19 + graphics/items/icon_palettes/lopunnite.pal | 19 + graphics/items/icon_palettes/lucarionite.pal | 19 + graphics/items/icon_palettes/lustrous_orb.pal | 19 + graphics/items/icon_palettes/manectite.pal | 19 + graphics/items/icon_palettes/mawilite.pal | 19 + graphics/items/icon_palettes/meadow_plate.pal | 19 + graphics/items/icon_palettes/medichamite.pal | 19 + .../items/icon_palettes/mega_bracelet.pal | 19 + graphics/items/icon_palettes/metagrossite.pal | 19 + graphics/items/icon_palettes/metronome.pal | 19 + graphics/items/icon_palettes/mewtwonite_x.pal | 19 + graphics/items/icon_palettes/mewtwonite_y.pal | 19 + graphics/items/icon_palettes/mind_plate.pal | 19 + graphics/items/icon_palettes/misty_seed.pal | 19 + graphics/items/icon_palettes/muscle_band.pal | 19 + graphics/items/icon_palettes/normal_gem.pal | 19 + graphics/items/icon_palettes/pidgeotite.pal | 19 + graphics/items/icon_palettes/pinsirite.pal | 19 + graphics/items/icon_palettes/pixie_plate.pal | 19 + graphics/items/icon_palettes/poison_gem.pal | 19 + graphics/items/icon_palettes/power_herb.pal | 19 + .../items/icon_palettes/protective_pads.pal | 19 + graphics/items/icon_palettes/psychic_gem.pal | 19 + graphics/items/icon_palettes/psychic_seed.pal | 19 + graphics/items/icon_palettes/quick_powder.pal | 19 + graphics/items/icon_palettes/rock_gem.pal | 19 + graphics/items/icon_palettes/sablenite.pal | 19 + .../items/icon_palettes/safety_goggles.png | Bin 0 -> 386 bytes graphics/items/icon_palettes/salamencite.pal | 19 + graphics/items/icon_palettes/sceptilite.pal | 19 + graphics/items/icon_palettes/scizorite.pal | 19 + graphics/items/icon_palettes/sharpedonite.pal | 19 + graphics/items/icon_palettes/shed_shell.pal | 19 + graphics/items/icon_palettes/shock_drive.pal | 19 + graphics/items/icon_palettes/sky_plate.pal | 19 + graphics/items/icon_palettes/slowbronite.pal | 19 + graphics/items/icon_palettes/smooth_rock.pal | 19 + graphics/items/icon_palettes/splash_plate.pal | 19 + graphics/items/icon_palettes/spooky_plate.pal | 19 + graphics/items/icon_palettes/steel_gem.pal | 19 + graphics/items/icon_palettes/steelixite.pal | 19 + graphics/items/icon_palettes/sticky_barb.pal | 19 + graphics/items/icon_palettes/stone_plate.pal | 19 + graphics/items/icon_palettes/swampertite.pal | 19 + .../items/icon_palettes/terrain_extender.pal | 19 + graphics/items/icon_palettes/toxic_orb.pal | 19 + graphics/items/icon_palettes/toxic_plate.pal | 19 + graphics/items/icon_palettes/tyranitarite.pal | 19 + graphics/items/icon_palettes/venusaurite.pal | 19 + graphics/items/icon_palettes/water_gem.pal | 19 + graphics/items/icon_palettes/wide_lens.pal | 19 + graphics/items/icon_palettes/wise_glasses.pal | 19 + graphics/items/icon_palettes/zap_plate.pal | 19 + graphics/items/icon_palettes/zoom_lens.pal | 19 + graphics/items/icons/abomasite.png | Bin 0 -> 266 bytes graphics/items/icons/absolite.png | Bin 0 -> 225 bytes graphics/items/icons/adamant_orb.png | Bin 0 -> 321 bytes graphics/items/icons/adrenaline_orb.png | Bin 0 -> 260 bytes graphics/items/icons/aerodactylite.png | Bin 0 -> 264 bytes graphics/items/icons/aggronite.png | Bin 0 -> 235 bytes graphics/items/icons/alakazite.png | Bin 0 -> 232 bytes graphics/items/icons/altarianite.png | Bin 0 -> 227 bytes graphics/items/icons/ampharosite.png | Bin 0 -> 235 bytes graphics/items/icons/assault_vest.png | Bin 0 -> 251 bytes graphics/items/icons/audinite.png | Bin 0 -> 240 bytes graphics/items/icons/banettite.png | Bin 0 -> 235 bytes graphics/items/icons/beedrillite.png | Bin 0 -> 265 bytes graphics/items/icons/big_root.png | Bin 0 -> 415 bytes graphics/items/icons/binding_band.png | Bin 0 -> 221 bytes graphics/items/icons/black_sludge.png | Bin 0 -> 364 bytes graphics/items/icons/blastoisinite.png | Bin 0 -> 232 bytes graphics/items/icons/blazikenite.png | Bin 0 -> 235 bytes graphics/items/icons/bug_gem.png | Bin 0 -> 353 bytes graphics/items/icons/burn_drive.png | Bin 0 -> 342 bytes graphics/items/icons/cameruptite.png | Bin 0 -> 244 bytes graphics/items/icons/charizardite_x.png | Bin 0 -> 231 bytes graphics/items/icons/charizardite_y.png | Bin 0 -> 232 bytes graphics/items/icons/chill_drive.png | Bin 0 -> 342 bytes graphics/items/icons/choice_scarf.png | Bin 0 -> 447 bytes graphics/items/icons/choice_specs.png | Bin 0 -> 369 bytes graphics/items/icons/damp_rock.png | Bin 0 -> 429 bytes graphics/items/icons/dark_gem.png | Bin 0 -> 353 bytes graphics/items/icons/destiny_knot.png | Bin 0 -> 396 bytes graphics/items/icons/diancite.png | Bin 0 -> 237 bytes graphics/items/icons/douse_drive.png | Bin 0 -> 342 bytes graphics/items/icons/draco_plate.png | Bin 0 -> 355 bytes graphics/items/icons/dragon_gem.png | Bin 0 -> 353 bytes graphics/items/icons/dread_plate.png | Bin 0 -> 355 bytes graphics/items/icons/earth_plate.png | Bin 0 -> 355 bytes graphics/items/icons/electric_gem.png | Bin 0 -> 353 bytes graphics/items/icons/electric_seed.png | Bin 0 -> 310 bytes graphics/items/icons/eviolite.png | Bin 0 -> 317 bytes graphics/items/icons/expert_belt.png | Bin 0 -> 383 bytes graphics/items/icons/fairy_gem.png | Bin 0 -> 353 bytes graphics/items/icons/fighting_gem.png | Bin 0 -> 353 bytes graphics/items/icons/fire_gem.png | Bin 0 -> 353 bytes graphics/items/icons/fist_plate.png | Bin 0 -> 355 bytes graphics/items/icons/flame_orb.png | Bin 0 -> 237 bytes graphics/items/icons/flame_plate.png | Bin 0 -> 355 bytes graphics/items/icons/float_stone.png | Bin 0 -> 345 bytes graphics/items/icons/flying_gem.png | Bin 0 -> 353 bytes graphics/items/icons/focus_sash.png | Bin 0 -> 392 bytes graphics/items/icons/galladite.png | Bin 0 -> 238 bytes graphics/items/icons/garchompite.png | Bin 0 -> 235 bytes graphics/items/icons/gardevoirite.png | Bin 0 -> 235 bytes graphics/items/icons/gengarite.png | Bin 0 -> 232 bytes graphics/items/icons/ghost_gem.png | Bin 0 -> 353 bytes graphics/items/icons/glalitite.png | Bin 0 -> 241 bytes graphics/items/icons/grass_gem.png | Bin 0 -> 353 bytes graphics/items/icons/grassy_seed.png | Bin 0 -> 310 bytes graphics/items/icons/grip_claw.png | Bin 0 -> 413 bytes graphics/items/icons/griseous_orb.png | Bin 0 -> 426 bytes graphics/items/icons/ground_gem.png | Bin 0 -> 353 bytes graphics/items/icons/gyaradosite.png | Bin 0 -> 235 bytes graphics/items/icons/heat_rock.png | Bin 0 -> 434 bytes graphics/items/icons/heracronite.png | Bin 0 -> 235 bytes graphics/items/icons/honey.png | Bin 0 -> 5898 bytes graphics/items/icons/houndoominite.png | Bin 0 -> 235 bytes graphics/items/icons/ice_gem.png | Bin 0 -> 353 bytes graphics/items/icons/icicle_plate.png | Bin 0 -> 355 bytes graphics/items/icons/icy_rock.png | Bin 0 -> 411 bytes graphics/items/icons/insect_plate.png | Bin 0 -> 355 bytes graphics/items/icons/iron_ball.png | Bin 0 -> 352 bytes graphics/items/icons/iron_plate.png | Bin 0 -> 355 bytes graphics/items/icons/kangaskhanite.png | Bin 0 -> 235 bytes graphics/items/icons/lagging_tail.png | Bin 0 -> 400 bytes graphics/items/icons/latiasite.png | Bin 0 -> 235 bytes graphics/items/icons/latiosite.png | Bin 0 -> 235 bytes graphics/items/icons/life_orb.png | Bin 0 -> 330 bytes graphics/items/icons/light_clay.png | Bin 0 -> 362 bytes graphics/items/icons/lopunnite.png | Bin 0 -> 264 bytes graphics/items/icons/lucarionite.png | Bin 0 -> 333 bytes graphics/items/icons/lustrous_orb.png | Bin 0 -> 458 bytes graphics/items/icons/manectite.png | Bin 0 -> 235 bytes graphics/items/icons/mawilite.png | Bin 0 -> 235 bytes graphics/items/icons/meadow_plate.png | Bin 0 -> 355 bytes graphics/items/icons/medichamite.png | Bin 0 -> 232 bytes graphics/items/icons/mega_bracelet.png | Bin 0 -> 267 bytes graphics/items/icons/metagrossite.png | Bin 0 -> 244 bytes graphics/items/icons/metronome.png | Bin 0 -> 356 bytes graphics/items/icons/mewtwonite_x.png | Bin 0 -> 236 bytes graphics/items/icons/mewtwonite_y.png | Bin 0 -> 233 bytes graphics/items/icons/mind_plate.png | Bin 0 -> 355 bytes graphics/items/icons/misty_seed.png | Bin 0 -> 310 bytes graphics/items/icons/muscle_band.png | Bin 0 -> 418 bytes graphics/items/icons/normal_gem.png | Bin 0 -> 353 bytes graphics/items/icons/pidgeotite.png | Bin 0 -> 244 bytes graphics/items/icons/pinsirite.png | Bin 0 -> 235 bytes graphics/items/icons/pixie_plate.png | Bin 0 -> 243 bytes graphics/items/icons/poison_gem.png | Bin 0 -> 353 bytes graphics/items/icons/power_herb.png | Bin 0 -> 353 bytes graphics/items/icons/protective_pads.png | Bin 0 -> 335 bytes graphics/items/icons/psychic_gem.png | Bin 0 -> 353 bytes graphics/items/icons/psychic_seed.png | Bin 0 -> 310 bytes graphics/items/icons/quick_powder.png | Bin 0 -> 392 bytes graphics/items/icons/rock_gem.png | Bin 0 -> 353 bytes graphics/items/icons/sablenite.png | Bin 0 -> 240 bytes graphics/items/icons/safety_goggles.png | Bin 0 -> 386 bytes graphics/items/icons/salamencite.png | Bin 0 -> 244 bytes graphics/items/icons/sceptilite.png | Bin 0 -> 235 bytes graphics/items/icons/scizorite.png | Bin 0 -> 235 bytes graphics/items/icons/sharpedonite.png | Bin 0 -> 244 bytes graphics/items/icons/shed_shell.png | Bin 0 -> 393 bytes graphics/items/icons/shock_drive.png | Bin 0 -> 342 bytes graphics/items/icons/sky_plate.png | Bin 0 -> 355 bytes graphics/items/icons/slowbronite.png | Bin 0 -> 244 bytes graphics/items/icons/smooth_rock.png | Bin 0 -> 427 bytes graphics/items/icons/splash_plate.png | Bin 0 -> 352 bytes graphics/items/icons/spooky_plate.png | Bin 0 -> 355 bytes graphics/items/icons/steel_gem.png | Bin 0 -> 353 bytes graphics/items/icons/steelixite.png | Bin 0 -> 240 bytes graphics/items/icons/sticky_barb.png | Bin 0 -> 332 bytes graphics/items/icons/stone_plate.png | Bin 0 -> 355 bytes graphics/items/icons/swampertite.png | Bin 0 -> 234 bytes graphics/items/icons/terrain_extender.png | Bin 0 -> 313 bytes graphics/items/icons/toxic_orb.png | Bin 0 -> 347 bytes graphics/items/icons/toxic_plate.png | Bin 0 -> 355 bytes graphics/items/icons/tyranitarite.png | Bin 0 -> 235 bytes graphics/items/icons/venusaurite.png | Bin 0 -> 235 bytes graphics/items/icons/water_gem.png | Bin 0 -> 353 bytes graphics/items/icons/wide_lens.png | Bin 0 -> 370 bytes graphics/items/icons/wise_glasses.png | Bin 0 -> 333 bytes graphics/items/icons/zap_plate.png | Bin 0 -> 355 bytes graphics/items/icons/zoom_lens.png | Bin 0 -> 385 bytes include/graphics.h | 264 ++++++++++++ src/data/graphics/items.h | 398 ++++++++++++++++++ src/data/item_icon_table.h | 1 - 263 files changed, 3113 insertions(+), 1 deletion(-) create mode 100644 graphics/items/icon_palettes/Kangaskhanite.pal create mode 100644 graphics/items/icon_palettes/abomasite.pal create mode 100644 graphics/items/icon_palettes/absolite.pal create mode 100644 graphics/items/icon_palettes/adamant_orb.pal create mode 100644 graphics/items/icon_palettes/adrenaline_orb.pal create mode 100644 graphics/items/icon_palettes/aerodactylite.pal create mode 100644 graphics/items/icon_palettes/aggronite.pal create mode 100644 graphics/items/icon_palettes/alakazite.pal create mode 100644 graphics/items/icon_palettes/altarianite.pal create mode 100644 graphics/items/icon_palettes/ampharosite.pal create mode 100644 graphics/items/icon_palettes/assault_vest.pal create mode 100644 graphics/items/icon_palettes/audinite.pal create mode 100644 graphics/items/icon_palettes/banettite.pal create mode 100644 graphics/items/icon_palettes/beedrillite.pal create mode 100644 graphics/items/icon_palettes/big_root.pal create mode 100644 graphics/items/icon_palettes/binding_band.pal create mode 100644 graphics/items/icon_palettes/black_sludge.pal create mode 100644 graphics/items/icon_palettes/blastoisinite.pal create mode 100644 graphics/items/icon_palettes/blazikenite.pal create mode 100644 graphics/items/icon_palettes/bug_gem.pal create mode 100644 graphics/items/icon_palettes/burn_drive.pal create mode 100644 graphics/items/icon_palettes/cameruptite.pal create mode 100644 graphics/items/icon_palettes/charizardite_x.pal create mode 100644 graphics/items/icon_palettes/charizardite_y.pal create mode 100644 graphics/items/icon_palettes/chill_drive.pal create mode 100644 graphics/items/icon_palettes/choice_scarf.pal create mode 100644 graphics/items/icon_palettes/choice_specs.pal create mode 100644 graphics/items/icon_palettes/damp_rock.pal create mode 100644 graphics/items/icon_palettes/dark_gem.pal create mode 100644 graphics/items/icon_palettes/destiny_knot.pal create mode 100644 graphics/items/icon_palettes/diancite.pal create mode 100644 graphics/items/icon_palettes/douse_drive.pal create mode 100644 graphics/items/icon_palettes/draco_plate.pal create mode 100644 graphics/items/icon_palettes/dragon_gem.pal create mode 100644 graphics/items/icon_palettes/dread_plate.pal create mode 100644 graphics/items/icon_palettes/earth_plate.pal create mode 100644 graphics/items/icon_palettes/electric_gem.pal create mode 100644 graphics/items/icon_palettes/electric_seed.pal create mode 100644 graphics/items/icon_palettes/eviolite.pal create mode 100644 graphics/items/icon_palettes/expert_belt.pal create mode 100644 graphics/items/icon_palettes/fairy_gem.pal create mode 100644 graphics/items/icon_palettes/fighting_gem.pal create mode 100644 graphics/items/icon_palettes/fire_gem.pal create mode 100644 graphics/items/icon_palettes/fist_plate.pal create mode 100644 graphics/items/icon_palettes/flame_orb.pal create mode 100644 graphics/items/icon_palettes/flame_plate.pal create mode 100644 graphics/items/icon_palettes/float_stone.pal create mode 100644 graphics/items/icon_palettes/flying_gem.pal create mode 100644 graphics/items/icon_palettes/focus_sash.pal create mode 100644 graphics/items/icon_palettes/galladite.pal create mode 100644 graphics/items/icon_palettes/garchompite.pal create mode 100644 graphics/items/icon_palettes/gardevoirite.pal create mode 100644 graphics/items/icon_palettes/gengarite.pal create mode 100644 graphics/items/icon_palettes/ghost_gem.pal create mode 100644 graphics/items/icon_palettes/glalitite.pal create mode 100644 graphics/items/icon_palettes/grass_gem.pal create mode 100644 graphics/items/icon_palettes/grassy_seed.pal create mode 100644 graphics/items/icon_palettes/grip_claw.pal create mode 100644 graphics/items/icon_palettes/griseous_orb.pal create mode 100644 graphics/items/icon_palettes/ground_gem.pal create mode 100644 graphics/items/icon_palettes/gyaradosite.pal create mode 100644 graphics/items/icon_palettes/heat_rock.pal create mode 100644 graphics/items/icon_palettes/heracronite.pal create mode 100644 graphics/items/icon_palettes/honey.pal create mode 100644 graphics/items/icon_palettes/houndoominite.pal create mode 100644 graphics/items/icon_palettes/ice_gem.pal create mode 100644 graphics/items/icon_palettes/icicle_plate.pal create mode 100644 graphics/items/icon_palettes/icy_rock.pal create mode 100644 graphics/items/icon_palettes/insect_plate.pal create mode 100644 graphics/items/icon_palettes/iron_ball.pal create mode 100644 graphics/items/icon_palettes/iron_plate.pal create mode 100644 graphics/items/icon_palettes/lagging_tail.pal create mode 100644 graphics/items/icon_palettes/latiasite.pal create mode 100644 graphics/items/icon_palettes/latiosite.pal create mode 100644 graphics/items/icon_palettes/life_orb.pal create mode 100644 graphics/items/icon_palettes/light_clay.pal create mode 100644 graphics/items/icon_palettes/lopunnite.pal create mode 100644 graphics/items/icon_palettes/lucarionite.pal create mode 100644 graphics/items/icon_palettes/lustrous_orb.pal create mode 100644 graphics/items/icon_palettes/manectite.pal create mode 100644 graphics/items/icon_palettes/mawilite.pal create mode 100644 graphics/items/icon_palettes/meadow_plate.pal create mode 100644 graphics/items/icon_palettes/medichamite.pal create mode 100644 graphics/items/icon_palettes/mega_bracelet.pal create mode 100644 graphics/items/icon_palettes/metagrossite.pal create mode 100644 graphics/items/icon_palettes/metronome.pal create mode 100644 graphics/items/icon_palettes/mewtwonite_x.pal create mode 100644 graphics/items/icon_palettes/mewtwonite_y.pal create mode 100644 graphics/items/icon_palettes/mind_plate.pal create mode 100644 graphics/items/icon_palettes/misty_seed.pal create mode 100644 graphics/items/icon_palettes/muscle_band.pal create mode 100644 graphics/items/icon_palettes/normal_gem.pal create mode 100644 graphics/items/icon_palettes/pidgeotite.pal create mode 100644 graphics/items/icon_palettes/pinsirite.pal create mode 100644 graphics/items/icon_palettes/pixie_plate.pal create mode 100644 graphics/items/icon_palettes/poison_gem.pal create mode 100644 graphics/items/icon_palettes/power_herb.pal create mode 100644 graphics/items/icon_palettes/protective_pads.pal create mode 100644 graphics/items/icon_palettes/psychic_gem.pal create mode 100644 graphics/items/icon_palettes/psychic_seed.pal create mode 100644 graphics/items/icon_palettes/quick_powder.pal create mode 100644 graphics/items/icon_palettes/rock_gem.pal create mode 100644 graphics/items/icon_palettes/sablenite.pal create mode 100644 graphics/items/icon_palettes/safety_goggles.png create mode 100644 graphics/items/icon_palettes/salamencite.pal create mode 100644 graphics/items/icon_palettes/sceptilite.pal create mode 100644 graphics/items/icon_palettes/scizorite.pal create mode 100644 graphics/items/icon_palettes/sharpedonite.pal create mode 100644 graphics/items/icon_palettes/shed_shell.pal create mode 100644 graphics/items/icon_palettes/shock_drive.pal create mode 100644 graphics/items/icon_palettes/sky_plate.pal create mode 100644 graphics/items/icon_palettes/slowbronite.pal create mode 100644 graphics/items/icon_palettes/smooth_rock.pal create mode 100644 graphics/items/icon_palettes/splash_plate.pal create mode 100644 graphics/items/icon_palettes/spooky_plate.pal create mode 100644 graphics/items/icon_palettes/steel_gem.pal create mode 100644 graphics/items/icon_palettes/steelixite.pal create mode 100644 graphics/items/icon_palettes/sticky_barb.pal create mode 100644 graphics/items/icon_palettes/stone_plate.pal create mode 100644 graphics/items/icon_palettes/swampertite.pal create mode 100644 graphics/items/icon_palettes/terrain_extender.pal create mode 100644 graphics/items/icon_palettes/toxic_orb.pal create mode 100644 graphics/items/icon_palettes/toxic_plate.pal create mode 100644 graphics/items/icon_palettes/tyranitarite.pal create mode 100644 graphics/items/icon_palettes/venusaurite.pal create mode 100644 graphics/items/icon_palettes/water_gem.pal create mode 100644 graphics/items/icon_palettes/wide_lens.pal create mode 100644 graphics/items/icon_palettes/wise_glasses.pal create mode 100644 graphics/items/icon_palettes/zap_plate.pal create mode 100644 graphics/items/icon_palettes/zoom_lens.pal create mode 100644 graphics/items/icons/abomasite.png create mode 100644 graphics/items/icons/absolite.png create mode 100644 graphics/items/icons/adamant_orb.png create mode 100644 graphics/items/icons/adrenaline_orb.png create mode 100644 graphics/items/icons/aerodactylite.png create mode 100644 graphics/items/icons/aggronite.png create mode 100644 graphics/items/icons/alakazite.png create mode 100644 graphics/items/icons/altarianite.png create mode 100644 graphics/items/icons/ampharosite.png create mode 100644 graphics/items/icons/assault_vest.png create mode 100644 graphics/items/icons/audinite.png create mode 100644 graphics/items/icons/banettite.png create mode 100644 graphics/items/icons/beedrillite.png create mode 100644 graphics/items/icons/big_root.png create mode 100644 graphics/items/icons/binding_band.png create mode 100644 graphics/items/icons/black_sludge.png create mode 100644 graphics/items/icons/blastoisinite.png create mode 100644 graphics/items/icons/blazikenite.png create mode 100644 graphics/items/icons/bug_gem.png create mode 100644 graphics/items/icons/burn_drive.png create mode 100644 graphics/items/icons/cameruptite.png create mode 100644 graphics/items/icons/charizardite_x.png create mode 100644 graphics/items/icons/charizardite_y.png create mode 100644 graphics/items/icons/chill_drive.png create mode 100644 graphics/items/icons/choice_scarf.png create mode 100644 graphics/items/icons/choice_specs.png create mode 100644 graphics/items/icons/damp_rock.png create mode 100644 graphics/items/icons/dark_gem.png create mode 100644 graphics/items/icons/destiny_knot.png create mode 100644 graphics/items/icons/diancite.png create mode 100644 graphics/items/icons/douse_drive.png create mode 100644 graphics/items/icons/draco_plate.png create mode 100644 graphics/items/icons/dragon_gem.png create mode 100644 graphics/items/icons/dread_plate.png create mode 100644 graphics/items/icons/earth_plate.png create mode 100644 graphics/items/icons/electric_gem.png create mode 100644 graphics/items/icons/electric_seed.png create mode 100644 graphics/items/icons/eviolite.png create mode 100644 graphics/items/icons/expert_belt.png create mode 100644 graphics/items/icons/fairy_gem.png create mode 100644 graphics/items/icons/fighting_gem.png create mode 100644 graphics/items/icons/fire_gem.png create mode 100644 graphics/items/icons/fist_plate.png create mode 100644 graphics/items/icons/flame_orb.png create mode 100644 graphics/items/icons/flame_plate.png create mode 100644 graphics/items/icons/float_stone.png create mode 100644 graphics/items/icons/flying_gem.png create mode 100644 graphics/items/icons/focus_sash.png create mode 100644 graphics/items/icons/galladite.png create mode 100644 graphics/items/icons/garchompite.png create mode 100644 graphics/items/icons/gardevoirite.png create mode 100644 graphics/items/icons/gengarite.png create mode 100644 graphics/items/icons/ghost_gem.png create mode 100644 graphics/items/icons/glalitite.png create mode 100644 graphics/items/icons/grass_gem.png create mode 100644 graphics/items/icons/grassy_seed.png create mode 100644 graphics/items/icons/grip_claw.png create mode 100644 graphics/items/icons/griseous_orb.png create mode 100644 graphics/items/icons/ground_gem.png create mode 100644 graphics/items/icons/gyaradosite.png create mode 100644 graphics/items/icons/heat_rock.png create mode 100644 graphics/items/icons/heracronite.png create mode 100644 graphics/items/icons/honey.png create mode 100644 graphics/items/icons/houndoominite.png create mode 100644 graphics/items/icons/ice_gem.png create mode 100644 graphics/items/icons/icicle_plate.png create mode 100644 graphics/items/icons/icy_rock.png create mode 100644 graphics/items/icons/insect_plate.png create mode 100644 graphics/items/icons/iron_ball.png create mode 100644 graphics/items/icons/iron_plate.png create mode 100644 graphics/items/icons/kangaskhanite.png create mode 100644 graphics/items/icons/lagging_tail.png create mode 100644 graphics/items/icons/latiasite.png create mode 100644 graphics/items/icons/latiosite.png create mode 100644 graphics/items/icons/life_orb.png create mode 100644 graphics/items/icons/light_clay.png create mode 100644 graphics/items/icons/lopunnite.png create mode 100644 graphics/items/icons/lucarionite.png create mode 100644 graphics/items/icons/lustrous_orb.png create mode 100644 graphics/items/icons/manectite.png create mode 100644 graphics/items/icons/mawilite.png create mode 100644 graphics/items/icons/meadow_plate.png create mode 100644 graphics/items/icons/medichamite.png create mode 100644 graphics/items/icons/mega_bracelet.png create mode 100644 graphics/items/icons/metagrossite.png create mode 100644 graphics/items/icons/metronome.png create mode 100644 graphics/items/icons/mewtwonite_x.png create mode 100644 graphics/items/icons/mewtwonite_y.png create mode 100644 graphics/items/icons/mind_plate.png create mode 100644 graphics/items/icons/misty_seed.png create mode 100644 graphics/items/icons/muscle_band.png create mode 100644 graphics/items/icons/normal_gem.png create mode 100644 graphics/items/icons/pidgeotite.png create mode 100644 graphics/items/icons/pinsirite.png create mode 100644 graphics/items/icons/pixie_plate.png create mode 100644 graphics/items/icons/poison_gem.png create mode 100644 graphics/items/icons/power_herb.png create mode 100644 graphics/items/icons/protective_pads.png create mode 100644 graphics/items/icons/psychic_gem.png create mode 100644 graphics/items/icons/psychic_seed.png create mode 100644 graphics/items/icons/quick_powder.png create mode 100644 graphics/items/icons/rock_gem.png create mode 100644 graphics/items/icons/sablenite.png create mode 100644 graphics/items/icons/safety_goggles.png create mode 100644 graphics/items/icons/salamencite.png create mode 100644 graphics/items/icons/sceptilite.png create mode 100644 graphics/items/icons/scizorite.png create mode 100644 graphics/items/icons/sharpedonite.png create mode 100644 graphics/items/icons/shed_shell.png create mode 100644 graphics/items/icons/shock_drive.png create mode 100644 graphics/items/icons/sky_plate.png create mode 100644 graphics/items/icons/slowbronite.png create mode 100644 graphics/items/icons/smooth_rock.png create mode 100644 graphics/items/icons/splash_plate.png create mode 100644 graphics/items/icons/spooky_plate.png create mode 100644 graphics/items/icons/steel_gem.png create mode 100644 graphics/items/icons/steelixite.png create mode 100644 graphics/items/icons/sticky_barb.png create mode 100644 graphics/items/icons/stone_plate.png create mode 100644 graphics/items/icons/swampertite.png create mode 100644 graphics/items/icons/terrain_extender.png create mode 100644 graphics/items/icons/toxic_orb.png create mode 100644 graphics/items/icons/toxic_plate.png create mode 100644 graphics/items/icons/tyranitarite.png create mode 100644 graphics/items/icons/venusaurite.png create mode 100644 graphics/items/icons/water_gem.png create mode 100644 graphics/items/icons/wide_lens.png create mode 100644 graphics/items/icons/wise_glasses.png create mode 100644 graphics/items/icons/zap_plate.png create mode 100644 graphics/items/icons/zoom_lens.png diff --git a/graphics/items/icon_palettes/Kangaskhanite.pal b/graphics/items/icon_palettes/Kangaskhanite.pal new file mode 100644 index 000000000..dd50b3216 --- /dev/null +++ b/graphics/items/icon_palettes/Kangaskhanite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +184 160 248 +160 128 168 +128 96 96 +248 216 120 +216 192 248 +200 168 192 +192 160 104 +248 248 248 +184 160 232 +216 192 184 +248 240 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/abomasite.pal b/graphics/items/icon_palettes/abomasite.pal new file mode 100644 index 000000000..173d17297 --- /dev/null +++ b/graphics/items/icon_palettes/abomasite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +136 160 232 +248 248 248 +48 136 120 +144 208 184 +200 216 208 +80 160 144 +144 208 176 +192 208 240 +104 168 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/absolite.pal b/graphics/items/icon_palettes/absolite.pal new file mode 100644 index 000000000..5deff2aca --- /dev/null +++ b/graphics/items/icon_palettes/absolite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +88 104 160 +152 176 232 +248 248 248 +144 160 208 +200 216 240 +64 72 136 +128 144 192 +192 216 240 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/adamant_orb.pal b/graphics/items/icon_palettes/adamant_orb.pal new file mode 100644 index 000000000..d5cb6a7ce --- /dev/null +++ b/graphics/items/icon_palettes/adamant_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +93 93 93 +39 39 39 +247 247 247 +177 203 247 +220 247 247 +194 229 247 +159 194 247 +151 177 220 +117 159 212 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/adrenaline_orb.pal b/graphics/items/icon_palettes/adrenaline_orb.pal new file mode 100644 index 000000000..f2b1e719e --- /dev/null +++ b/graphics/items/icon_palettes/adrenaline_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +41 65 115 +90 172 222 +57 90 148 +106 197 238 +123 230 246 +82 148 189 +82 115 164 +57 106 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/aerodactylite.pal b/graphics/items/icon_palettes/aerodactylite.pal new file mode 100644 index 000000000..a0f921cfb --- /dev/null +++ b/graphics/items/icon_palettes/aerodactylite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +176 160 208 +64 64 64 +144 64 216 +208 208 248 +88 64 128 +160 80 232 +208 184 232 +248 248 248 +120 112 136 +160 160 168 +168 128 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/aggronite.pal b/graphics/items/icon_palettes/aggronite.pal new file mode 100644 index 000000000..1bba14f16 --- /dev/null +++ b/graphics/items/icon_palettes/aggronite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +160 160 160 +120 120 120 +88 88 88 +208 208 248 +208 208 208 +200 200 200 +152 152 168 +248 248 248 +152 152 152 +192 192 192 +232 232 232 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/alakazite.pal b/graphics/items/icon_palettes/alakazite.pal new file mode 100644 index 000000000..0d215cb94 --- /dev/null +++ b/graphics/items/icon_palettes/alakazite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +240 184 88 +176 120 152 +144 88 168 +192 208 216 +216 208 200 +208 160 200 +168 152 192 +248 248 248 +232 176 40 +208 192 152 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/altarianite.pal b/graphics/items/icon_palettes/altarianite.pal new file mode 100644 index 000000000..ecb5f5935 --- /dev/null +++ b/graphics/items/icon_palettes/altarianite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +232 168 216 +136 184 240 +104 208 248 +144 216 248 +184 224 240 +248 248 248 +224 224 224 +224 192 216 +224 184 216 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ampharosite.pal b/graphics/items/icon_palettes/ampharosite.pal new file mode 100644 index 000000000..d99ebd636 --- /dev/null +++ b/graphics/items/icon_palettes/ampharosite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +232 200 56 +248 120 104 +232 64 80 +192 200 232 +248 224 152 +248 176 152 +216 136 160 +248 248 248 +240 200 0 +216 200 120 +216 216 216 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/assault_vest.pal b/graphics/items/icon_palettes/assault_vest.pal new file mode 100644 index 000000000..b68dfab9d --- /dev/null +++ b/graphics/items/icon_palettes/assault_vest.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +200 80 80 +144 48 56 +64 64 64 +96 72 80 +176 56 64 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/audinite.pal b/graphics/items/icon_palettes/audinite.pal new file mode 100644 index 000000000..502636ab7 --- /dev/null +++ b/graphics/items/icon_palettes/audinite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +248 240 208 +184 104 120 +232 104 136 +248 216 224 +240 176 192 +240 192 200 +240 224 208 +248 248 248 +240 200 184 +232 200 192 +224 184 184 +224 160 160 +240 232 208 +0 0 0 diff --git a/graphics/items/icon_palettes/banettite.pal b/graphics/items/icon_palettes/banettite.pal new file mode 100644 index 000000000..a95929c2c --- /dev/null +++ b/graphics/items/icon_palettes/banettite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +80 80 80 +216 152 8 +248 200 24 +240 144 200 +255 255 255 +232 216 136 +248 176 112 +248 248 248 +64 64 64 +208 88 136 +184 184 208 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/beedrillite.pal b/graphics/items/icon_palettes/beedrillite.pal new file mode 100644 index 000000000..2b25eaa3d --- /dev/null +++ b/graphics/items/icon_palettes/beedrillite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +192 184 224 +240 192 24 +56 56 56 +232 224 240 +200 160 8 +184 184 184 +128 104 32 +248 248 248 +216 192 128 +248 224 136 +144 120 40 +88 88 96 +120 120 136 +0 0 0 diff --git a/graphics/items/icon_palettes/big_root.pal b/graphics/items/icon_palettes/big_root.pal new file mode 100644 index 000000000..a93aa2ed7 --- /dev/null +++ b/graphics/items/icon_palettes/big_root.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +126 77 11 +168 117 46 +220 194 117 +203 151 77 +247 220 151 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/binding_band.pal b/graphics/items/icon_palettes/binding_band.pal new file mode 100644 index 000000000..ed678f3ef --- /dev/null +++ b/graphics/items/icon_palettes/binding_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +152 96 32 +184 128 40 +200 152 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/black_sludge.pal b/graphics/items/icon_palettes/black_sludge.pal new file mode 100644 index 000000000..0e8504e0c --- /dev/null +++ b/graphics/items/icon_palettes/black_sludge.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +101 101 126 +126 126 159 +142 151 168 +61 61 77 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blastoisinite.pal b/graphics/items/icon_palettes/blastoisinite.pal new file mode 100644 index 000000000..4d8882ef5 --- /dev/null +++ b/graphics/items/icon_palettes/blastoisinite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +96 152 240 +88 112 128 +120 88 48 +184 184 184 +176 200 232 +152 136 112 +248 248 248 +64 128 240 +136 168 216 +208 208 208 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blazikenite.pal b/graphics/items/icon_palettes/blazikenite.pal new file mode 100644 index 000000000..4530ddbfd --- /dev/null +++ b/graphics/items/icon_palettes/blazikenite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +216 88 80 +128 56 56 +56 56 56 +216 200 184 +240 168 208 +192 168 168 +136 128 120 +248 248 248 +208 56 56 +208 168 136 +240 240 176 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/bug_gem.pal b/graphics/items/icon_palettes/bug_gem.pal new file mode 100644 index 000000000..4e8af4726 --- /dev/null +++ b/graphics/items/icon_palettes/bug_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +184 216 104 +224 232 176 +152 184 32 +248 248 248 +136 160 16 +112 144 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/burn_drive.pal b/graphics/items/icon_palettes/burn_drive.pal new file mode 100644 index 000000000..316e9e718 --- /dev/null +++ b/graphics/items/icon_palettes/burn_drive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +120 72 64 +248 152 136 +208 40 16 +216 88 64 +224 88 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/cameruptite.pal b/graphics/items/icon_palettes/cameruptite.pal new file mode 100644 index 000000000..1cc3270ca --- /dev/null +++ b/graphics/items/icon_palettes/cameruptite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +184 168 152 +120 96 88 +232 112 80 +200 200 200 +240 176 160 +208 136 120 +248 248 248 +72 72 64 +152 88 72 +152 144 136 +224 224 224 +128 120 112 +200 88 64 +136 80 64 diff --git a/graphics/items/icon_palettes/charizardite_x.pal b/graphics/items/icon_palettes/charizardite_x.pal new file mode 100644 index 000000000..7073c040f --- /dev/null +++ b/graphics/items/icon_palettes/charizardite_x.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +56 64 64 +72 96 168 +72 128 248 +72 184 248 +160 152 160 +176 200 248 +72 160 248 +248 248 248 +64 128 152 +136 232 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/charizardite_y.pal b/graphics/items/icon_palettes/charizardite_y.pal new file mode 100644 index 000000000..ddc55c87f --- /dev/null +++ b/graphics/items/icon_palettes/charizardite_y.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +216 40 16 +248 176 0 +248 208 0 +216 152 112 +232 200 192 +232 184 56 +248 248 248 +200 24 0 +216 96 64 +216 192 184 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/chill_drive.pal b/graphics/items/icon_palettes/chill_drive.pal new file mode 100644 index 000000000..d429ee003 --- /dev/null +++ b/graphics/items/icon_palettes/chill_drive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +32 136 144 +208 248 248 +8 184 200 +88 200 224 +96 224 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/choice_scarf.pal b/graphics/items/icon_palettes/choice_scarf.pal new file mode 100644 index 000000000..19561700f --- /dev/null +++ b/graphics/items/icon_palettes/choice_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +54 101 93 +61 69 77 +61 142 212 +69 159 238 +109 185 229 +39 101 142 +117 177 247 +85 168 212 +142 212 247 +39 39 39 +194 229 247 +46 126 177 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/choice_specs.pal b/graphics/items/icon_palettes/choice_specs.pal new file mode 100644 index 000000000..95c5ebab3 --- /dev/null +++ b/graphics/items/icon_palettes/choice_specs.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +117 117 117 +39 39 39 +229 185 54 +212 117 18 +247 238 203 +159 93 11 +247 247 77 +247 126 54 +238 185 77 +238 18 18 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/damp_rock.pal b/graphics/items/icon_palettes/damp_rock.pal new file mode 100644 index 000000000..f50603adb --- /dev/null +++ b/graphics/items/icon_palettes/damp_rock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +220 238 229 +159 220 203 +77 177 185 +54 151 159 +69 93 93 +101 142 142 +46 126 134 +77 117 117 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dark_gem.pal b/graphics/items/icon_palettes/dark_gem.pal new file mode 100644 index 000000000..1183d7db1 --- /dev/null +++ b/graphics/items/icon_palettes/dark_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +72 72 72 +120 120 120 +56 56 56 +160 160 160 +40 40 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/destiny_knot.pal b/graphics/items/icon_palettes/destiny_knot.pal new file mode 100644 index 000000000..080e8a7f0 --- /dev/null +++ b/graphics/items/icon_palettes/destiny_knot.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +194 69 69 +247 101 101 +247 85 85 +185 61 61 +134 54 54 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/diancite.pal b/graphics/items/icon_palettes/diancite.pal new file mode 100644 index 000000000..45e04c891 --- /dev/null +++ b/graphics/items/icon_palettes/diancite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +240 224 224 +208 152 80 +248 232 160 +240 192 208 +240 192 128 +248 248 248 +224 136 168 +240 184 160 +232 176 192 +232 160 184 +224 176 104 +208 112 136 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/douse_drive.pal b/graphics/items/icon_palettes/douse_drive.pal new file mode 100644 index 000000000..a3e4209f4 --- /dev/null +++ b/graphics/items/icon_palettes/douse_drive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +48 104 152 +120 208 248 +48 128 200 +56 168 240 +80 184 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/draco_plate.pal b/graphics/items/icon_palettes/draco_plate.pal new file mode 100644 index 000000000..27bfff4b2 --- /dev/null +++ b/graphics/items/icon_palettes/draco_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +173 63 63 +237 112 122 +246 138 138 +201 88 88 +130 56 63 +130 56 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dragon_gem.pal b/graphics/items/icon_palettes/dragon_gem.pal new file mode 100644 index 000000000..10fed280f --- /dev/null +++ b/graphics/items/icon_palettes/dragon_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +160 128 200 +168 184 232 +128 96 224 +216 248 216 +72 64 152 +96 56 112 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dread_plate.pal b/graphics/items/icon_palettes/dread_plate.pal new file mode 100644 index 000000000..dddd5e13a --- /dev/null +++ b/graphics/items/icon_palettes/dread_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +71 104 156 +130 165 201 +156 182 228 +104 138 173 +63 96 122 +56 71 88 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/earth_plate.pal b/graphics/items/icon_palettes/earth_plate.pal new file mode 100644 index 000000000..7b9e07525 --- /dev/null +++ b/graphics/items/icon_palettes/earth_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +156 104 71 +201 165 112 +209 182 138 +182 138 96 +138 96 63 +112 79 71 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electric_gem.pal b/graphics/items/icon_palettes/electric_gem.pal new file mode 100644 index 000000000..88de6e42a --- /dev/null +++ b/graphics/items/icon_palettes/electric_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +248 224 0 +248 248 160 +224 200 0 +248 248 248 +192 168 0 +184 160 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electric_seed.pal b/graphics/items/icon_palettes/electric_seed.pal new file mode 100644 index 000000000..5c264cdc9 --- /dev/null +++ b/graphics/items/icon_palettes/electric_seed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +213 148 65 +246 246 82 +246 222 74 +238 246 197 +156 106 16 +106 82 65 +205 139 24 +238 189 41 +106 90 74 +156 90 49 +246 222 123 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/eviolite.pal b/graphics/items/icon_palettes/eviolite.pal new file mode 100644 index 000000000..28ba1a4fc --- /dev/null +++ b/graphics/items/icon_palettes/eviolite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +88 88 88 +248 200 240 +224 176 232 +48 48 48 +240 224 248 +200 144 224 +176 120 216 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/expert_belt.pal b/graphics/items/icon_palettes/expert_belt.pal new file mode 100644 index 000000000..cfb6c6a92 --- /dev/null +++ b/graphics/items/icon_palettes/expert_belt.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +61 54 61 +117 109 117 +85 77 85 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fairy_gem.pal b/graphics/items/icon_palettes/fairy_gem.pal new file mode 100644 index 000000000..4bf316f57 --- /dev/null +++ b/graphics/items/icon_palettes/fairy_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +215 149 192 +251 230 239 +210 120 173 +255 247 255 +193 77 151 +183 49 136 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fighting_gem.pal b/graphics/items/icon_palettes/fighting_gem.pal new file mode 100644 index 000000000..324a6870c --- /dev/null +++ b/graphics/items/icon_palettes/fighting_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +184 112 120 +224 152 136 +144 72 120 +248 216 208 +120 56 88 +96 40 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fire_gem.pal b/graphics/items/icon_palettes/fire_gem.pal new file mode 100644 index 000000000..f98f9e16c --- /dev/null +++ b/graphics/items/icon_palettes/fire_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +248 144 72 +248 200 104 +240 64 48 +248 248 232 +224 72 32 +176 24 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fist_plate.pal b/graphics/items/icon_palettes/fist_plate.pal new file mode 100644 index 000000000..470a83c51 --- /dev/null +++ b/graphics/items/icon_palettes/fist_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +201 104 96 +246 156 138 +255 173 165 +228 130 96 +173 63 63 +130 56 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/flame_orb.pal b/graphics/items/icon_palettes/flame_orb.pal new file mode 100644 index 000000000..f3ee47e39 --- /dev/null +++ b/graphics/items/icon_palettes/flame_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +247 126 126 +247 46 46 +238 185 177 +247 247 247 +247 126 85 +247 194 93 +247 247 93 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/flame_plate.pal b/graphics/items/icon_palettes/flame_plate.pal new file mode 100644 index 000000000..8b68abf8f --- /dev/null +++ b/graphics/items/icon_palettes/flame_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +212 69 54 +247 117 117 +247 142 142 +247 77 77 +168 18 18 +151 5 5 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/float_stone.pal b/graphics/items/icon_palettes/float_stone.pal new file mode 100644 index 000000000..420e4adc6 --- /dev/null +++ b/graphics/items/icon_palettes/float_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +64 64 64 +224 224 208 +200 200 184 +168 168 152 +152 144 136 +136 128 112 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/flying_gem.pal b/graphics/items/icon_palettes/flying_gem.pal new file mode 100644 index 000000000..16d933434 --- /dev/null +++ b/graphics/items/icon_palettes/flying_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +184 200 248 +216 224 248 +152 168 240 +232 248 248 +104 128 192 +64 80 144 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/focus_sash.pal b/graphics/items/icon_palettes/focus_sash.pal new file mode 100644 index 000000000..08b56485e --- /dev/null +++ b/graphics/items/icon_palettes/focus_sash.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +77 77 77 +212 101 61 +247 117 117 +247 151 69 +177 39 39 +229 69 69 +247 220 69 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/galladite.pal b/graphics/items/icon_palettes/galladite.pal new file mode 100644 index 000000000..fdc71e0e2 --- /dev/null +++ b/graphics/items/icon_palettes/galladite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +104 176 160 +144 120 128 +216 96 112 +232 232 216 +208 224 224 +232 168 184 +240 200 208 +248 248 248 +88 160 144 +176 208 208 +120 176 168 +216 152 160 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/garchompite.pal b/graphics/items/icon_palettes/garchompite.pal new file mode 100644 index 000000000..79e932ef5 --- /dev/null +++ b/graphics/items/icon_palettes/garchompite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +152 56 64 +240 160 48 +248 216 56 +72 80 136 +216 136 136 +160 152 96 +248 248 248 +248 216 152 +200 32 32 +104 80 136 +80 120 224 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/gardevoirite.pal b/graphics/items/icon_palettes/gardevoirite.pal new file mode 100644 index 000000000..c71a12daf --- /dev/null +++ b/graphics/items/icon_palettes/gardevoirite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +88 192 120 +168 112 120 +192 48 104 +176 192 232 +160 224 192 +160 168 152 +184 120 168 +248 248 248 +80 184 112 +144 200 160 +208 208 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/gengarite.pal b/graphics/items/icon_palettes/gengarite.pal new file mode 100644 index 000000000..307b1a3b1 --- /dev/null +++ b/graphics/items/icon_palettes/gengarite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +96 56 200 +152 56 144 +208 56 80 +184 144 224 +192 184 248 +200 96 152 +248 248 248 +72 32 208 +144 96 208 +192 192 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ghost_gem.pal b/graphics/items/icon_palettes/ghost_gem.pal new file mode 100644 index 000000000..6068c4d2b --- /dev/null +++ b/graphics/items/icon_palettes/ghost_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +104 80 184 +104 104 216 +80 64 152 +136 136 224 +56 48 112 +32 40 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/glalitite.pal b/graphics/items/icon_palettes/glalitite.pal new file mode 100644 index 000000000..6cd95b0d8 --- /dev/null +++ b/graphics/items/icon_palettes/glalitite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +208 216 232 +104 112 112 +56 56 56 +152 200 216 +152 152 152 +128 136 144 +248 248 248 +64 152 184 +56 104 120 +136 184 208 +96 168 192 +56 96 112 +64 128 152 +0 0 0 diff --git a/graphics/items/icon_palettes/grass_gem.pal b/graphics/items/icon_palettes/grass_gem.pal new file mode 100644 index 000000000..02412f988 --- /dev/null +++ b/graphics/items/icon_palettes/grass_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +96 248 120 +184 248 176 +64 200 80 +232 248 224 +56 184 88 +0 144 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/grassy_seed.pal b/graphics/items/icon_palettes/grassy_seed.pal new file mode 100644 index 000000000..2f1acee39 --- /dev/null +++ b/graphics/items/icon_palettes/grassy_seed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +139 172 82 +197 230 90 +172 197 90 +238 246 197 +156 106 16 +65 74 24 +205 139 24 +238 189 41 +106 90 74 +106 148 82 +246 222 123 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/grip_claw.pal b/graphics/items/icon_palettes/grip_claw.pal new file mode 100644 index 000000000..ee28f992a --- /dev/null +++ b/graphics/items/icon_palettes/grip_claw.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +77 77 77 +247 247 247 +177 212 212 +117 142 142 +61 85 69 +69 101 85 +134 159 159 +101 134 109 +126 151 134 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/griseous_orb.pal b/graphics/items/icon_palettes/griseous_orb.pal new file mode 100644 index 000000000..29b8f7704 --- /dev/null +++ b/graphics/items/icon_palettes/griseous_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +123 99 33 +255 255 255 +214 189 24 +255 247 206 +247 231 140 +222 198 57 +156 132 33 +206 181 41 +173 140 24 +189 156 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ground_gem.pal b/graphics/items/icon_palettes/ground_gem.pal new file mode 100644 index 000000000..cbdd4efd6 --- /dev/null +++ b/graphics/items/icon_palettes/ground_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +184 128 56 +200 160 80 +160 104 32 +224 192 128 +112 64 16 +104 56 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/gyaradosite.pal b/graphics/items/icon_palettes/gyaradosite.pal new file mode 100644 index 000000000..f485d4ef3 --- /dev/null +++ b/graphics/items/icon_palettes/gyaradosite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +40 96 240 +152 56 112 +208 32 48 +192 144 0 +144 168 248 +248 168 168 +200 88 24 +248 248 248 +16 64 232 +120 120 120 +208 184 152 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/heat_rock.pal b/graphics/items/icon_palettes/heat_rock.pal new file mode 100644 index 000000000..c5b91232d --- /dev/null +++ b/graphics/items/icon_palettes/heat_rock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +247 203 212 +247 142 177 +212 85 117 +247 109 151 +142 109 93 +168 134 117 +220 194 185 +212 177 159 +185 61 85 +177 93 93 +101 77 69 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/heracronite.pal b/graphics/items/icon_palettes/heracronite.pal new file mode 100644 index 000000000..6877ae795 --- /dev/null +++ b/graphics/items/icon_palettes/heracronite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +80 80 112 +208 64 8 +248 80 32 +248 216 56 +168 184 184 +248 152 128 +248 152 40 +248 248 248 +32 56 96 +208 160 0 +232 248 184 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/honey.pal b/graphics/items/icon_palettes/honey.pal new file mode 100644 index 000000000..c5219f932 --- /dev/null +++ b/graphics/items/icon_palettes/honey.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +48 48 48 +120 80 32 +200 112 0 +80 152 152 +232 144 0 +96 184 192 +248 184 72 +248 240 184 +216 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/houndoominite.pal b/graphics/items/icon_palettes/houndoominite.pal new file mode 100644 index 000000000..25f151408 --- /dev/null +++ b/graphics/items/icon_palettes/houndoominite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +96 80 88 +184 40 48 +248 32 32 +136 104 112 +184 160 160 +248 144 144 +192 64 72 +248 248 248 +56 56 64 +120 88 96 +152 144 168 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ice_gem.pal b/graphics/items/icon_palettes/ice_gem.pal new file mode 100644 index 000000000..dda74d589 --- /dev/null +++ b/graphics/items/icon_palettes/ice_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +104 232 232 +168 248 248 +48 208 248 +232 248 248 +24 176 248 +0 152 200 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/icicle_plate.pal b/graphics/items/icon_palettes/icicle_plate.pal new file mode 100644 index 000000000..b1c45e523 --- /dev/null +++ b/graphics/items/icon_palettes/icicle_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +138 201 192 +209 246 255 +228 246 246 +173 237 237 +56 156 147 +63 122 104 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/icy_rock.pal b/graphics/items/icon_palettes/icy_rock.pal new file mode 100644 index 000000000..27f6fbc23 --- /dev/null +++ b/graphics/items/icon_palettes/icy_rock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +185 247 247 +126 203 238 +229 247 247 +77 177 220 +54 142 185 +117 134 168 +185 126 93 +134 93 61 +151 101 69 +229 185 159 +142 159 194 +229 168 142 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/insect_plate.pal b/graphics/items/icon_palettes/insect_plate.pal new file mode 100644 index 000000000..65f65b4bf --- /dev/null +++ b/graphics/items/icon_palettes/insect_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +173 218 104 +246 255 147 +246 246 173 +201 246 112 +130 173 26 +96 138 18 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/iron_ball.pal b/graphics/items/icon_palettes/iron_ball.pal new file mode 100644 index 000000000..4e3ff7891 --- /dev/null +++ b/graphics/items/icon_palettes/iron_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +46 77 69 +69 109 101 +54 93 85 +77 126 126 +77 177 151 +177 238 220 +247 247 247 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/iron_plate.pal b/graphics/items/icon_palettes/iron_plate.pal new file mode 100644 index 000000000..4885bc46c --- /dev/null +++ b/graphics/items/icon_palettes/iron_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +136 136 136 +208 208 208 +232 232 232 +176 176 176 +120 120 120 +104 104 104 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lagging_tail.pal b/graphics/items/icon_palettes/lagging_tail.pal new file mode 100644 index 000000000..8e2a0b1d5 --- /dev/null +++ b/graphics/items/icon_palettes/lagging_tail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +229 229 229 +203 203 203 +142 142 142 +101 101 101 +61 61 61 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/latiasite.pal b/graphics/items/icon_palettes/latiasite.pal new file mode 100644 index 000000000..f93e6a505 --- /dev/null +++ b/graphics/items/icon_palettes/latiasite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +144 128 216 +192 80 152 +248 48 56 +184 184 248 +216 120 152 +184 192 248 +248 248 248 +248 160 208 +136 96 208 +160 160 240 +240 232 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/latiosite.pal b/graphics/items/icon_palettes/latiosite.pal new file mode 100644 index 000000000..16c3521ad --- /dev/null +++ b/graphics/items/icon_palettes/latiosite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +144 128 216 +88 112 224 +40 128 240 +184 184 248 +112 160 248 +184 192 248 +248 248 248 +128 184 232 +136 96 208 +160 160 240 +240 232 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/life_orb.pal b/graphics/items/icon_palettes/life_orb.pal new file mode 100644 index 000000000..e670c6c2d --- /dev/null +++ b/graphics/items/icon_palettes/life_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +212 168 238 +220 54 220 +238 177 238 +247 247 247 +185 39 194 +247 101 101 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/light_clay.pal b/graphics/items/icon_palettes/light_clay.pal new file mode 100644 index 000000000..02a4a90fb --- /dev/null +++ b/graphics/items/icon_palettes/light_clay.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +126 177 69 +177 220 109 +93 117 54 +212 238 185 +247 247 247 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lopunnite.pal b/graphics/items/icon_palettes/lopunnite.pal new file mode 100644 index 000000000..1815667bb --- /dev/null +++ b/graphics/items/icon_palettes/lopunnite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +248 240 184 +72 56 56 +160 96 80 +248 248 248 +104 64 56 +200 168 160 +160 152 120 +160 152 152 +128 72 56 +112 80 64 +176 128 104 +200 168 136 +128 104 88 +0 0 0 diff --git a/graphics/items/icon_palettes/lucarionite.pal b/graphics/items/icon_palettes/lucarionite.pal new file mode 100644 index 000000000..22e0961a7 --- /dev/null +++ b/graphics/items/icon_palettes/lucarionite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +112 152 208 +120 88 120 +136 32 32 +248 176 96 +160 192 200 +176 120 128 +192 120 64 +248 248 248 +72 136 176 +184 192 176 +208 208 224 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lustrous_orb.pal b/graphics/items/icon_palettes/lustrous_orb.pal new file mode 100644 index 000000000..28df1d804 --- /dev/null +++ b/graphics/items/icon_palettes/lustrous_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +69 69 69 +39 39 39 +117 212 220 +203 238 238 +247 247 247 +151 212 238 +168 203 229 +134 194 229 +168 194 229 +151 185 229 +220 185 238 +247 238 238 +247 212 229 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/manectite.pal b/graphics/items/icon_palettes/manectite.pal new file mode 100644 index 000000000..860c8d0a3 --- /dev/null +++ b/graphics/items/icon_palettes/manectite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +96 168 208 +136 104 120 +224 56 56 +248 248 128 +176 200 224 +248 152 128 +224 152 72 +248 248 248 +72 152 192 +192 200 136 +240 240 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mawilite.pal b/graphics/items/icon_palettes/mawilite.pal new file mode 100644 index 000000000..688d41649 --- /dev/null +++ b/graphics/items/icon_palettes/mawilite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +112 96 112 +200 184 112 +200 120 168 +192 192 192 +248 248 96 +224 184 136 +248 248 248 +224 216 120 +64 64 80 +152 104 136 +176 176 208 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/meadow_plate.pal b/graphics/items/icon_palettes/meadow_plate.pal new file mode 100644 index 000000000..2d97a8619 --- /dev/null +++ b/graphics/items/icon_palettes/meadow_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +56 192 63 +138 237 130 +173 255 147 +104 228 88 +63 138 63 +63 112 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/medichamite.pal b/graphics/items/icon_palettes/medichamite.pal new file mode 100644 index 000000000..f8b973bc3 --- /dev/null +++ b/graphics/items/icon_palettes/medichamite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +192 88 136 +224 96 80 +248 136 56 +120 176 208 +248 168 168 +184 160 136 +248 248 248 +192 32 104 +160 136 176 +176 200 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mega_bracelet.pal b/graphics/items/icon_palettes/mega_bracelet.pal new file mode 100644 index 000000000..8f34e18a1 --- /dev/null +++ b/graphics/items/icon_palettes/mega_bracelet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +144 160 176 +88 112 128 +200 216 216 +64 80 96 +240 240 240 +176 72 152 +208 112 216 +32 112 24 +88 192 224 +96 200 80 +72 88 192 +184 200 80 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/metagrossite.pal b/graphics/items/icon_palettes/metagrossite.pal new file mode 100644 index 000000000..d7115db59 --- /dev/null +++ b/graphics/items/icon_palettes/metagrossite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +160 168 144 +152 192 216 +200 200 200 +232 200 168 +232 232 232 +160 192 208 +128 184 208 +248 248 248 +216 152 80 +216 184 136 +160 160 144 +208 216 232 +176 160 128 +176 176 184 diff --git a/graphics/items/icon_palettes/metronome.pal b/graphics/items/icon_palettes/metronome.pal new file mode 100644 index 000000000..0294d8b6c --- /dev/null +++ b/graphics/items/icon_palettes/metronome.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +39 69 85 +159 203 229 +109 177 220 +77 142 168 +54 93 61 +77 126 93 +177 229 229 +247 247 247 +126 185 220 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mewtwonite_x.pal b/graphics/items/icon_palettes/mewtwonite_x.pal new file mode 100644 index 000000000..f1db0ba0c --- /dev/null +++ b/graphics/items/icon_palettes/mewtwonite_x.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +152 80 128 +88 80 120 +48 112 136 +192 192 192 +216 176 216 +160 184 192 +120 152 168 +248 248 248 +128 56 104 +216 216 224 +192 160 184 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mewtwonite_y.pal b/graphics/items/icon_palettes/mewtwonite_y.pal new file mode 100644 index 000000000..c69324883 --- /dev/null +++ b/graphics/items/icon_palettes/mewtwonite_y.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +152 80 128 +160 80 136 +184 112 168 +192 192 192 +216 176 216 +192 152 184 +248 248 248 +128 56 104 +216 216 224 +192 160 184 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mind_plate.pal b/graphics/items/icon_palettes/mind_plate.pal new file mode 100644 index 000000000..583a524b6 --- /dev/null +++ b/graphics/items/icon_palettes/mind_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +209 122 138 +246 209 209 +246 237 228 +255 173 165 +201 104 96 +201 88 88 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/misty_seed.pal b/graphics/items/icon_palettes/misty_seed.pal new file mode 100644 index 000000000..8957472cf --- /dev/null +++ b/graphics/items/icon_palettes/misty_seed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +98 123 189 +205 230 255 +139 189 255 +238 246 197 +156 106 16 +65 74 115 +205 139 24 +238 189 41 +106 90 74 +82 82 156 +246 222 123 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/muscle_band.pal b/graphics/items/icon_palettes/muscle_band.pal new file mode 100644 index 000000000..e93f6f6dd --- /dev/null +++ b/graphics/items/icon_palettes/muscle_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +168 142 32 +247 247 151 +229 203 39 +126 109 61 +56 56 56 +247 109 109 +203 177 18 +203 93 18 +203 25 25 +238 54 54 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/normal_gem.pal b/graphics/items/icon_palettes/normal_gem.pal new file mode 100644 index 000000000..8cd17447e --- /dev/null +++ b/graphics/items/icon_palettes/normal_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +224 184 184 +240 208 208 +192 176 176 +248 248 248 +168 160 160 +144 144 144 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pidgeotite.pal b/graphics/items/icon_palettes/pidgeotite.pal new file mode 100644 index 000000000..5f81a5b2c --- /dev/null +++ b/graphics/items/icon_palettes/pidgeotite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +240 144 72 +192 120 152 +216 64 112 +240 192 128 +232 152 144 +224 104 88 +248 248 248 +240 232 120 +232 152 112 +240 192 96 +248 216 192 +240 168 80 +168 128 152 +240 184 88 diff --git a/graphics/items/icon_palettes/pinsirite.pal b/graphics/items/icon_palettes/pinsirite.pal new file mode 100644 index 000000000..0a0fb5fbe --- /dev/null +++ b/graphics/items/icon_palettes/pinsirite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +152 120 112 +192 104 56 +248 80 32 +248 208 56 +200 176 152 +248 144 40 +248 248 248 +248 192 152 +128 96 88 +200 168 80 +248 248 224 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pixie_plate.pal b/graphics/items/icon_palettes/pixie_plate.pal new file mode 100644 index 000000000..b7559b575 --- /dev/null +++ b/graphics/items/icon_palettes/pixie_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +240 176 200 +248 208 248 +248 224 248 +248 192 224 +208 144 200 +192 112 160 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poison_gem.pal b/graphics/items/icon_palettes/poison_gem.pal new file mode 100644 index 000000000..da63d2f24 --- /dev/null +++ b/graphics/items/icon_palettes/poison_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +152 104 168 +192 176 200 +104 96 136 +232 248 224 +56 104 104 +40 72 72 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_herb.pal b/graphics/items/icon_palettes/power_herb.pal new file mode 100644 index 000000000..09501f481 --- /dev/null +++ b/graphics/items/icon_palettes/power_herb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +151 69 69 +39 39 39 +229 109 109 +229 46 46 +168 39 39 +212 61 61 +194 61 61 +177 77 77 +238 93 93 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/protective_pads.pal b/graphics/items/icon_palettes/protective_pads.pal new file mode 100644 index 000000000..604b7b85a --- /dev/null +++ b/graphics/items/icon_palettes/protective_pads.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +205 222 238 +172 189 213 +131 156 180 +98 106 164 +106 123 131 +148 156 164 +255 255 255 +213 213 205 +172 180 180 +74 82 90 +131 148 197 +74 90 148 +98 98 123 +156 172 205 diff --git a/graphics/items/icon_palettes/psychic_gem.pal b/graphics/items/icon_palettes/psychic_gem.pal new file mode 100644 index 000000000..c9f2839e6 --- /dev/null +++ b/graphics/items/icon_palettes/psychic_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +248 104 176 +248 160 192 +208 56 136 +248 216 208 +160 32 136 +112 0 104 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/psychic_seed.pal b/graphics/items/icon_palettes/psychic_seed.pal new file mode 100644 index 000000000..0fd91e0da --- /dev/null +++ b/graphics/items/icon_palettes/psychic_seed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +172 98 189 +255 205 255 +197 139 197 +238 246 197 +156 106 16 +65 74 24 +205 139 24 +238 189 41 +106 90 74 +115 65 123 +246 222 123 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/quick_powder.pal b/graphics/items/icon_palettes/quick_powder.pal new file mode 100644 index 000000000..39410ad52 --- /dev/null +++ b/graphics/items/icon_palettes/quick_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +156 156 156 +214 214 214 +255 255 255 +239 239 239 +90 90 90 +181 214 255 +123 189 239 +74 107 173 +115 156 206 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rock_gem.pal b/graphics/items/icon_palettes/rock_gem.pal new file mode 100644 index 000000000..382101766 --- /dev/null +++ b/graphics/items/icon_palettes/rock_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +184 144 120 +216 200 176 +136 112 88 +232 224 200 +112 88 72 +80 64 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sablenite.pal b/graphics/items/icon_palettes/sablenite.pal new file mode 100644 index 000000000..e270a912a --- /dev/null +++ b/graphics/items/icon_palettes/sablenite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +224 40 88 +168 64 120 +120 88 152 +248 216 120 +184 168 200 +168 136 144 +240 144 168 +248 248 248 +240 144 104 +240 232 240 +232 104 96 +232 104 136 +192 80 152 +0 0 0 diff --git a/graphics/items/icon_palettes/safety_goggles.png b/graphics/items/icon_palettes/safety_goggles.png new file mode 100644 index 0000000000000000000000000000000000000000..7a1efab67adffd72893d7ab8383ab500014ac898 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xu?EJb+&fI^cfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0=j-CMiXDcR}&wQFMZL`gH zTyQQ}$I+*H{O!E5BC8#H8k}CONhoK1x%tPGW3T3J{^$L#-{D8nnfs1MvR?I_5NC3E zF1WV7boW!a(n;%bd_*EvuH)IFdD5~VH7j3X+3DDo@{XHKdS){z9j|#2CTx?}eemVh zNTt@-eb%j(iQ1L&6|pP{nnhV`|HC#5oxFHlL}%rl4Bq?fb!UYg?Ui`$+~0f> KKbLh*2~7ZYQHg>8 literal 0 HcmV?d00001 diff --git a/graphics/items/icon_palettes/salamencite.pal b/graphics/items/icon_palettes/salamencite.pal new file mode 100644 index 000000000..315807ba5 --- /dev/null +++ b/graphics/items/icon_palettes/salamencite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +192 192 192 +16 112 152 +8 144 184 +240 168 168 +128 192 216 +96 168 192 +248 248 248 +224 88 88 +120 112 136 +200 168 168 +232 232 232 +208 136 136 +24 112 136 +176 72 72 diff --git a/graphics/items/icon_palettes/sceptilite.pal b/graphics/items/icon_palettes/sceptilite.pal new file mode 100644 index 000000000..579e9c419 --- /dev/null +++ b/graphics/items/icon_palettes/sceptilite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +80 96 80 +184 40 48 +248 32 32 +128 160 104 +168 192 160 +248 160 152 +192 96 64 +248 248 248 +64 64 64 +96 120 88 +192 208 120 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/scizorite.pal b/graphics/items/icon_palettes/scizorite.pal new file mode 100644 index 000000000..abcba6719 --- /dev/null +++ b/graphics/items/icon_palettes/scizorite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +168 80 104 +104 32 24 +56 56 56 +168 216 224 +200 160 168 +144 144 144 +112 136 144 +248 248 248 +152 8 0 +168 144 168 +248 248 224 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sharpedonite.pal b/graphics/items/icon_palettes/sharpedonite.pal new file mode 100644 index 000000000..ac7dd92e8 --- /dev/null +++ b/graphics/items/icon_palettes/sharpedonite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +200 200 224 +208 168 72 +248 216 120 +160 192 216 +248 232 184 +224 208 176 +248 248 248 +32 112 168 +144 168 144 +144 168 208 +232 232 240 +112 160 200 +208 192 136 +136 168 200 diff --git a/graphics/items/icon_palettes/shed_shell.pal b/graphics/items/icon_palettes/shed_shell.pal new file mode 100644 index 000000000..6fb36dd9d --- /dev/null +++ b/graphics/items/icon_palettes/shed_shell.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +229 238 101 +247 247 247 +220 194 109 +159 142 46 +185 168 69 +203 177 61 +117 117 85 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/shock_drive.pal b/graphics/items/icon_palettes/shock_drive.pal new file mode 100644 index 000000000..1d7d83eb5 --- /dev/null +++ b/graphics/items/icon_palettes/shock_drive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +144 104 32 +248 216 0 +216 128 16 +248 144 16 +248 168 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sky_plate.pal b/graphics/items/icon_palettes/sky_plate.pal new file mode 100644 index 000000000..3c7b1e3f0 --- /dev/null +++ b/graphics/items/icon_palettes/sky_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +26 165 218 +88 209 237 +112 246 255 +63 192 255 +26 130 173 +33 104 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/slowbronite.pal b/graphics/items/icon_palettes/slowbronite.pal new file mode 100644 index 000000000..41785ae70 --- /dev/null +++ b/graphics/items/icon_palettes/slowbronite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +184 200 184 +224 184 80 +240 232 128 +248 184 192 +240 240 184 +216 216 152 +248 248 248 +240 128 136 +240 176 128 +200 176 168 +224 232 232 +224 152 152 +216 192 128 +216 96 104 diff --git a/graphics/items/icon_palettes/smooth_rock.pal b/graphics/items/icon_palettes/smooth_rock.pal new file mode 100644 index 000000000..ccb7076fa --- /dev/null +++ b/graphics/items/icon_palettes/smooth_rock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +247 229 134 +247 247 220 +238 212 85 +203 142 54 +212 168 11 +185 126 93 +229 168 142 +142 93 69 +117 77 54 +229 185 159 +168 134 25 +212 151 46 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/splash_plate.pal b/graphics/items/icon_palettes/splash_plate.pal new file mode 100644 index 000000000..cc529d345 --- /dev/null +++ b/graphics/items/icon_palettes/splash_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +56 96 201 +122 173 255 +147 192 255 +96 138 255 +33 63 138 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/spooky_plate.pal b/graphics/items/icon_palettes/spooky_plate.pal new file mode 100644 index 000000000..fffede5bc --- /dev/null +++ b/graphics/items/icon_palettes/spooky_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +112 122 138 +165 173 182 +192 192 209 +138 130 165 +104 104 104 +88 88 88 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/steel_gem.pal b/graphics/items/icon_palettes/steel_gem.pal new file mode 100644 index 000000000..bd0386534 --- /dev/null +++ b/graphics/items/icon_palettes/steel_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +136 136 152 +184 184 200 +96 96 96 +232 232 248 +88 88 88 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/steelixite.pal b/graphics/items/icon_palettes/steelixite.pal new file mode 100644 index 000000000..f0b9626fc --- /dev/null +++ b/graphics/items/icon_palettes/steelixite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +144 152 176 +160 168 192 +200 232 240 +128 200 240 +176 192 208 +248 248 248 +8 152 224 +104 192 232 +112 152 192 +200 208 216 +72 152 200 +176 200 216 +152 192 216 +0 0 0 diff --git a/graphics/items/icon_palettes/sticky_barb.pal b/graphics/items/icon_palettes/sticky_barb.pal new file mode 100644 index 000000000..a179f618f --- /dev/null +++ b/graphics/items/icon_palettes/sticky_barb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +185 229 229 +109 177 194 +77 126 142 +238 247 247 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/stone_plate.pal b/graphics/items/icon_palettes/stone_plate.pal new file mode 100644 index 000000000..c67cde98d --- /dev/null +++ b/graphics/items/icon_palettes/stone_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +173 156 130 +228 218 173 +237 237 192 +209 182 138 +156 130 63 +138 96 63 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/swampertite.pal b/graphics/items/icon_palettes/swampertite.pal new file mode 100644 index 000000000..a35c06e7e --- /dev/null +++ b/graphics/items/icon_palettes/swampertite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +232 104 88 +96 128 144 +72 80 88 +112 176 216 +232 168 160 +176 208 224 +104 144 168 +248 248 248 +168 104 104 +176 144 152 +136 160 192 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/terrain_extender.pal b/graphics/items/icon_palettes/terrain_extender.pal new file mode 100644 index 000000000..2ae8d133e --- /dev/null +++ b/graphics/items/icon_palettes/terrain_extender.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +49 49 49 +180 197 197 +123 139 139 +74 82 82 +255 255 255 +213 230 230 +49 106 106 +74 148 164 +131 213 213 +222 123 106 +222 65 41 +172 57 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/toxic_orb.pal b/graphics/items/icon_palettes/toxic_orb.pal new file mode 100644 index 000000000..c4ddda687 --- /dev/null +++ b/graphics/items/icon_palettes/toxic_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +168 142 247 +185 85 229 +212 101 238 +159 69 212 +142 61 212 +229 177 238 +247 247 247 +117 54 212 +101 32 212 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/toxic_plate.pal b/graphics/items/icon_palettes/toxic_plate.pal new file mode 100644 index 000000000..733aae9c7 --- /dev/null +++ b/graphics/items/icon_palettes/toxic_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +182 88 228 +209 156 237 +246 173 246 +192 122 255 +147 79 201 +112 56 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tyranitarite.pal b/graphics/items/icon_palettes/tyranitarite.pal new file mode 100644 index 000000000..579e9c419 --- /dev/null +++ b/graphics/items/icon_palettes/tyranitarite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +80 96 80 +184 40 48 +248 32 32 +128 160 104 +168 192 160 +248 160 152 +192 96 64 +248 248 248 +64 64 64 +96 120 88 +192 208 120 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/venusaurite.pal b/graphics/items/icon_palettes/venusaurite.pal new file mode 100644 index 000000000..3aadc1092 --- /dev/null +++ b/graphics/items/icon_palettes/venusaurite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +48 48 48 +24 128 128 +184 72 136 +248 80 192 +96 168 200 +152 192 168 +176 152 184 +176 128 200 +248 248 248 +16 104 72 +40 144 184 +120 216 216 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/water_gem.pal b/graphics/items/icon_palettes/water_gem.pal new file mode 100644 index 000000000..586db9a6e --- /dev/null +++ b/graphics/items/icon_palettes/water_gem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +32 32 32 +64 160 248 +120 200 248 +48 144 248 +208 248 248 +0 120 208 +0 80 200 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wide_lens.pal b/graphics/items/icon_palettes/wide_lens.pal new file mode 100644 index 000000000..cedef34fa --- /dev/null +++ b/graphics/items/icon_palettes/wide_lens.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +220 151 101 +212 101 39 +117 39 18 +247 247 247 +85 85 85 +11 126 151 +18 194 247 +151 151 151 +168 54 25 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wise_glasses.pal b/graphics/items/icon_palettes/wise_glasses.pal new file mode 100644 index 000000000..1d03864d7 --- /dev/null +++ b/graphics/items/icon_palettes/wise_glasses.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +61 54 61 +39 39 39 +85 77 85 +247 247 247 +85 134 134 +159 247 247 +126 194 194 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/zap_plate.pal b/graphics/items/icon_palettes/zap_plate.pal new file mode 100644 index 000000000..074a89879 --- /dev/null +++ b/graphics/items/icon_palettes/zap_plate.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +40 40 40 +237 156 63 +246 218 112 +246 228 130 +255 192 88 +173 112 40 +130 96 33 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/zoom_lens.pal b/graphics/items/icon_palettes/zoom_lens.pal new file mode 100644 index 000000000..ff950851c --- /dev/null +++ b/graphics/items/icon_palettes/zoom_lens.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +39 39 39 +238 220 126 +185 177 46 +85 85 46 +203 61 61 +134 32 32 +142 134 77 +101 185 247 +247 247 247 +229 126 126 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icons/abomasite.png b/graphics/items/icons/abomasite.png new file mode 100644 index 0000000000000000000000000000000000000000..4442f21029c3f7a3eb3b05a0b8f488340aa890e5 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*Z&L+1_lNl3ts&A@x!2_ zV#0+TCvIE_STJG2g$)NTe8^aF0H_cd%#LMP2ILEr1o;Is{6_@`0=k`na-0Pok;M!Q zd`Cc-ajG_-G*B?b)5S4FVrp{20xkg&m!#?J2P=D|)=u+c3g`>iJoBT9tHtq4H-t_l zhJ4B}G;3Rx98y%sX=c_`IBmy{Lza%O^z@D`3wYep5OlIJ;IhlqE3uanWR3->eh-WMz*q+lin>#G7cUidHZ06Eyx)z4*}Q$iB}1-50} literal 0 HcmV?d00001 diff --git a/graphics/items/icons/absolite.png b/graphics/items/icons/absolite.png new file mode 100644 index 0000000000000000000000000000000000000000..786aab073225147f5a5ff59dc5f810b27c623796 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pTV1_lus3ubJ1@#Dvj2@5WqxbeZkqoZNMfde-_yooS>0946X666=m;PC858jzFd z>Eak7aXC3*0hfS?OOm$r;mV$6ih0MF0{RL%W_xc^6gtj(D$zubx4f`%RkDemetuzL zTj8zK+7ITObbI<#Z(hLTmc}4m;f2dQrKG2BKWNco+}oYTbzrV>u(QB!XH7Ec0 U^QIsD4YZ8G)78&qol`;+0B1>2zW@LL literal 0 HcmV?d00001 diff --git a/graphics/items/icons/adamant_orb.png b/graphics/items/icons/adamant_orb.png new file mode 100644 index 0000000000000000000000000000000000000000..5e4f6b2995ea9b0d796ea1f183203b7ccc972b56 GIT binary patch literal 321 zcmV-H0lxl;P)&B_#j=00DGT zPE!Ct=GbNc006;BL_t&-83nM-RimDYiqv#*j#JZ1EIawKc9SL12>oJFvLr+v*M|O9 zQp-Mx_{o*ru_hj;eTp2$Ep1H|DeGW={irl;qG;7sicb+!STOp;xgNIfik=48!T__x$`$g=zoC008h0(%C~g TqLtZc00000NkvXXu0mjfa{h|H literal 0 HcmV?d00001 diff --git a/graphics/items/icons/adrenaline_orb.png b/graphics/items/icons/adrenaline_orb.png new file mode 100644 index 0000000000000000000000000000000000000000..913366e1184cec9101f14d1cd1b73570b8ff35af GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pU=hK8Ds#ZhbSSw>CCI{L2q*|(r6dxMIXSZ1yHeWT?+P$gqYkY6x^!?PP{Ku(LN zi(`ny<>Ukf29^nyJrV%$su})q-&@jQ85wG6Xs$Q=rfoh8^ig`U=|x=qve$sMWLag zsb4z<#5<-pGh8X`x!m}svmpHZ981BI{7p;}2bmaZCM%{~n#b%1bPt24tDnm{r-UW| DN_5e^Lt0$yC$@#4pi9~A{13l^+c(eMGN90HV_U7dg|fs!D<;QtK&QNYEbXgQ!9 zXMsm#F#`kN5fEmas?8@26io7TaSV}|nw+qJOF+aWY5L5Al|53k*G^$sAhYn?&12mn z6D`65_!duc@7`z_BD;7}xA&%vf<47Yj`E)43@R@)G;5VoXPM&FHdAfYl6RBDI5wMv noU|29(`-)2klgfm!i_0F%i09r*BoNH4|1rdtDnm{r-UW|x8Y-6 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/aggronite.png b/graphics/items/icons/aggronite.png new file mode 100644 index 0000000000000000000000000000000000000000..db5dab16fb579217673407709a109129e7a82f50 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_lcjEU2ich=_=|aN);=3l~nDI5A_!iXT6I%$PCbz<~oVUc4}S6aEgUg|Q^a zFPOpM*^M+HC&|;rF+}2Wa>4>G0TGuZZR^98J&CGv3z-7?GM<%8zviIQ$3Eq-#4erF zM_E_(8J1kt5*81aNWZ@7Xu-LQ3qn`N)GRpG$+XlbVcE$RwzWof9Gk!Ryik&6+);c^ fgFC5QLzRKyvaBR~i{&I~pluAEu6{1-oD!MNS%G|&0G|-o z{|pTV1_mE?L~N*-F(G2bfeSZoTsU!I!HE?!4*dA>%lD75X%AQ13xrIyteHqV6reAYV>0_UASYnsX>7%Tx z`V331Y6**nOQc_4b+q8zl?9=zV{8^4>ttH$ld#OQjcu*bJdVvJX)lz#8Fv(?X>li& cYp60X)F?<;q|}-?0c~UOboFyt=akR{027E*Bme*a literal 0 HcmV?d00001 diff --git a/graphics/items/icons/altarianite.png b/graphics/items/icons/altarianite.png new file mode 100644 index 0000000000000000000000000000000000000000..ca88b000290569e65a0458d3e66eb60f683600af GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}T0G|-o z{|pTV1_m!y-00ZxA>+c22{(T1c<|xJj~@?!;J}RsJ8rNDEOG-XW-JNv3ubV5b|VeQ zN$_-W43W5;oUnjPK*S|U+xl>2&nm@pUQ7Xf0aYuzCn^aYmpqjil6AVEuyIv#$g39| zg@sLpX(d|@S^7rF%Ie7lJZ@NS%G}@0G|-o z{|pTV1_m!qSp2BSc;OIm;KYj`4`%$>FyltYf*(JAd^o{y<3z=c8#h`PGpqq>VJr#q z3ubV5b|VeQN%C}Y43W5;oUnjPK*S|U+xl>2PvT3tg-ii`8P80nUvp6DW1n(ZVwcY8 zqpYj?3`?$R35$nIq+efkwBX#u1)-~BY8D*pWLoNzuFVdQ&MBb@0PnF{@Bjb+ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/assault_vest.png b/graphics/items/icons/assault_vest.png new file mode 100644 index 0000000000000000000000000000000000000000..c42928b8bf0680ab74e147e93555e6d1ac80b9aa GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}f0G|-o z{|pTV1_mbr0wx$(I5;>Ycm!;)aA^LtjuWVWu_VYZn8D%MjWi&q#nZ(xMB;MqnLw_? z3OsBNDwvIL-ka@kfAs|BE#KHaGps)RTRzcH?3;lE@1!Tp{~2O*+JDHJC&}swR5HA^ zepIU(w!@`bGxh1x|8+}ZP8AF12UcnKWzJDPSGl;+VYA7`J!x#u;#&>}?0ve_%Ujp4 vO=4%(Z~g<<6!mwrMTq-6U-#*6>^lBl73q}=R=dv!x`)Bj)z4*}Q$iB}teRQ- literal 0 HcmV?d00001 diff --git a/graphics/items/icons/audinite.png b/graphics/items/icons/audinite.png new file mode 100644 index 0000000000000000000000000000000000000000..71aaf06af6efee6b73e6cf38f392f17bf8bc1bfb GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}r0G|-o z{|pTV1_nPqT-cFO@gk$+$BhRcHXQhH;KYXq7k>Qs@!`ad7bgxp*svNypz@Va!EmG=SQ+6>K`x=?Jy?o~~W2v$8 m*F3HRbB#Z*RVZr@Vq#FgCsw$pe19&`G6qjqKbLh*2~7aDvtxh& literal 0 HcmV?d00001 diff --git a/graphics/items/icons/banettite.png b/graphics/items/icons/banettite.png new file mode 100644 index 0000000000000000000000000000000000000000..7b3565ba6b9f31a0adb6d242ddd7b2f61d0f5577 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_l8E0XJrF{5T=;VZw?3|NpCjxCl+w**s-G_L*d7dA2$v({CLnYp+X}fBB7$91E{H3UP%Z@36uo+1^;LGj{+_h zMau!@I14-?iy0XBj({-ZRBb+KpkT76i(`ny)Z~N(Tmm94N!bwxDtlhdUORUh?`;QVy4?ABVNS%G|m0G|-o{|pW4>gsjA+$&1;?i?yTJ>B>Fo#`M=IDqe`^{zlE#w2fd zm;X!IKOF^eN`m}?862M7NCR@VdAc};RLn`8uu<@^0*`B;8bj+2vm4Llrtk{9OHOE- z@Hd>}!RehHtN!<`*H=;e$Hk)YCo_bb{pQk^sU5{-vU#%}Pqu8^Is1{HWxi_Z{odyF zb21wGmh8Mx^hIv(&P@GzZU<%=Jby5a?*QX{)5uxT{O|OGl^-g(Z!%sebc-?P%yNNQ z9~)b=)ask;E?j$XaTOn*T+NP;Oy!!(%-Gx<+8sV~Djb>S*=6kLkh^Z%4+h!2d(JJ? btGy~NQ7ymWo{-cokheWu{an^LB{Ts5u@;T| literal 0 HcmV?d00001 diff --git a/graphics/items/icons/binding_band.png b/graphics/items/icons/binding_band.png new file mode 100644 index 0000000000000000000000000000000000000000..9930640ef1f5f4004558b4faea9be7cc7a9781dd GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G~10G|-o z{|pTV1_m<{6m~RdoR|@?OlxilP>Qi6$S;_|;n|HeAScJu#W6%8d}`lC!2=2$&WX&9 z;uFdk&vWib{y%foiZ9#GhR-|5aKK)1>GjQ97{qq^wFFrmdKI;Vst0E84yVE_OC literal 0 HcmV?d00001 diff --git a/graphics/items/icons/black_sludge.png b/graphics/items/icons/black_sludge.png new file mode 100644 index 0000000000000000000000000000000000000000..2e1fac755f6e1ebd387828cdb667b0172769013b GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3LaX4w*#fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0w`{lmz(&GdMiEkp|>6d%8G=RLq&%f06gF0*}jKHkOslM~*NbaTn9@NqF@)Tyw&r zXPaNu{ye#F^Io0$Q){QTCL;09j{R`U~VKX=Hba4r&Ob=6vQ%QzNS%G|&0G|-o z{|pTV1_lW;K138WR74o;*s){7i5D|E3V!_f;n47*W5taN7cTH`o34>G0TGuZZR^98J&Bs{7BU6&Ww_1u&QuUOE_*7GXYRC@kC;M_ zOIQ^z>+II<*NS%G}@0G|-o z{|pTV1_n1G0vaqp;Kqp^A68sAuwq3=L&c9DKQ35UTv*ZZ;lqYE+D=D-S{O@${DK)A zp4~_Ta*{k<977~7Cnqf65)g4o(zZTa*^{U$w~#5IFXLIs^lJ_(ee6>XOYG7)eUx=o zpJB;WEn)F+iS+BMjuxD|xFB?OOwEF0olHx85|*88VOwit$Fcc~&kH4K#vR4yG`N$> cHB=cGF3U=?w^&Y+2HM8p>FVdQ&MBb@0D0_FvH$=8 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/bug_gem.png b/graphics/items/icons/bug_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..0561d24d06f9617454c8abcf9c8cf48502a8f4ef GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutl~my^Ivgp1qz9m zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pTZ3JN=JWITAWVa5)HA3uI{ED$J|0MdpP?A%*c0hC}& z@^*Lmzm)ycQ4psj$S;_|;n|HeAg999#WAE}PIAHmrUVfdCPoc+kDE7ccnE4Grtq+w z6VOad7FP%`WAT=dW@VmgDc!t8Vs5B&Z|~F)p93I4yYdu7{8c6T`w+LKiEvy7EEJ N_H^}gS?83{1ONyPWs?8^ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/burn_drive.png b/graphics/items/icons/burn_drive.png new file mode 100644 index 0000000000000000000000000000000000000000..c83fbd335896fb69b0d5bec7e57d911034dbdc17 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGUB{?K2rPk0ENU$ zTq8- CnQR*X literal 0 HcmV?d00001 diff --git a/graphics/items/icons/cameruptite.png b/graphics/items/icons/cameruptite.png new file mode 100644 index 0000000000000000000000000000000000000000..f064b6da2eb4916d0b568f93fead1392a4a4e558 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|m0G|-o z{|pTV1_nD;%&16+cu^2=;>3v$8x~yXsQB^Yhlhv5j0lez6FMF|c+gN$a3aE?Bfvpg zJzN>6m$4+sFPOpM*^M+HC&|;rF+}2Wa>4>G0TGuZZR^98J*za|c`*g_1-Q)io~R^r zT=rCA$SkRskC;M_uP`ZoCM2#dk^cNlWWhPbyEBbrYZe^iWL!G$fY0Q>OLKp|Q#f#c%3b=;;7@s&p_K4JYD@<);T3K0RZJ%TpIuY literal 0 HcmV?d00001 diff --git a/graphics/items/icons/charizardite_x.png b/graphics/items/icons/charizardite_x.png new file mode 100644 index 0000000000000000000000000000000000000000..a2986c638f52f6e870fc594c33f329a4bf004cbd GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|&0G|-o z{|pTV1_l-m4ju_BJQ{v@?D(-@#)1teet0bS0R#>WGdf=U=vC^<0;*>$3GxeOaCmkj z4aiCKba4!kxSX7@fJ;EcB}v=*aAi-Ts@y`RfWC}pCDX4tsPwTUCDtHQZgnAL0M0iVfyyh0}TI5wA*ub8lv;g03*sjM5VrwB1H XM3)P#aFaL!@&JRUtDnm{r-UW|^At{; literal 0 HcmV?d00001 diff --git a/graphics/items/icons/charizardite_y.png b/graphics/items/icons/charizardite_y.png new file mode 100644 index 0000000000000000000000000000000000000000..f193100ed65ad9482efa57a97d2c8e63c96af687 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|&0G|-o z{|pTV1_n1Y1b%E__;G>Z#*Bg&Cl0*WVe#X~j}sCMHxe9f9N1wXXZ8xHp0OmzFPOpM z*^M+HC&|;rF+}2Wa>4>G0TGuZZR^98J&Bs{7BU6&Ww_1u&QuUOE_*7GXYRC@kC;M_ zOIQ^z>+II<*3f52R}fXaDe?YH#h*L7?Zr+ zUH&g+|8x|@DGBlmW^j0RBMr#O^>lFzshG3&+(F(31s;dM8xB(p9Bwx3Vw81M*Vy!* zV_QPY>Q39e^M!(v>m*;R9e>kS$o^f5v1(;1^V_G>KD5j*dUkZi0e0pWVT%nOsV);c za#m`eK%r3fjj1cb3jf~@*6lAqd+3TQeOJD#tE(S+ z`dzPXBghyqNOArl0%R~IdAqy(U&{XJD2P)Me#DIX)%mUe2>P9foHse9QB^Lkhzgyi?jFmd|A4(r56V!X~{e+%Jr!aK@$B z*+;ikw@EgtE~_v}%P+T0V||p;7SR!!Z|K|0wDJ>=nfLm6IbvK!kxRGSG}u#A)MXrC zKY6$N>>J-sZBRby!1s7n=xUek)z5Z_H?K`hICJlv*sf}&BbhPRqIJ^W_cRqWuuY%7 zJHpYTd-e9|yDgmWoS6}~xBA(cfR4JAFQ+<~g`7U6si$|WEudL9UFz@+o*;*4ajt|m ZL55kG4!R#Dery5-f~TvW%Q~loCIC}|qm}>w literal 0 HcmV?d00001 diff --git a/graphics/items/icons/choice_specs.png b/graphics/items/icons/choice_specs.png new file mode 100644 index 0000000000000000000000000000000000000000..6c64cb26e4aa3bd5210fa0e2b4a9c95955587586 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3K1nRyd#1BJv( zTq8xqbooW}w~{gN6AXB_etU0@|DF+*t?yP*cd(v~h!35nIytPNRLYH)~ZGo`MY z#=d&mbS+VBBL>T1;TfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0vB2xF4ByUYKj?4OQ;I3+=T!3+-1ZlnP@M?75|Ln`LPUO33ttiZz%@RK=kKg0e6 z5&Hu@KDK%nkKDcb^6rVsPKkHXXa3v{ED^7Mv~m#OJ}Q}+#juJOt@NGkToT{Ca++}LY)`Ws8&?PV&4mr8ms-Dp!$o%(gp%PWds ySL`_@Yr(NJ>G)Az(X8(;Yn_UGs&pRhSt_sc*(ma^*7oTjzk9m+xvXI4yYdu7{8c6GPi;fl9F+^T!~Ed%F6$ JtaD0e0ssy@T$2C* literal 0 HcmV?d00001 diff --git a/graphics/items/icons/destiny_knot.png b/graphics/items/icons/destiny_knot.png new file mode 100644 index 0000000000000000000000000000000000000000..ceeb38d5c782078a29da3a981d44577c7e81acde GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3J6ox3ZK0)@m& zTq8pNXh-*zQy!e<(jwecJsgQRyg9sTP6Q!OBm;cc7ek64o6$JXzt1QIL~5r zzQVE2KoJ?SL;m|3W?Wm<>X_M@^2`yV@f&A#{>gTe~ HDWM4f$Bl^Y literal 0 HcmV?d00001 diff --git a/graphics/items/icons/diancite.png b/graphics/items/icons/diancite.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb89f3eddd3a0434439ea8d0e5fb6ad9da619ab GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}50G|-o z{|pTV1_mDGGj~@>@R(#m8;KhamFBa^0up#3@L5JS@lM{iu z7)yfuf*Bm1-ADs+5&8&@TVym~R?(Ib|}YhJu)Del^0Z54B8;W19erF{o{gu^ervk2zcyd`Gk_Z3QDe%e64o;O+&Wzf|4u9cSvkl26BXG6o+N{c`SJW*o@1p00i_>zopr0O06t A>Hq)$ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/draco_plate.png b/graphics/items/icons/draco_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..9b08c31c8df7bbd046af83623c1f118db34a6118 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3Ls%=b2E0)@m& zTq8~0qFtt@f%n#_Yj_W2$-awlFmDUE7=0wBp*TXq#zD)8MZ$^c z!ajRRpEjwcvwPG&&l2yuo*_E__?+ShfnuRWYk=a6 zN#5=*|Ch3VItt>H1o;IsI6S+N2IN$Dx;TbZ%t=mIz?2}u!o;ZI?s4ItDW-Q(k(yYu=Ev1{6NX!j&?(Ll#;&VV|@`Vct%BrdzYKhk`1gNTtx_4xz zW$HbBsu|GT5*%~tv`C^JN0Fv~)6NFR5LP|LB4#J16{iJn-t`btVPaVLO6X#RR#!gA N)t;_?F6*2UngA#wWQPC% literal 0 HcmV?d00001 diff --git a/graphics/items/icons/dread_plate.png b/graphics/items/icons/dread_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..f93493f97bbbe7afe74486d13afc8e0344776473 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3J$#ampK0fod% zTq8u&z0S@&>UMwS{e^o16zwuK4ZOEbUBi1IOZHuagLzxP#pok34aE@>HV#@&ED}yk z7xvjp`m{+ko!z7Md6szJ^$gMZ$LADB7(dM47Bum@mk|r?80m1&hET zwxVZ?UT0?>b-Tav{=z*0iguZr2HsnzuHik9CHpSI!MrWtV)T)ihT;eb8wV{X76~V& z3;XOPecGg&&hAnBJWIUqdWPuy<8z85j34H23z~dx67#pG8JfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0cyIzp{y4CLVaEcXGlO`h@^hRZ;hj%(P6s zr%yElx?6%{PMsD>)Z-}9^l#eP;26TH$5_Pd#I)kH;LW=pLMluQ3ttIctkCMp2f5qR L)z4*}Q$iB}gZgDV literal 0 HcmV?d00001 diff --git a/graphics/items/icons/electric_seed.png b/graphics/items/icons/electric_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..cdcac30ae36c2044970ee3f726b481eb16b37857 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pU=hK5(CIDY#U^zEM4yKhJ5WC>&iIiBs7c(+$GE6Qt5l;O8~)pO6NtpRFbED7=p zW^j0RBMrz|>*?YcB5^r6VF6o$h=@Z$OOLFe(5ZuJOifJ+%N8t{v1y~{!Y<(e&E)4j zqR~Bb!%B8&7#Vn+3Atr=+co>#Nil)+NvBtZ?k-;&wK+?1!s16)i;IqS&5WIE%p!3l zM5}M!%%w|qCM}z!#QgY}Z2Gw~Mc?8KPu>*B*m7*nu|lLB8-uKx-Vs-^jk|yjXYh3Ob6Mw< G&;$U4jdeo+ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/eviolite.png b/graphics/items/icons/eviolite.png new file mode 100644 index 0000000000000000000000000000000000000000..c08cc595068054e99a5c95b9de191a2550df20cb GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGU9w3TdgvhfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0})Ul2=c4&a`RMcubp)>g-)(bC%_proO)Z;bVyfe){_UZITBjg~d%{+I~e?rEDQ{Oyn@Y1`T6=F7kRq+xvXV3!G+{THF{WzG2sYANGp3udja;Jjl|- z^r!R3xuXUt`xiSiZhv+Brf6{9a>LYj4U@KK?piQIrD!wL@ue&qj1QPT?ReT`I(1R0 zZJOimcT*xdYoA8XwrvYtY5i8=U}xEkeJc8G)$(uS7#{@Zx*rhojjlC|lV$4PmlM(9 m{eNbX(8=?UC%*VAsJ-vsKK``hwsYM;p7V6|b6Mw<&;$S|>U=W* literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fairy_gem.png b/graphics/items/icons/fairy_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..871f74426d8ea309c3738acf32c8ecdc47c5760e GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutl~n#CnL{J0}6?k zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pU=hKARt9{Bz2{iTYv|G)n~=sSJ8VFySbHel2B(iJGq znB?v5@_#A&r=uWFNswPKgTu2MX+Tber;B4q#hm1X1xyJdEKH0V?jAR9-0%?8N=)Hl zIVYf*m@KXkV8-GtA)l#~7iNxGc=ic6_AwCCWCSSOapscFep_X|4LV&8OsC!3d zTBhF9r1BJv( zTq8I4yYdu7{8c6T`w+LKiEvy7ED; N_H^}gS?83{1ORR&VqX9N literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fire_gem.png b/graphics/items/icons/fire_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..deb8979bd8eb153df3014897ff566b1e58280782 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutl~l(&NeJnKq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lPLE*;)j~^#8J~$Zs`0?U_hr$MsE3kvZO+)rhn7U2FDOqJ;owtC#Dsr1#jN<5K>`cSolilVue;$KFHmk Lu6{1-oD!M<#K~iE literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fist_plate.png b/graphics/items/icons/fist_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..0142938d511cdc336851632b141a898d8c86f63a GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ5f=GkNS%G|m0G|-o{|pTp8X6}v628sp`oDJRlct2V_V!H{8X$exz^ncv6+m&u zByV?@|4Z3F9R+bpg8YIR9G=}s19GZ7T^vIy=A>RY%iEy9!C-0Fbas#0=UL)?*E2-tAD>ekVf-+EThQcllbF9f-H=?j;(3N$`YwhjE6Zn{ Sk%`J6cYC_}xvXNS%G}%0G|-o z{|pW4>gwO?>b~pgz1z9*I}p@`em@lZ{d=sw{Iv$4GRBf1zhDN3XE)M-oB~f5#}J9| zJE12>(#yt)kLP1v+?<3yzpC)Fc5XK!#Q9bF-n6*i6SDaXtfmF3gbov(08 zs!J~qJz$xcc1$ugpf7Uc%t)&_m#57OV|*U6WO}*7R|75Po2i~mK&hxGqbqVE&lgyU d9OYiZ#K0IMDJXqa`!&#R22WQ%mvv4FO#tNRQH=lq literal 0 HcmV?d00001 diff --git a/graphics/items/icons/flame_plate.png b/graphics/items/icons/flame_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..6f78e5d0205cd2a5a0e0549d8a79df83283ae70d GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ5iFvToi2Kq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lrUHyuy+4s`Y?|psWeSKF52~B4O$zugGO7^<~B^Z;u z-Ch1KW&d;(#3>2#3ubV5b|VeQsq%Dj45^rtdf_Z@g8~n0!i@v-1v&T>7BRnI5jezF z^lZ`V?98KX_gCIuxFqLMd+XFSya%#m-$gi>w*_2`J`&SV93f%jpyk9O;ly-d zpS`3{n^e=;J!+q4iT7R45S@Q~PH}|s!~AVQlg~|J{`Pc3a@~sO8FuNr7^18!pLIqi QDuW#E>FVdQ&MBb@063;?Bme*a literal 0 HcmV?d00001 diff --git a/graphics/items/icons/float_stone.png b/graphics/items/icons/float_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..61f096fc368efcfd43f7c49a83cf057e7637fdc0 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGU9wpq3;{#0ENU$ zTq8+!-m!#Ue*UWsj11X8txG% zPu#e{p>%Xb%91s29`QWZ(44tr*Rp0yB{w%OJw3&T0=lP8om!W-?p=bPVZd&0FA0}r zM{e9WVrsIM;f$s)XCbF&^NaKZ|Kd_!ZT*I*C_a`eAC(#YM~blgcpuULw41@x)z4*} HQ$iB}c3EpE literal 0 HcmV?d00001 diff --git a/graphics/items/icons/flying_gem.png b/graphics/items/icons/flying_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..563e80f3bf057503429cc7386637f4e6b889de96 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm48-jdT9I1qz9m zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pTZ3JN<;{J8Pp$BY#pUi|ox(Qv>aU;;=VHsCQ;z8fgc znB?v5@_#A&r=uWFNswPKgTu2MX+Tber;B4q#hm1X1xyJdEKH0V?jAR9-0%?8N=)Hl zIVYf*m@KXkV8-GtA)l#~7iNxGc=ic6_AwCCWCSSOapscFep_X|4LV&8OsC!3d zTBhF9r?an+uh~=Qua?rL7b8xzhDN3XE)M-ocW$Ejv*CuO8X7@4jJ&c=FUIRXqKwuta`0W zIK(OGoWRQLX(er{#WRa?Ce2_Gvx%tt`RzZ~f&YgN^UFNH^YRSuhTXcXK3TUoeacwA zokAUX?U&8slc#&h3w;REQO(S)<;P!U2U~$A?KC5hZl2c#`ZcWwW!+r>jZ3C z{PU3NyQj|5>59{~&T;>{t9$mhRokCE?!6WNd=~SHklE3D8B0NS%G}50G|-o z{|pTV1_l`$7EGvUxRFrs;>C>%4<5W&vE##u3qOARh*&UT!-WeK8&=$yvEbv&t;>MA z7)yfuf*Bm1-ADs+l001;LnJOICoJF+5OGP;wmw|hlc*}UkSU-q<5|h{YYr-X>{AX) z?9w@Xlyy~~VaZi3VexQ@^y{mR7M!~>BXo6)&B9}yOiR}t@R`ih8(CVebmr2`h242v j2j&_FhYRd>)?{Reye#E#BD9DfXd8p4tDnm{r-UW|@=06= literal 0 HcmV?d00001 diff --git a/graphics/items/icons/garchompite.png b/graphics/items/icons/garchompite.png new file mode 100644 index 0000000000000000000000000000000000000000..0be15d5addac84a26b0af7f9762cad203e8e86ca GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_m=M96l^C_;JI+BcS6(N5_I02|s|~#*7mR3K;<%0TmBU9cyd_YGEu1@(X5g zcy=QV$Vu{aaSV~ToSd+LOF+aWN!$8xWly5!yM;^veHm`cy)zYrj?11(NS%G}@0G|-o z{|pTV1_luaDpnL!95Be(aNxy)2L~3cn6aZ`#g8990(KNkII-Zug&$&P>|!;-67!s6i)>DN~sEjV{^LFnq3ngz!?nU?w_EIZl4w${jwWAhiE7fRBMJBrU~ ga3_^(s4_4dTP^Y9^P7!dfwnPty85}Sb4q9e0GlRQ%>V!Z literal 0 HcmV?d00001 diff --git a/graphics/items/icons/gengarite.png b/graphics/items/icons/gengarite.png new file mode 100644 index 0000000000000000000000000000000000000000..22ac015b9a0f180feccbc23a26e1bebcd0880c03 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|&0G|-o z{|pTV1_lWhCuUeoxL^^mW5R<2JARxd#}J9j$q5U%1Vmhtw5<aCwPybDC6sOXM!=l1W<`?pW@g%DT~d ciVy>XK(Y9y_{6F|K-(BRUHx3vIVCg!0J9rZe*gdg literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ghost_gem.png b/graphics/items/icons/ghost_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..96e320e2195c0ce454ec964997b81b7582e4106d GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm49Q>pnMR0fod% zTq8y zdAqy(U&{XJD2P)M zsrU4$WNS%G}r0G|-o z{|pTV1_l>yyvQghu&}V0apJ~|88aF>Cj9vE!(qk_i;Rkn9TyT-9I!|zaA=q@Ls{7q zsFATG$S;_|;n|HeAScPw#W6(Ua&p1~E&&mjByH=%l|8F8-+3_w^aZ%g_MWIDbX@jS zV#qA1myei2kFPK(ekLTYE|LEHOk{!Id6H>ZfOV#Pgv%u@$$@`s~nrRIA`AD kW!zD06~~!WuA$1n5Sb|MDR}M42B2*Wp00i_>zopr0K{)qkpKVy literal 0 HcmV?d00001 diff --git a/graphics/items/icons/grass_gem.png b/graphics/items/icons/grass_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..df57119b27d3b6fe0d0d0049edfab9c492580b62 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm49w2Gd1P0)@m& zTq8QDv9T5x@3_$v@f&81r(Liy= zByV?@|4Z3F9R+bpg8YIR9G=}s19B=nT^vIy<|HR9U`h~SVPe#9_qciEhKHb5VhRt- zIRVYYWO0Q6GZt?NX;$W`meS2jB<6-X_x4T=@i`zf`ND++WmVM literal 0 HcmV?d00001 diff --git a/graphics/items/icons/grassy_seed.png b/graphics/items/icons/grassy_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..31f30aeb59fd1fafcc3beb6c99d59bd3d89e45ed GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pU=hKAj1f{s3mT5~k&-M6E2vIHExB+hnAyxXgp73GyRCFt9|>a>LoVn8j7B|(0{ z3=Yq3qyaf=JzX3_BrYc>EMQ9z5pgJJ>5&x_I(1Nusi{d}*@6W#Hf{7=*d-jGnf$y* zG`eSQSji3zBLj~!A-C*qyJnv|DJGCU>GZ15-Q{beHfJeLSp4W}anaGPnXz+?StO2x zX!XsTxpc|Sq-B$om>(aLO+R<0=v$oO$(sThTaL|{ym^jq*oqlUmOWZ?jd#!Sowib< z*-|dkNy|@qd&3k%j-47tTAAD)yEz>0@{~v}R*1A?V~|zTJK`#~aTn0x44$rjF6*2U FngA}IbH@Mx literal 0 HcmV?d00001 diff --git a/graphics/items/icons/grip_claw.png b/graphics/items/icons/grip_claw.png new file mode 100644 index 0000000000000000000000000000000000000000..d76c6b75c2aeb8fb6ea2c69467684a439424a1e6 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ5h?Mw;f+fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0gt*r+BScFYFlpI^fr(I zNWjdytN_SmO!9Vj`M;F?(@_woB*-tA!Qt7BG$3b-r;B4q#hlm+d-<9b1lSAK`4=qV zUF(-S$4c4%!qU~uo!Z^IyQlZ@so69x@ppI?EEW*0eEIJudpo{kW!x6ecU)`L*&12G zwN=fSJt%8+X93@oUXMVmdKI;Vst0GYd#NdN!< literal 0 HcmV?d00001 diff --git a/graphics/items/icons/griseous_orb.png b/graphics/items/icons/griseous_orb.png new file mode 100644 index 0000000000000000000000000000000000000000..5140ea3acde5081d0359d061c75956a6582af9da GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ5hSS0_qM01Anh zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pU=hKAM2ivR!rzqVK6|Mzp>pZDB5W;v%t@!VF;wLKDh z=V*e=fPrsLt6u@xj7i?^F8`OZe>w`{lmz(&GdMiEkp|=(^mK6yshE?TaDa`4^?{F@ zVzPyMz)@44V~Hh&+}dF+MJh3emZ_UNsfH~{3!CL=8Psij`t+Id22(>l~U~?I`yDHpT&gOII)<$(kV?xR$Vnd9o)RTJfEd#$?o#^QKC|-t}sqY z{Bmn=b$R9tH})G0)7RbIJ$+VYgKp}bM|byDudHN0lB=X=9hT4kN}!==S!E7qla=o+ zW8Jm4IbSimDX1^yd}V$tSF^XNslZ>Em5qskL3M-mHsy~tvp`<2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lPL19OO#fb$03o;ZQ9B3$T5Xi6)0O`X9{%+h-1{7yZ z@^*Lmzm)ycQ4psj$S;_|;n|HeAg999#WAE}PIAHmrUVfdCPoc+kDE7ccnE4Grtq+w z6VOad7FP%`WAT=dW@VmgDc!t8Vs5B&Z|~F)p93I4yYdu7{8c6T`w+LKiEvy7ED; N_H^}gS?83{1OSt_Vc-A& literal 0 HcmV?d00001 diff --git a/graphics/items/icons/gyaradosite.png b/graphics/items/icons/gyaradosite.png new file mode 100644 index 0000000000000000000000000000000000000000..5a6278df2729b5ca51dfe8f66a19eb4ee3d6bc91 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_l}lA7)q-Tu?ALFo9vhiXT5#tT+)N@#Du20f!eA6%`kD%rILf@DQklu_VYZ zn8D%MjWi%9$%)~jiK=o7nF9JUo|R0$=AhEYKIO2)E}hdy zSy%NLmR!{m77v$5zrN~d!MTeILRZJsEI8K5wA3eI*~u2RwMKRvo4@$HP?BccQG8B= eJE>elm4V^1tR#DjNS%G|m0G|-o{|pW4>gwN5U-{m*@k(gv_uT1yxv?wSO79%nd1d4LowlJH zV`Ec&T|vfx0lTZN0+7L&OqNNqvX`Bm%VpWJQWGY;c%j3`dw25NS%G}@0G|-o z{|pTV1_l8E1s5DRegr7|xM8tk$BrK}8h*^s`0?Y1f|p!hb^xe_u_VYZ zn8D%MjWi%9$%)~jiK=o7nF9JUo|R0$=AhEYKIO2)E}hdy zSy%NLmR!{m77v$5zrN~d!MTeILRZJsEI8K5wA3eI*~u2RwMKRvo4@$HP?BccQG8B= eJE>elm4V^1tR#Dj zaB^>EX>4U6ba`-PAZ2)IW&i+q+SQs_mgBf~MgK7h4}s``;h@)b+?;#V685z$zg&CY8WTdgD7+Xg#rv)iuoKJ4HU zgIg~1?%Z(xY%4yy>c&Y*(93R@NzXLCkcmOoJe%G7wb*msdd@c}+IdaOp3X9uviR*~ ze%kmqulIrWR_R)MmG@Y2T~0O4Whis{%U&eJ?kA@4#P__+OWj;AiS=YKo-h|C*sgvL z(WCvSEr0Ut*)LwfTz6~OJf8sw5$BFvjP+#TO4di4?3JC%))L1;ei~Qqd~lr%*cjck zW|JH56Uiw~=jNDf&%Q3Ydo$2NBGe+8)X+dAD}+e>baL*dmEI`2qTU(@+hN@Hr@1-_Md5HGs~>AExRbC6;@nn*BWWx%vKEBW&QLnhUE|eB(85GqTE%ppS zHjhG~zM88oChuB}>Zw_oO^BAtx25Qvf~RE5nAGq^pQXlSg*i8`d`bN*ELQt=6Y;k^!lc`Np0cZOCmao054irCRN4DUIQz zBT~F(M^b!L(m3@qp0u0yyx&<@&fSb-wmL%@;1dPFWyQ60*lP)Xu0V52FxLhoyG@iT z#{nD#{V`nZr8>}Yl6nW&aSm|F6Td4%4V2Q1YS$!kaMND)fSPV z*y$-6gwW&_TdU}>oK$Q~$5HG)0OwTs3Wf`flM6*s7fx`I*ji?8maB3$^;mPDYlcl1 zO_*AwiTWgmt@imcuDJ(}k#da8AX`7K;D{_h!G+R%am~788@0_zSlD~aQ;;3WxsW!c zQY8lRn7g~yd!k4?wH^9^Vg@2E5pc98!F7{j&dY7^X%hl!r)N(M6_C*HWuxgGoY*ro zW*sP2PKy@pyW6B5-SlXpM;$#nqI#4r*i{wDo?Q4A>g-ib$uq5H%Vt88{M5R#gRAMg z%ZcYQ_&9Ql@ox8|cJI4h0+KMnW=$1dW2P4~P5o+(CQ2wAtEom!we_{4J2Ry*Q;ncg z?n0Ew-^!H)52EPW%$zPxaE-?DvU6z$Cv_!1Qp z6l}~Ob3hae<`EE7 zt`y&`rBi9tJLCb|+B@zDI%rF%=a)<1MFJt|R~p~-Ow3CldbU-R{|SJ)g_$(S+>UM$ zY(Ny34Q8V&LrUxE;?GTt7Mpav3dH#e$x< zqYTt9IjLW=bptbluiPLFP|{)AJjVj^8zn?S`Mg%5VvxDOO;nE$dYnUmG0>U1KT^X1 z1?AQ+?3hhb*V7CH0-h)GNRLG%zp;G#LfCChbvznXl(ahN6FpOPsup zVLgtzs46^lozXUZff#LYb?{XNreM=yC^9bPOgMHXOu*)ub!qWTH)*;pt#r-b8d)yDzC8A+O6#Z*T*`WbhbOG)p#!2rJUVtxz+3C-Ydj;`v5L6uH zK0Vm&$S}}-vVNC5}Dy>|i{B-6^2Oa+({rJ8s3Jm8kP> zuJ;X*=|PPXW}0>-6a!q}OR}eK2oLoK;kjMtpoOJ7a58BaU9fS4ZPLos3Jo(Vi&DrD zI7Id#oIIHTK=@&7+rebqKI8xr1iLoGt&U{w^ctGxK-bv)z|20rGtveyJjDmJ5Gk;b z{3py5N$7Q@>9JVRcIPKhw+zfmg>I&UVx;BD8Fayz33tdm=Z>|*GB9E|ID`wZTIpbR z7oF`_2bH3UtJH=1qJC#k721!Z!a=(ih6BW?mp!7t+MCbKgWWrj3Y zmwTva1j=l~RKB?*zpYrrj{3-N3dPn8p=U42Y~33jn|D4ApZJ&yIs#h)+#X4|3E-J_ zstXC;b}v%#Z^xOB1O4j>&iGv_+rNy2c%b_V+_%ok)#Ad{o)~H4AX#@cR1THBQOQ87 zEC^LqKyt2@R&cWTnDCAa$gjg00g*r! z4C?ui5g}0T#luDJt!AuyYNkwDTScKB>S800%_7*RW{48Fym~(u3~tpJe9%6@8;}aUq*Sxz{e6Z0O%i{#Gua_ zPVT3Zd^^YcAU~YNyk5n(LH_wUym>uEuq_|ZrCUi-#}F_8^>xkG!X+C8KoHy7D*lP2 zlu~`~XOYE!Ppd!6jTXS?BYdPab*U1MEuk8K-Y8$)GF+pA!m?k}MAw51Rfp23xx+JG zTNv65yHxnFW0@&i%B*5`L2!rFXmk(-d7+SW8uT19L>b~6cE|}cimSZpyb7eeZw^N$ z_BVfceR?sGg% zq(HzI6hfj-ojRN~@VZ%`6ten~D_W;*WnN zhIoL3!yx2JH@ZlEL3yidf%n+pK;dXdvZ=M3MwFY!LIq%!Jfd15b&M98r6jE$Bfz2; z9@QJn_eH}mgu5Cbu0{ZnCsx$(WNg%LR>iz;Kz%Ykv7pKmb|3L^58v!Fe7}eHp@lUH zx$DRHQe9|mgK^~ehIzu0h2vDun%&Pa1L#p{UsW)5?o3CS4``2|yO9$nVa`EYO$`Cfd8ITd;iXR&UCWwl6N zGNR#j%q`R8U+Ky`A99x%Ylr@-7#vJ_)9^?U)LPHApdOL%ZJiacnLv}{Br{k6_}|Ig z4@ahCXY!OZ`P)Gmzc6-G1|Nr(LOQzc_%X7ZZ3FY>7{!{2X*}Grfe5XZ2y93tg-h`Y zxbQL9G>1wVT7AL~2&pUpjC>$9`P7-o$C)(${io-beW($If3KPX)Us7Wle&#O?$4)q zRz@k{B}LmF4!D2%=@(?56_{faR;!VEbI%o;U#{c#EA%hdXE*T%Krt}}NyX1)kSpv{ zyxXDNZ1dZ83CXK41pl;g7Mu1Y*liAGQ1YFH5UlTAj$pjhdIZy@lqt zko_@WhKK=l2g$XvF*yqePIE>)!@OiZT5t;wGw^p>$~iUEzv=;VN+%~;k+ps-GHU;&Zr|pdAjultxSilL~TZp47u#uKIux`8g{lIo3y?xQ!*oi4|4vrD}joL&UsHVjT0$z0WvhP4>oV%jT;FLx1wgB}+CoP(JvbKVy3xBhS#K#q8`E~EBIjiAd#JC*b0OX3hS9zk}=Xe@E} zR~?gi;LeFDO)IgUR@55Kx$(5(M|pQuguIZITUa#2O0xI8JG|VLF#?-HuUe-wy4-mo z+R|?ehkzoqjqW%Sp2`t?3}VU5>s=^LYiw_;QmT}4rtQhJrk%CQj--Kym=8N*iAZVG zqT+2JH5ok?!#9LhbNTvN&YfCW*dnbNr7w%WXNjn}TLsr{?)42}Ou;8EgfD|WukKD1UtD<7FnmEHkTcodytxEfhXTSgjV zFw2bp!Dsn-qOcLN+m+w^Abwte7-lj;K1`>OuO2;zJ`Vkw359)bEG+Oy&~$D|sCUji z2^~bA>`Tvy6zkH7Q9E^aylU#pXSwyJ`}O3wtH|f2#rmlm^0ZIZZ6b;r6G;NK;AMw3 zt!exl3;Kx?Lml}24}3WR4J(M&ldcn!7%8LzF%iH^!~r*bZI zY0!O9$^cTjL&eNiESe9bP= zVOnZ3*K>aY+D=sq5~a!uWISVUTKNEv$fbH>OZZcdKY{Qv39!%&V=Y|Z9!9t7G~{$C zS5I28r^6N=0I?h;mQp*po$C3sejm~B$eKF(RrO#%#L&SwsPm~uO8_Sv)hq&})PGP2 z(lswzjv5(t4VSn!dOis}G6|q=bgR`jLP3Yxfoi9!Mx$^WVOx;bDOUK^^WNu zTgW&=+M@EaO^XU=a%Yb7#(c*>_f3jV8_zb5z5aOU=OfMEANu)7b02!TvuUvc9hL1> zGY;blK54mnAo+UrYP7fIeC;n_8d5Tyw2}Ttqke2UThP+UdWX5968nb?I=1K0L0)~I zbt48aG3QPU@CwK+-JO~q-*t-K_LQQRYt%xA$4x^fvTaQZ&ow!Sel+T`gIUSw?z|qR zJu9#l3wfS2IIE@m^HNKfp(Gj{N*Q3w^mG%=CUUrzxqw`FSO{?6de9<^1l9naw7LQ3 z>;CsdR4<>j)_!h$qnn>aOHsAE%&%Pi&?xqnEJl2p)gvFOMy*BZ21|Qe9Ij-{oYmne z3k)$z+UaiXeFH;_heFJDFo0`Z_|k|C5y0p^vh{syEiz==O-yCvb7w!xFdsp8)tPR= z<%j!nO92hfK9g3#@kPWSWSIvl#=rpfg5K@$($_%vyk)%(pPgNOpO&u!+Z z`@nk00d&n~P-n=fq~)&|f`>R^wnbfS9LDron?}6wolERnqV3!z_$oQftvPZP^)?Dv z>rS|)N=b7H_f1}^48LsAnVRX7xuR*vLwHa}Pp6ztI?oo|xbt~iR5w~ZTw~vkG=G2S z=OfMEAA0Xa-W)xH7fBZ1pD=8gG*6$?NSo3U8oqSu)29{rfb%-`AnTqMg4^nGC!`-0 zfoARw*uS6Kq9Ev?LzsHZuidp(!s_7^D!n4xcy2!+Poe+nm!png{xtHv&Q=cHGhD_< zyXHyBeM5y_8@g+?ED0~Q*Qaogo>$?Tua!%0TWS(F+x3K))ES1>H8-5SiXK#_Lv>5) zJd~1j@003H_DoazW^o1 zEFYlAOh*6!03J|GR7C^<05C8xcu*k7Z~#!4nCOrIV7S2exJdZ$xY+pkfUD@N00001 zbW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmYE+YT{E+YYWr9XB6000McNliru z;{zEGI3xiNS`z>O0GCNbK~xyiV_?7s7zKeq0Lqq}2?P@%JRrNg9LNJp0NEWKK%M{w z#}lG#3Ye4P2{K@c3z(CZ;sOM2X<&{@8W=c%I6_8Xo|Cd7kRuvuqyz-Yp@Be-cqkMU zf;pw3p%Ja&P)>Pyc}06Um?H|~fb=kxhJ!ez;R+yo!b5?)($G?{A4JPRW|ap*Jf{lO gR30RN>1`YU0Kcz2Y_wJln*aa+07*qoM6N<$g0YoOm;e9( literal 0 HcmV?d00001 diff --git a/graphics/items/icons/houndoominite.png b/graphics/items/icons/houndoominite.png new file mode 100644 index 0000000000000000000000000000000000000000..bca28d336c7a854785f3161ae86f9b701f522070 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_lWM5j!*tekdq(WEAXJu;9mp2?rcJe*E}hVc}2_kuYPz3eCgDKY&^oOM?7@ z862M7NCR?`JY5_^BrYc>EZ`ClaY@p)K3v(8s4BORDWEUoS;_Qk4k~@@Qw~e)(m8#U zbyc5X$yF_3@o#L3yoV&OnbahP4f@7UbOMMcSoor!SYh=f<`HRmBC27VT#pg7* elgc$z85l0hO0u_DPLc-N#^CAd=d#Wzp$PzHE>J4~ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ice_gem.png b/graphics/items/icons/ice_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..db87018fea066e41d1521f48b9b0ac712294fbc5 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm47~p5AM7fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0EaktF()};0aJnq3lpP;yT{ENH#`Kj5>t3s z&IxEHCW|Wsn6Y?ENV76ewUlmNA~84Axwm&}h|d9;$rmmpD66V=s3l&%5TL3m>fVu= zmZ|sjsb)ZTOK{Ao(;|s_97US`O* zA-1Ati(Y4E9(B9F^8Ug-0g85+ng-rmr>@~WkR|&r!oj>P;9~TVn1NS%G|m0G|-o{|pW4>gqecf3G|J?&^)2#GK$VBoT}+9QzlH(cJgvLYAT_p`Y1_?Yr2r35wEXU%c)L@)yt-q`?M5ZId$4P z&2dSKQ}08WW4`Hp)58@k($8e)J6K$res0c-9lM{2%uwFAeew5qy~gPdGH#FG?Jlp* zmz>YZQmpgs-j1!SB2G$ZsHUv3%)Z)n?o*Pg!0{D(HZ5Mg*~T=ap)v3%?}?W)G&D3g tt_aD@VoPzjb4Wr)t>eRHg{EF61`9c}?^~Z1{Q$b2!PC{xWt~$(69CRY%iEy9!C-0Fbas#0=UL)?*E2-tAD>ekVf-+EThQcllbF9f-H=?j;(3N$`YwhjE6Zn{ Sk%`J6cYC_}xvX5jgR z3=A9lx&I`x0{I33J|V9E85-2p)%AQ`U2{{-VncoF>U=j&-}vs%_wV09S}_1?XE(?V zj7i?^F8`OZe>w`{lmz(&GdMiEkp|?Hd%8G=RLq&%f0wsGfu|*v`5ZF|$%FSzn4HePu#T~cCI>akqbfP=lq`7Z8V zXQ8OMAf>74$r0X45tmEGOq?+Xf8@BXFTdeGG4i)X+BFYND?{6@@%lAaIlDE5pKezU Q-3@ZFr>mdKI;Vst03NS%A^-pY literal 0 HcmV?d00001 diff --git a/graphics/items/icons/iron_plate.png b/graphics/items/icons/iron_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..08a3cb8b996487e7d72dc3fd73c903c90a785c6a GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ0}9PdX<11BJv( zTq8RY%iEy9!C-0Fbas#0=UL)?*E2-tAD>ekVf-+EThQcllbF9f-H=?j;(3N$`YwhjE6Zn{ Sk%`J6cYC_}xvXNS%G}@0G|-o z{|pTV1_nD8{8-Siq9GyS$Bl{`2Y#Gbap1s$j2}OK>{#&P#(^C_KKzhNnEDT>g|Q^a zFPOpM*^M+HC&|;rF+}2Wa>4>G0TGuZZR^98J&CGv3z-7?GM<%8zviIQ$3Eq-#4erF zM_E_(8J1kt5*81aNWZ@7Xu-LQ3qn`N)GRpG$+XlbVcE$RwzWof9Gk!Ryik&6+);c^ fgFC5QLzRKyvaBR~i{&I~pluAEu6{1-oD!M2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lrUH$3Pr>9S!?(6GIO-;46wFPOy0S+j%IGPh&RDpZH>n^T|7DCsPj^Z}vJ-)ofe%`-DLTr)_LW z`zZw$!x=n_7=sus+IILpTcwb!wBGM&thcWIIls^|_f~#pn>0VqsalTV`oTlJ4|j^D z&f;-N+gJ5E$V2w*c7BJsO*$XBZ@5J2v`%ERI=1%d44Dgm>&{B=EtTCNsiL(GNS%G}@0G|-o z{|pTV1_l!vZX5`h@x#Dk$BrL2DrW3B@B;)ET%lD75X%AQq0m&Dsj#-ZcEnGZvHD4g$t%|o-vvEX;J7g_QYxPG~-j08OqN|raHdi cTgt+~V1HhU;m{IZFQ9Dzopr0M^x5F#rGn literal 0 HcmV?d00001 diff --git a/graphics/items/icons/latiosite.png b/graphics/items/icons/latiosite.png new file mode 100644 index 0000000000000000000000000000000000000000..f6d4e7d23798f35ee7874cc2aa823c9b40db43f4 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_l!vZbTG3&}jIuW5mdKI;Vst0Cy@^d;kCd literal 0 HcmV?d00001 diff --git a/graphics/items/icons/life_orb.png b/graphics/items/icons/life_orb.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9ed7c68272db9e6913f34583fa65b677706101 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9HIp{6o!Kq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lrUH!_6cX!P0yxaKh`}glV)en77O$F)01{D5XaRG`m zCV9KN{9nrc=_rU(666=m;PC858jzFd>EaktF()}eLD+zci|fEmCoiuqgLxA+ZQM9f zDa1+jh|bv?97;!5NX?oyjqNGN%$6DA%O#z!a7wCAUpiaW*)r{AW@hRQON~>P1lSC; smMiw8g_wCaM|VAv329$c(HO$OP;V{%pw0Z)9gy=pUHx3vIVCg!0PrAVmH+?% literal 0 HcmV?d00001 diff --git a/graphics/items/icons/light_clay.png b/graphics/items/icons/light_clay.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc3e63801f3d21ad4c7ff73d4e2ca5eae7e01ba GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9Gtn|ci$fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0xLrP+zfrnp`I zId<@|*Es5*oOHg3qh3k!p3UUjMwMqmyk=$Tt~z!6?$M<(&Yb+m()^Yu%+y{ge8^Z_ z(~Pa6m_5?(dTZf^7b0iFs$}K3wcqxYeO!G##{F)pSl8KIjO$meWW2rn+jZ{!k2sz0 ViXt_t4bg1l*22Y#3kkMgdSh<%4N4?8J)Ur53IjvdZNd0iS|N-;+Za4u{an^LB{Ts5QkiF( literal 0 HcmV?d00001 diff --git a/graphics/items/icons/lucarionite.png b/graphics/items/icons/lucarionite.png new file mode 100644 index 0000000000000000000000000000000000000000..ea4955c8a0ce049d135b42f8f9e92691c877fc72 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xuOw2s0AyFYmfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0X@1Z$2yso`Xnqn*}}Hg$c|(47oQhO(leIwG^J0ODBFHy84Cl$Wm!pfmpM7pL2mMN L^>bP0l+XkK;@oa% literal 0 HcmV?d00001 diff --git a/graphics/items/icons/lustrous_orb.png b/graphics/items/icons/lustrous_orb.png new file mode 100644 index 0000000000000000000000000000000000000000..08b452aba90db20f9785705e6bf8636b4bdec194 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9EPa_y_#;y(v%MWFcGRSs4zAAKeTG)HWS!qE#xmcFH->1v4 zWlN3NguO+--Z?8guLwUEwY4bi>%Cru_G5YL=U8s8`7XObJ|sV1U;qBz?*d1PtMlI9 r+xvYB)0NxR=jZHP+o9|5fPtZQO32b2)2{nK&oX$r`njxgN@xNAzx23U literal 0 HcmV?d00001 diff --git a/graphics/items/icons/manectite.png b/graphics/items/icons/manectite.png new file mode 100644 index 0000000000000000000000000000000000000000..af70ce0ae18d8f9f4699b06cd2be30edd4e784ee GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_lW$E_7s6Jg~6%@uOkGi3dMsG(4E$@#Du2j~NFJoap%Q;luM|_l<#C7)yfu zf*Bm1-ADs+l001;LnJOICoJF+5OGP;wmw|hlc*}UkSU-q<5|h{YYr-X>{AX)?9w@X zlyy~~VaZi3VexQ@^y{mR7M#1dAar$1&4Oc{OiO(dmYr;2TWe&;vH6S73ngjB9mVG~ fxRc5?R2dj9%Sy7hSWc1#+Q#7N>gTe~DWM4fRSs6e literal 0 HcmV?d00001 diff --git a/graphics/items/icons/mawilite.png b/graphics/items/icons/mawilite.png new file mode 100644 index 0000000000000000000000000000000000000000..8505274fdf0903ab19b5cee83fa335b736e0c046 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_lKQ1t)eCoTylF;J|?&KN247==kyD$AcRc4h{h`GCDSFxL};`a0;k}u_VYZ zn8D%MjWi%9$Soq~IpdHU>{uKbLh*2~7Y)q*nX@ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/meadow_plate.png b/graphics/items/icons/meadow_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..5cec7fc16726e4e8acd23eda2d9134c1bd299d39 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9FaTn1D8fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0wZ5YyVHqcoJdXWp7_#0n&#Je2(&H28uH# zdAqy(U&{XJD2P)M~0qFtt@f%n#_Yj_W2$-awlFmDUE7=0wBp*TXq#zD)8MZ$^c z!ajRRpEjwcvwPG&&l2yuo*_E__?+ShNS%G|&0G|-o z{|pTV1_lQrIvykh{OGW#*l^*;iWNH+bo}`74>G0TGuZZR^98J&Bs{7BU6&Ww_1u&QuUOE_*7GXYRC@kC;M_ zOIQ^z>+II<*NS%G}50G|-o z{|pTV1_l!rY=|gmIC0~KLqNiZ4<9yo%(zf+L!m$-;=qH169FC(2X>qYXeqj>0Mx}; z666=m;PC858jw@(>Eak75uTi|fJs0kAt6DeWz$q1Nr{%J2W;G)UvOY!yBHwMD4;HS zh?BYaj*sJ<2ONS%G|m0G|-o z{|pTV1_ldOOqg-t#)%UrUYuC*;>C*v2QD=1xbWl0j~g=rZtUn-uwcT48!t92XxOk} z$8M*_T|m8zB|(0{3=Yq3qyafeo-U3d5|@(`7H|oOxFl&?AFk|KrTI>lDWK2giOKXX zHad+ZoO&lSc-1z}RJ(m~`>X%1 rGnSTHPx~XbGf;38_EKKwlR3R`njxgN@xNAASh&R literal 0 HcmV?d00001 diff --git a/graphics/items/icons/metronome.png b/graphics/items/icons/metronome.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa57f95e0c3d5e8523f2bce2a25557b981cf0f8 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9F!k}*6WdGQk0 zh?3y^w370~qErTV9~Yo83T3H93dVXSg{?~-0+n!-6!^IVWsHGr2CoK9c_77-?&#~t zz_78O`%fY(kZ%y+6XN=xp+Ox8Ttnxdeww@Sj&I)zvshc-y4a0RpML-Ty>90nkO4@b z{r3J=AeS-8+uh~=Qua?rL7b8xzhDN3XE)M-oN7-O$B>FS$q5JeSy}~h+>*mtE!@}K z31yfm%<;Tqdix>Eo|n0*3z-VenTYsl#>giBG-=^XQt(^BWaQ3pEK{4mweU#y?91Lx z%?iH`Pl~-1lpxd1r_dmEJY#Ft)m29e`hdjh1@jWN7@3*Hv3_N7xvA7~(x)k*!90dR WB1f$^ilh4!$i1GfelF{r5}E*-Y;raL literal 0 HcmV?d00001 diff --git a/graphics/items/icons/mewtwonite_x.png b/graphics/items/icons/mewtwonite_x.png new file mode 100644 index 0000000000000000000000000000000000000000..5085bf2213ea691b9bfb3a3ac9eadd81ae1b18fd GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_m<%8X^KJ3<^3995`@e!;J+y4phuo@#Dvj28)avHy#{VutOt+@d{82V@Z%- zFoVOh8)-mJvZsq@3EG6nQyJS&-g%|WG)eac~pT{@?a zvaaegEV-&BEFLc5o_#gRB0c-Us!+Xq0gqjr{nr{b&Qz0?+H$Hw`OKxe3%l2_J~(%C gtxm_?g;N+9GTuoz75;Ut23p79>FVdQ&MBb@0O>ealK=n! literal 0 HcmV?d00001 diff --git a/graphics/items/icons/mewtwonite_y.png b/graphics/items/icons/mewtwonite_y.png new file mode 100644 index 0000000000000000000000000000000000000000..25209bb393bfb8736e1378f296fdbfde5b44cbf7 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|&0G|-o z{|pTV1_m<%8Wsd}>?l}q;J|?!8*Ut!vE#>&9}N~6H*P#QuwX}i^;AQkdd89wwQ>F5X$0dj!&6uDakE##HcpO_11; dcL81u4C|MQ{oQeVtv=8?22WQ%mvv4FO#o`DR)zoo literal 0 HcmV?d00001 diff --git a/graphics/items/icons/mind_plate.png b/graphics/items/icons/mind_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe89ddbb51c769af09e9a701fcea47d5488e4d8 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ9Fk;_WS3Kq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lRL*rsq*SCuozrB6(f9=wf83`vNB0&1E0gfe^GlAla zN#5=*|Ch3VItt>H1o;IsI6S+N2IN$Ex;TbZ%t^g)mbXEHhc)5Gf%$?Qd&K=yi7HQMdam?=RdFplFw=Y2dwe>KfhyS+egU9L(DSE=C`TX(*16uyN3GVv%rS zy0Fh)(x*+T>Fgf0&$Gn)u4jnOKR%~8!uVnSwxG%9CNY0|x*@r4#q$ii^j!>5R+i5? SBNLTD?)G%`b6Mw<&;$VUR&ja& literal 0 HcmV?d00001 diff --git a/graphics/items/icons/misty_seed.png b/graphics/items/icons/misty_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..58764aca50fca69dcbd3da443f5435021f63c50a GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pU=hK5Pid(S@m-@W($yKhJ5WC=KW6`$>vc(+$GE6OVlFzk+__kuz)Q=M8u(>rAJm!=+r?qrlux^WeXO}*tF4eVV7`#X7ckM z(deGJVI?~>j0`-^gxs>b?V5e=q?kbZq|>WHcbBh?+MK00VezA@#YIQEX2#AnW|24& zqSZHV=F%lQla@_VVt#x~HvQb0qHl4ACvOU5Y&kY(^5!|dVJl`ZS@vknHQqhPciKvc zW=pwDCoMne?F~~5Id*CoX=QSI?B;N|%Tpq`SRvAmjX_pT?})3|#$7;%GkCiCxvX2lJ4m1 z$iT3%pZiZDE0Avx;1lBdpP@lrU42EL!uRjfpPp8)%eA$zu=t*vdwQeL=~$uDl9KPt z%s^(qz=yh;`#?5hlDE6d|E27oj)FKPL4Lsu4$p3+0XaK8T^vIy=A>S5n sdFhT_)&J*Q<7Z&o@s>lXj$i0CFXLLx;=j{Qs)4-f>FVdQ&MBb@0A7cZE&u=k literal 0 HcmV?d00001 diff --git a/graphics/items/icons/normal_gem.png b/graphics/items/icons/normal_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..c57142c324145171e0a588c32ead23d767395be3 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm4A#r)FrZ0t$(j zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pTZ3JMQ)?D%lu!hsDNe*E~cV!?t56DEN4VFUFC`<;Q} zj7i?^F8`OZe>w`{lmz(&GdMiEkp|>cc)B=-RLn_ESiqDZ!otL;;qGzs#tjcat;7@_ zmU9A{iOJ#$0cI@T64I>9Q!S;Nmq^SFb?)t*8sc+6X7Ys#3CgOf9cqc!F9fKnin@1X zre*3qeX1GI-4Yyg>a<9r9!HU;f78we#}HOM#v*1XrWL0JZ{GC~Qek3P_)6$vg;rNS O$km>%elF{r5}E*)h-Z)h literal 0 HcmV?d00001 diff --git a/graphics/items/icons/pidgeotite.png b/graphics/items/icons/pidgeotite.png new file mode 100644 index 0000000000000000000000000000000000000000..8cc9ab6b176fac532c7fb2176b985133ced58979 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|m0G|-o z{|pTV1_mD{cpRvhal@hD!-0kuGbTL9i1_j2$A=dcFJ=Hm5`Nq`@L@&3iiQ~mdKI;Vst0CeeKZvX%Q literal 0 HcmV?d00001 diff --git a/graphics/items/icons/pinsirite.png b/graphics/items/icons/pinsirite.png new file mode 100644 index 0000000000000000000000000000000000000000..a201c320c0240f83b14ccf4a8419e5e6afd6f0cd GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_m=K3Jzpg{0LC^alzumh8aI5X#441t>pcclGAirP+ zhi5m^fSe>x7sn8Z%gG4~xCBI8lC-T4SN0@ozFWu?(3j!1+&fc2=(y~uM4s4bPaiRb z9+%jaHMO%_yJvIu)g+7O85dTC>e&T6c4-V!Gq{}M)Ep)$-x67+Rx+`d;f`hc6xNN_ cQ-l~87HpI_UXkh30JM$4)78&qol`;+0Q#3z1^@s6 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/pixie_plate.png b/graphics/items/icons/pixie_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..4c34f22aba95d480536c3c3c73f899a4b1ef62ff GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NSwWHkJ|V9E z85#@>3_ff)@#Dge9}j-~IPl=YgcAn}7OaYeHBN#kg{an^LB{Ts5NDWv1 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/poison_gem.png b/graphics/items/icons/poison_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..ab339eb718deafb709cadd530e61f3cad86dc403 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutm49q%D;Q(1BJv( zTq8QDvj0_DA50E}=ApEDnM4&ih zlDE6d|E27oj)FKPL4Lsu4$p3+0XY?(E{-7;bCMGlFeQkvFfnSld)&Nn!$VLjF@=Za zoPcIxvbaKk8H=}sG%NE|OX=n%5_3bHdwZvb_#BX#eBnZZvZ`u_TH^H!0jjE^?j4zF znR-v3Y6f(-1jn2@Et06mQKaeLw6no6gjJ8Rh}ns0#c9EtcRhqum>3qm61rHS)s+u& NwWq6}%Q~loCIFNVW6uBp literal 0 HcmV?d00001 diff --git a/graphics/items/icons/power_herb.png b/graphics/items/icons/power_herb.png new file mode 100644 index 0000000000000000000000000000000000000000..947996c4cdd69bff960934aced314188fc0dd52a GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ4sI$Go4s1`3In zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pV&U0v1H)t~0(KGoA(p{{<#*7lIC?M7eUcd@Y`-KgNn zF6lI&2xF4ByUYKj?4OQ;I3+=T!3+-1Zh&MeJY5_^D&{07D9CeYX=)z0;iRUQ$W^dy zb+*xz!zqs*NyV`})!5xqk>VHD;Mvl0b`HlxfwEFgU47%Gf{>WlTWRM+7&c2bx}~0L z$t*17ZC))@_O-#AVQWk1xfU;j6%498iFtu%=jgN)ESV&9=VMPn;DnP$s)1qnLsD|z Tt!iC4kb6B{{an^LB{Ts5uG?)= literal 0 HcmV?d00001 diff --git a/graphics/items/icons/protective_pads.png b/graphics/items/icons/protective_pads.png new file mode 100644 index 0000000000000000000000000000000000000000..3676fd311a25a4aa3df2337afebc89c91190c565 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|m0G|-o z{|pU=hK6VFy<4;QYV({eNm)y>s+*_GS@Qq?|EpKeuGzB1D=4aY%2BVVDM?AybJm>o z7cR~P>SZhm@(X5gcy=QV$l2@Z;us=vIXS_By{V~*sbJfr&TNG#XIF^K3Y*6^Rfx;? zbif2$Q&#CyoqYxP?#4yhZRSx@ zULh5`t?1{w0E706nkB!#+%;6|OXypl_2sq1(#4Ge)q1k5o17J2wY=Ao|5a=f!nx?& z({=ym8+$G669~8d|Fd4B%KXYhC&TBV<<2@xQi5Dl1X`**)I&l81fGR1T-?=RkPsr| ez$eJ&!@y8=#>#Obzh)88BMhFdelF{r5}E)C3V^== literal 0 HcmV?d00001 diff --git a/graphics/items/icons/psychic_gem.png b/graphics/items/icons/psychic_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..6b84f38daba8f5abc1199bdb7610e6a1b0287906 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutl~lzsZUL=0fod% zTq83qm61rHS)s+u& NwWq6}%Q~loCIH<2W6l5o literal 0 HcmV?d00001 diff --git a/graphics/items/icons/psychic_seed.png b/graphics/items/icons/psychic_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..4c90afb9c9b5feb29fc5ddd7f22a237ad422dc06 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pU=hK6gB_WnQn|7iEoci)cA$r5n%k~rHf@oukXR+LwRs zXmroqu#z1bMg|^dLT=gJcFjI_QcNIy(&<&9yUW)`ZO&4hu=vr{;-aHnGh^o(vq&5X z(dwHwbLotfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0!^z95 zVBUtV%@Zdvgd93?^k{^q;2}YyB2L~QZ!d=8BbR!dnlDW{@Jb@McT)2dMHx52aAVWd z%_gY=?t641&-z;Wo)l0CylCmGs^NK3V$G_gYpYD2rX+VPofNw|OjX_KM$g-)p{tiU ztesv^o*#en7{^o%&GiwH#}qgoZrNV0>(jg|V#DI(sSJ0Fn>^%{fg!EismvK@-JA^a Nlc%en%Q~loCIIaYged?3 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/rock_gem.png b/graphics/items/icons/rock_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6070b51615cb7c9a0bcdd71dc792dc277bb4ef GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xutl~l@Il&cwfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT04zOJ#OB(;UTD%n8L$y zPCzp;SzIB&jKy0*nw5E~rF8QWiMgT9y}eUId=AJ=zHlKySyi<|E%Ew=0992{_m0f8 zOueU1H3Pa^f@4md7D?3ODAM$A+S%Y3!m7tu#O%bh;dFVX N+SAp~Wt~$(69E1>WKaMA literal 0 HcmV?d00001 diff --git a/graphics/items/icons/sablenite.png b/graphics/items/icons/sablenite.png new file mode 100644 index 0000000000000000000000000000000000000000..ad348b4352b97d25f999cc2b5e78a642a4950f13 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}r0G|-o z{|pTV1_lo_B33w5R7A}9aie0#iW4h3CVZH%;>V94A0}jcc=6#yM#77XjspQRUc`nf z0W~s~1o;IsI6S+N2IM4qx;TbNTux3{z$GB!lB8{YxUwfv^W8$GfWD09CetrDsPtJ+ zIV`d2;*&>Ap~odwElGLwi0iRVP*7X(wqqKaJ1d-fg;~939`KpW*BfYbk7IL5`HFR0 k8SYr_e$SayuA$1npubxr>(l-=W1wXWp00i_>zopr08MaPQ2+n{ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/safety_goggles.png b/graphics/items/icons/safety_goggles.png new file mode 100644 index 0000000000000000000000000000000000000000..7a1efab67adffd72893d7ab8383ab500014ac898 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xu?EJb+&fI^cfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0=j-CMiXDcR}&wQFMZL`gH zTyQQ}$I+*H{O!E5BC8#H8k}CONhoK1x%tPGW3T3J{^$L#-{D8nnfs1MvR?I_5NC3E zF1WV7boW!a(n;%bd_*EvuH)IFdD5~VH7j3X+3DDo@{XHKdS){z9j|#2CTx?}eemVh zNTt@-eb%j(iQ1L&6|pP{nnhV`|HC#5oxFHlL}%rl4Bq?fb!UYg?Ui`$+~0f> KKbLh*2~7ZYQHg>8 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/salamencite.png b/graphics/items/icons/salamencite.png new file mode 100644 index 0000000000000000000000000000000000000000..557cc29d7dd50a2d897f5982f00833253fda5241 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|m0G|-o z{|pTV1_lQX91tj&!7*XShZQRt4%|psap1>~9}glTDhfJItXT2l#fu9a9TEi{8$3Lo z+^g*Z>SZhm@(X5gcy=QV$Vu{aaSV~ToSd+LOF+aWN!$8xWzQpX0#X;%D;}%G!gN7+z;ftT^hp@iWji22WQ%mvv4FO#sISUw{Ar literal 0 HcmV?d00001 diff --git a/graphics/items/icons/sceptilite.png b/graphics/items/icons/sceptilite.png new file mode 100644 index 0000000000000000000000000000000000000000..ba61c74aac5ef06efac52f6e0f0258591d0298b7 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_l8M0XsAdekdq3EXY`KV8M?CGY%v;{P^+1!NDP+BI3Y>iZ6|{w zx~k8xNS%G}@0G|-o z{|pTV1_mnvGBOk-EG#Tm+<0(e!HNkJCKPl``0?Y%3=W1B6IT5A@!-Ez*gT*X#*!ev zUNS%G|m0G|-o z{|pTV1_mciJh-sJs3bBmwNS14-_Vq$omEwSRLNS%G|m0G|-o{|pW4>grG5rGEeZ{m!A>`F(mjSGb z4=Bi(?(M@T>QYi zhG(;@7{9O`(QPxxdFf=cO*i*yYhl>uPq&}=2LADloHo0Bx!3hhmdyE9O+0f~eO1v~ z+wW51AyCCqnZ;{p+**E{JL>7dH3h6Pn`N0ix<4)x;%Hr0Y_l%F!_}==|9J| zgqGEvwtMFb1tr%>zE(T_rmc|uyA)&9%2ejJPp5ronPK$o=!^sG%rC+g8$427CU)ek z)INbiq3jz|SA-S*za6aGU#f2Sjx%*%$*1Ex8H10CemQq9GY;fjPgg&ebxsLQ04}9$ A+5i9m literal 0 HcmV?d00001 diff --git a/graphics/items/icons/sky_plate.png b/graphics/items/icons/sky_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..f64b14aff6d02b979d950faf395ba04d6bbf7630 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ4s!UnX~O0ENU$ zTq8wr_!Jf~zhDtK z#8&id(d+EYqi*+C-e0&UK+!H!)4+S{)HS>ZvSi;yIGDEuT#P;v(@-2CVdJ3X#3JFu zbYY*pq)(ev)7d?0pJ$2pUC$7me|%1Hgz>}tZ9$XIO=AA`bVG98isu=2>AM)BtSp~( SMkXqQ-0kV==d#Wzp$P!X`*8yR literal 0 HcmV?d00001 diff --git a/graphics/items/icons/slowbronite.png b/graphics/items/icons/slowbronite.png new file mode 100644 index 0000000000000000000000000000000000000000..89bb8bf487bc52f42c202fb5f00704a0f16de85d GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|m0G|-o z{|pTV1_nD$?0B#v;KPfCA3F|w_^{)~jTt|F{P@t&@nJ*5i47|rym;|o#*7;W8g3+H z%&a^b0o2P_666=m;PC858jzFZ>Eak7aXC3*0hfS?OOm$r;mV#>n(w@r0{Q}6W_wRm z5;`t>Dluf1)XPUqp~qL46h9LZSC>eCekQWuoZ{V?#<4XEj&U+Bop-=za^R)8Ki?^w qxn%71`98;ixy8@sE0nbdF)_T(mRNDrapPy8Z492SelF{r5}E)Fpk$T+ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/smooth_rock.png b/graphics/items/icons/smooth_rock.png new file mode 100644 index 0000000000000000000000000000000000000000..8db8ef11f5b41f24b0980eb2525088c2cd6ebe91 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ4uaDLPYU0)@m& zTq8TC9N z=lm6Il2@kdflOjx*pV-p0i+m{yxm>?FJ=F96vQbB@(X5gcy=QV$T{Tc;uumfCpqB& zn*{4b3#Tp*p<`_veI1*Xot#b{5nMGfFyP2dRe>Xh!U-bz^A|~JF@#OfxEB~GB4sLg z#53&v#f$gsil6!{5P59aEeiyp#_60)l}T3}{C=OBc{;{n&ePrH+t)`~YMb($m>6kU ze05c%aeAv-laI#yIJ={++0TqN+n*wSX1oT9Wp0&K6#|dP&PfK^68!3YFYw( zi+_CCS+2jF!(pyYT&XVSF~(g{2CU~8nH_kAa?v{l^bLcjtDnm{ Hr-UW|R2r4f literal 0 HcmV?d00001 diff --git a/graphics/items/icons/splash_plate.png b/graphics/items/icons/splash_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..b290e8100142e51ef0d4665b05621671621e2c84 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ4t}GyQTN1BJv( zTq8%6Tn!V^UJKn6oFvCHm!BKfgPqO;=rs*>K+M4F6x58jH)kLR(Bc%ckm|0lC}L L)z4*}Q$iB}?k;TO literal 0 HcmV?d00001 diff --git a/graphics/items/icons/spooky_plate.png b/graphics/items/icons/spooky_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..215657bcc674f6bbd62d949be4d0595ad4dc07af GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ7&NFKa$10ENU$ zTq8m@mk|r?80m1&hET zwxVZ?UT0?>b-Tav{=z*0iguZr2HsnzuHik9CHpSI!MrWtV)T)ihT;eb8wV{X76~V& z3;XOPecGg&&hAnBJWIUqdWPuy<8z85j34H23z~dx67#pG8-!L0ENU$ zTq8LLPLYkF%s-<-E5{bE?&b_@;LwpX%Ould-L0MI`LoM<8g#cAmQTL9_v`oFG zCe48Emf#qcqaulV97TdYO*NS%G}r0G|-o z{|pTV1_l#mY*?`3z=;6BllH%s8>(#ElsTZhSU7 z`yZ&0u_VYZn8D%MjWi%9(bL5-MB;LC!U8S<5tk%w>%)~jt2Fbxm;(9&DrS05QW84O zdnz#`tGA%AaaD52s~0mKJz{yh=EaMaVzZYeB|9pddxe?2VjE|wtzB}tuw41frMq6W m+gTr+yZJXvV7Id-BZHuYIDf&hjhld$F?hQAxvXsZbxWjD)e^NUs)1`l{H1o;IsI6S+N2IN$Ex;TbZ%t^g)mbXEHhc)5Gf%$?Qd&K=yi7HQMdam?=RdFplFw=Y2dwe>KfhyS+egU9L(DSE=C`TX(*16uyN3GVv%rS zy0Fh)(x*+T>Fgf0&$Gn)u4jnOKR%~8!uVnSwxG%9CNY0|x*@r4#q$ii^j!>5R+i5? SBNLTD?)G%`b6Mw<&;$U_gmC2m literal 0 HcmV?d00001 diff --git a/graphics/items/icons/swampertite.png b/graphics/items/icons/swampertite.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d386a3d43ac565e7e94df5d11b681eb971dea6 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pTV1_m!OA`%)VcmzZgY`F1a#exkN9%M{d@#Dvj6&V>DCd}wqaNt0DPcBdkV@Z%- zFoVOh8)-mJqNj^vh{WaOgaupzA}&eV)`u&55>@3EG6nQyJS&-g%|WG)eac~pRnwk4 zVhTMjv1-YdBS%G#-CVMS_4$-z8k#$IIQI&(dg(UKRFjihyk(U@T4v>nb483hick4- eCY5WbGBA`kiF`CJ**^(r8H1;*pUXO@geCyMl2zvb literal 0 HcmV?d00001 diff --git a/graphics/items/icons/terrain_extender.png b/graphics/items/icons/terrain_extender.png new file mode 100644 index 0000000000000000000000000000000000000000..7735dd8900fd8a878e0f2dc61b52273a933455c3 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o z{|pU=hK5^?9wm+9OXr`o^VV~E@5Pv;iV|NT_oMv(Q!jd zQP;u^lQ%L%bX`1g=BTT0WP{)t%`k6oZzJ&pmes=MVL?WEDG3b)R%vA=4<4+!wU_HG@nyj2QxJAj@EUP*m7-}OqL?Ukn+-+ll7z0~YVs=^hJ z0Z8EIy~kcaE@P6nyUYKj?4OQ;I3+=T!3+-1ZlnP@MV>B>Ar*6y6BL9ExVX3u+;sBt z>N1!&VN-F$B&86iy>~5gq6A#J0v8{))ZslPXq0bm#%tQPLYQe&Pp|KSIU6z$o;znS z^TgDHYR49O7%iL0VXL-mvx1CU>VmqRY%iEy9!C-0Fbas#0=UL)?*E2-tAD>ekVf-+EThQcllbF9f-H=?j;(3N$`YwhjE6Zn{ Sk%`J6hkLsExvXNS%G}@0G|-o z{|pTV1_l8M0XsAdekdq3EXY`KV8M?CGY%v;{P^+1!NDP+BI3Y>iZ6|{w zx~k8xNS%G}@0G|-o z{|pTV1_lxh4LdwKegqsySaD*;ffXBO?AXw7;>V940vR3}6LwVGxbe@F=OIuFV@Z%- zFoVOh8)-mJlBbJfh{WaOgaupzA}&eV)`u&55?{(KWD4lZcxE#FnuAIo`;@~HyL3(; zWnI;0SaMZMSUg-J{rak-1?Mg<2wfdhv*1`K(^8*=WhYzM)*9JyZ2sc&LP?r&NAWog f?xb=JRR)G*t0jJXezWl_&^887S3j3^P6H1o;IsI6S+N2IN$Dx;TbZ%t=mIz?2}u!o;ZI?s4ItDW-Q(k(yYu=Ev1{6NX!j&?(Ll#;&VV|@`Vct%BrdzYKhk`1gNTtx_4xz zW$HbBsu|GT5*%~tv`C^JN0Fv~)6NFR5LP|LB4#J16{iJn-t`btVPaVLO6X#RR#!gA N)t;_?F6*2UngE~>Wd{HN literal 0 HcmV?d00001 diff --git a/graphics/items/icons/wide_lens.png b/graphics/items/icons/wide_lens.png new file mode 100644 index 0000000000000000000000000000000000000000..ea432dc8de9f14ad8e71434f4404b64ef3762b9b GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGCYjJE4F+z01Anh zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|pW4>gsoj)Iyp)$ z$t+vcOoVex9|7c&KNJPfV|4Rzp{7?+l+yy$hBZ tXd291Dyi5b?)pqaic8T_`lhG~6GQAY&i`Llh+hY}(9_k=Wt~$(69DZOU1d zN#5=*|Ch3VItt>H1o;IsI6S+N2IN$Ex;TbZ%t^g)mbXEHhc)5Gf%$?Qd&K=yi7HQMdam?=RdFplFw=Y2dwe>KfhyS+egU9L(DSE=C`TX(*16uyN3GVv%rS zy0Fh)(x*+T>Fgf0&$Gn)u4jnOKR%~8!uVnSwxG%9CNY0|x*@r4#q$ii^j!>5R+i5? SBNLTD?)G%`b6Mw<&;$UnByrsU literal 0 HcmV?d00001 diff --git a/graphics/items/icons/zoom_lens.png b/graphics/items/icons/zoom_lens.png new file mode 100644 index 0000000000000000000000000000000000000000..167619aa64e1be5dcc7ac0f9d30450678a0f46f6 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6wDGQ3I_yOTxLfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0#wzX|jQ0Qy(P2Kq&2%gr}feb(b z9ZL;90=bMy-tI2{m$H943gVOm`2{mLJiCzwA-lMfJ3z_vuB3|U8^gmlRZJp}N}T!l zCd07I*Q~L~sd0`$@rJ@fatbpqm~>>SIrK$mXk5t Date: Sun, 14 Apr 2019 10:53:47 +0200 Subject: [PATCH 03/52] Begin pokeball expansion --- src/pokeball.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/src/pokeball.c b/src/pokeball.c index 793609ec2..ac13295dd 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -59,6 +59,21 @@ static u16 GetBattlerPokeballItemId(u8 battlerId); #define GFX_TAG_TIMERBALL 55009 #define GFX_TAG_LUXURYBALL 55010 #define GFX_TAG_PREMIERBALL 55011 +#define GFX_TAG_LEVELBALL 55012 +#define GFX_TAG_LUREBALL 55013 +#define GFX_TAG_MOONBALL 55014 +#define GFX_TAG_FRIENDBALL 55015 +#define GFX_TAG_LOVEBALL 55016 +#define GFX_TAG_HEAVYBALL 55017 +#define GFX_TAG_FASTBALL 55018 +#define GFX_TAG_SPORTBALL 55019 +#define GFX_TAG_DUSKBALL 55020 +#define GFX_TAG_QUICKBALL 55021 +#define GFX_TAG_HEALBALL 55022 +#define GFX_TAG_CHERISHBALL 55023 +#define GFX_TAG_PARKBALL 55024 +#define GFX_TAG_DREAMBALL 55025 +#define GFX_TAG_BEASTBALL 55026 const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = { @@ -74,6 +89,21 @@ const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL}, {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL}, {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL}, + {gInterfaceGfx_LevelBall, 384, GFX_TAG_LEVELBALL}, + {gInterfaceGfx_LureBall, 384, GFX_TAG_LUREBALL}, + {gInterfaceGfx_MoonBall, 384, GFX_TAG_MOONBALL}, + {gInterfaceGfx_FriendBall, 384, GFX_TAG_FRIENDBALL}, + {gInterfaceGfx_LoveBall, 384, GFX_TAG_LOVEBALL}, + {gInterfaceGfx_HeavyBall, 384, GFX_TAG_HEAVYBALL}, + {gInterfaceGfx_FastBall, 384, GFX_TAG_FASTBALL}, + {gInterfaceGfx_SportBall, 384, GFX_TAG_SPORTBALL}, + {gInterfaceGfx_DuskBall, 384, GFX_TAG_DUSKBALL}, + {gInterfaceGfx_QuickBall, 384, GFX_TAG_QUICKBALL}, + {gInterfaceGfx_HealBall, 384, GFX_TAG_HEALBALL}, + {gInterfaceGfx_CherishBall, 384, GFX_TAG_CHERISHBALL}, + {gInterfaceGfx_ParkBall, 384, GFX_TAG_PARKBALL}, + {gInterfaceGfx_DreamBall, 384, GFX_TAG_DREAMBALL}, + {gInterfaceGfx_BeastBall, 384, GFX_TAG_BEASTBALL}, }; const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = @@ -90,6 +120,21 @@ const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = {gInterfacePal_TimerBall, GFX_TAG_TIMERBALL}, {gInterfacePal_LuxuryBall, GFX_TAG_LUXURYBALL}, {gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL}, + {gInterfacePal_LevelBall, GFX_TAG_LEVELBALL}, + {gInterfacePal_LureBall, GFX_TAG_LUREBALL}, + {gInterfacePal_MoonBall, GFX_TAG_MOONBALL}, + {gInterfacePal_FriendBall, GFX_TAG_FRIENDBALL}, + {gInterfacePal_LoveBall, GFX_TAG_LOVEBALL}, + {gInterfacePal_HeavyBall, GFX_TAG_HEAVYBALL}, + {gInterfacePal_FastBall, GFX_TAG_FASTBALL}, + {gInterfacePal_SportBall, GFX_TAG_SPORTBALL}, + {gInterfacePal_DuskBall, GFX_TAG_DUSKBALL}, + {gInterfacePal_QuickBall, GFX_TAG_QUICKBALL}, + {gInterfacePal_HealBall, GFX_TAG_HEALBALL}, + {gInterfacePal_CherishBall, GFX_TAG_CHERISHBALL}, + {gInterfacePal_ParkBall, GFX_TAG_PARKBALL}, + {gInterfacePal_DreamBall, GFX_TAG_DREAMBALL}, + {gInterfacePal_BeastBall, GFX_TAG_BEASTBALL}, }; static const struct OamData sBallOamData = @@ -315,6 +360,141 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .affineAnims = sBallAffineAnimSequences, .callback = SpriteCB_TestBallThrow, }, + { + .tileTag = GFX_TAG_LEVELBALL, + .paletteTag = GFX_TAG_LEVELBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_LUREBALL, + .paletteTag = GFX_TAG_LUREBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_MOONBALL, + .paletteTag = GFX_TAG_MOONBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_FRIENDBALL, + .paletteTag = GFX_TAG_FRIENDBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_LOVEBALL, + .paletteTag = GFX_TAG_LOVEBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_HEAVYBALL, + .paletteTag = GFX_TAG_HEAVYBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_FASTBALL, + .paletteTag = GFX_TAG_FASTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_SPORTBALL, + .paletteTag = GFX_TAG_SPORTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_DUSKBALL, + .paletteTag = GFX_TAG_DUSKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_QUICKBALL, + .paletteTag = GFX_TAG_QUICKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_HEALBALL, + .paletteTag = GFX_TAG_HEALBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_CHERISHBALL, + .paletteTag = GFX_TAG_CHERISHBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_PARKBALL, + .paletteTag = GFX_TAG_PARKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_DREAMBALL, + .paletteTag = GFX_TAG_DREAMBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_BEASTBALL, + .paletteTag = GFX_TAG_BEASTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sBallAffineAnimSequences, + .callback = SpriteCB_TestBallThrow, + }, }; #define tFrames data[0] From 9ca2af0ce9d21b70d95ddb8a5e48aafe334d1911 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Apr 2019 12:13:44 +0200 Subject: [PATCH 04/52] More pokeballs expansion --- graphics/interface/ball/beast.png | Bin 0 -> 329 bytes graphics/interface/ball/cherish.png | Bin 0 -> 329 bytes graphics/interface/ball/dream.png | Bin 0 -> 316 bytes graphics/interface/ball/dusk.png | Bin 0 -> 318 bytes graphics/interface/ball/fast.png | Bin 0 -> 310 bytes graphics/interface/ball/friend.png | Bin 0 -> 312 bytes graphics/interface/ball/heal.png | Bin 0 -> 309 bytes graphics/interface/ball/heavy.png | Bin 0 -> 316 bytes graphics/interface/ball/level.png | Bin 0 -> 307 bytes graphics/interface/ball/love.png | Bin 0 -> 305 bytes graphics/interface/ball/lure.png | Bin 0 -> 302 bytes graphics/interface/ball/moon.png | Bin 0 -> 317 bytes graphics/interface/ball/park.png | Bin 0 -> 307 bytes graphics/interface/ball/quick.png | Bin 0 -> 313 bytes graphics/interface/ball/sport.png | Bin 0 -> 299 bytes include/graphics.h | 30 ++++++++++++++++ include/pokeball.h | 15 ++++++++ src/data/graphics/interface_pokeballs.h | 45 ++++++++++++++++++++++++ src/pokeball.c | 2 ++ 19 files changed, 92 insertions(+) create mode 100644 graphics/interface/ball/beast.png create mode 100644 graphics/interface/ball/cherish.png create mode 100644 graphics/interface/ball/dream.png create mode 100644 graphics/interface/ball/dusk.png create mode 100644 graphics/interface/ball/fast.png create mode 100644 graphics/interface/ball/friend.png create mode 100644 graphics/interface/ball/heal.png create mode 100644 graphics/interface/ball/heavy.png create mode 100644 graphics/interface/ball/level.png create mode 100644 graphics/interface/ball/love.png create mode 100644 graphics/interface/ball/lure.png create mode 100644 graphics/interface/ball/moon.png create mode 100644 graphics/interface/ball/park.png create mode 100644 graphics/interface/ball/quick.png create mode 100644 graphics/interface/ball/sport.png diff --git a/graphics/interface/ball/beast.png b/graphics/interface/ball/beast.png new file mode 100644 index 0000000000000000000000000000000000000000..56a10224c6a01a1a7c08930daa4dc1521d6f3a16 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>pcCrRA2WsQ->xR~^^< z?>_tg-BruIbCTv{IRaHpnKH%E5yXIit@lKC09jW&T^vIsrcUkK$kmh}(pn#-Rgj;_ zA)8gO>6qKnqZb#tXXs=YWOOW0DacrT!2F`({}!I}&R^x1c1&1sy7hOV<@Yyjeb|B5}}`_6s;PAZ=@nW&~%Y&?CzPKUCk600<(>36(4Fsm_YU+#DFRK3{a;ZDa_ zKjWKGWL9an+_>?an&T%mMy`8`ZLflak1ur#IJ{DGYt3^*`({_+grCOeg(D`Giyo2w Q-U{-mr>mdKI;Vst02?BTZ2$lO literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/cherish.png b/graphics/interface/ball/cherish.png new file mode 100644 index 0000000000000000000000000000000000000000..3016b6560993290ec7073da1606f6eb99a30cdc9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>pc?Q3cIv1G)zXAnS^!i(`ny)Tt9T@--O@8Hc(g z_b00rp60tQR1ot*;=(JR)GDWoC1G!RV4{lCelClxWlMD`7f$)|_eg!} znHlH4DolHQ(EY`d R?kvd544$rjF6*2UngDUnEr)RLpsbDquF`+v*T z|IK^x^UXE1FydUf14t@)2dh6=q zA5t2ZxnWm#WV7mYnS)jeAGIF_`U&$TOh1t1Vexlnz>*UFif@8%jdyXB%;hkzQo3-t zz2SJUFNenLK(nYUi%iQ-{|$d01)eQ7RTBy4cwhN0)Um?P&AKfYt<74`dc+H3tPH8D8}= zoZ~p>TlfDZ3R4^z{s%EMCnY&LIsz5IL7&&2ULfbBr;B5V#MG(%8@Ub{h`3sdeG=C! zDePgLJKI%e>4K6qB7a))nm8K!qJHtu?aEwQP=9XEl2$FN9~^s}C;cvZRC%9EV)vA3 z5i{f;PitUz5-71bpc?lxD|oXDzR;F?`qU zcs5J(|CZ+edzS!}Oqnvp(a{mefP)lfsYW2@pr?yth{V*X6E<=kGLUF7-jVuB?H9+o z+}PH%*BYz`H{MWP+^?{&ecj1RUMDA1Tkf?F72tZb{}21l-T#%n&hi?(-6pcsfBL4^ zntZ37jzq-FE^`i)b&k87&6fY-ouIAF*_&2Yo_CGaoeo;o%>R*Zm+)MvF?V*FzPgrl z5#wrh`$^9Qb2g}45#y-os^C4?w*7+ShF_jHN;9Po6zEIbH*`H1;%jL1xRGNe;}Va} u2BylUSyfd(S8zJFJQMEcI`6wOa-MqZ<-)jKr>9K@`OMSR&t;ucLK6TK412Kv literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/friend.png b/graphics/interface/ball/friend.png new file mode 100644 index 0000000000000000000000000000000000000000..b016c0c63192202e78dd932ab883af521a509d4e GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>pbX_fgBe&zh^3Sbn=F z@b0SRnkkM)qr8Ahrc9aQ2nIkl1Q--9Q3SFMd%8G=NKBnNVIxIyR}A9=|2v33*Zb$TyRD|hYgvK)s(Z_IMV4IH{>0(lUQ3sidl|PG`?h{D-I=QV zaFR)RQ~quvbM7z9Q`i*|E&9)8*7rB!@ntA zlbSD_W^5TRu;*i2(k+I0;f$vPa;lp98YdsAm%R41jLC`pnD#ObAIYZlV~mVJ%pMcd w9^UHN8d#h@rT>-*i^=*QD}LBax%IV@@g`sSG^O`{{((H^>FVdQ&MBb@0G5M)Jpcdz literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/heal.png b/graphics/interface/ball/heal.png new file mode 100644 index 0000000000000000000000000000000000000000..5f1604d785843b2547545fb06ebbbec3f3130c18 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>t<74`e>;Uh;p=(f@nz z6-TYvvgOZU+}e=OD;48Sk12V`IH_fvQ|`J*AyS8o2%qG z=d6`EczEj4-9k6s#tHgtd)GBhZP_~>Uzho>dxF(x8n{@b{jmEO&+F_F{q*RZDQ}#& zi*!FNT^{MP+)A~>{6OvY13gQByyRWP-Zj6?^U-cbp06_=Z3z$vSfx5cqnLT#l*6nR v&Hqh!|D^rseZ+O<@p87qia%C7P!6w+TQDiH&@em41>`qRS3j3^P6pbXQ1v~_s3k|wUX9AC zE^eMOWyuzx{FEtE9335j3}jFrRyPO8Kkn(`7$PxsYTrh#Lk1$Q%#S9meXwZtqSXo! zFLZY7Dmi)M6@SE%2jMSn_^ef(c5l7O_pMw`jy2wVp6_biS1x3HBB9u~@teTe@6&zX zJ}jK`B=gBaze72m8Jk`gXU{mPU7fVfDLc{jMZz^P)rWE-OkA#w>qYC&x#vvpo)Nd^ z9OvxC7j{f(>s`5KvH#;9W0qWo zVF+3hdBb#Z_LV<}XMb9&xZvlJrH_h(vo1VmHT$1=m#fpf8RSJzS3j3^P6pbXR8-Ladwb_3S>Brx zbm5qnmx(sgI zYp-fDypf=}OjqECh+(hzVaXDSPXApc?wXTA_(iuQ+ni(J%m3Rx#a}$qa-`yPZRY!bzo$fLC%nv6Tynei=C_ttHJKd2vzGSG zOg!Uvxv`<9Al#3igRk%KNxg`hRcc`l2cv4{|5$IAR4RFNRdUpc&OgtN7VP0Y*FD4h zp1>AHoBd4BijsCT_%*!sKfJ4NFSFG*-s|u0C>5L*uql@jP%vy@$z(g0a>V7Vpc?y{N4JOSa5u-r`l< z?X~6J|D!?gx}$(frc9aQ=;#P!z=7?f{fmH{ot`d^Are!k_HE=kWFX?o{AkL`)$jf` z_|>&>y#3^sDG+m%U*Hda?Bu1glN7%{e^cAr6d-ValJlo`XARRb8;azzRBxM>+6(lp zo~`V%eYeF-g`LGg4(4t1ZYvi#JSf_FHZJ)5DQ$_0{`dO-X7@)F>nAOLt@BJ}Rm3Di z7twB^)&$m$no~2>RwOb;GtQphmK*Koka_mUJWZxxr;al$3eMRKx|?+7%r-QSdiNo% lB3mQE?ql%RN{P)cJ~REuDtdo7c_9bLN1m>JF6*2UngI6`dwc)@ literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/moon.png b/graphics/interface/ball/moon.png new file mode 100644 index 0000000000000000000000000000000000000000..beb1016f4d6fee2e31f3c79fe2bbbf7d1ed3d04f GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>pbXQt_0itm^9SIbKKK zIZjzK=l}n`YqGwbb^QNq2~Z&rI668)7|&~$-378vc)B=-NKBpDXUNy&AmF<4%{GON zN*f!wXGG*LO5>WX+iAA#NLv*D0ZyLjAIu&!-QC~)C($q~XHHsN+4J*zG=7CTyjZ?^ zl4joRHHvS9JvsaT1T8OXu(Q7>I$^usxBxd-x3GtNQZ#$}0;*fdl$0SXrVAX@h zj~n=Qu?4s?3--)5%rlwu(AzjuL!$2EieGCMXMCDiK3`p6UTI|TwKzVI?>t@oT-G@y GGywpHmWZtY literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/park.png b/graphics/interface/ball/park.png new file mode 100644 index 0000000000000000000000000000000000000000..9b526f52455bd52c8a296942179814cf56adc8d9 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>pcCW7gh#XC03&(foF= zdrh;#w`RlUq$Hq{?(S|!M@Jw74&FX_-U{UG^K@|xk(fHQ&ycUlLBQ2~TXbSla;h1d z&T}-nZ!(hI<71|QyyfZY=d#Wzp$PzcOL~6* literal 0 HcmV?d00001 diff --git a/graphics/interface/ball/quick.png b/graphics/interface/ball/quick.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5dfccb9c6c825f538dfaba5f213a4d1afc8200 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>t<74`c=fC3z*y@oK)> zeD>S_dxmG%D6DB#XiiG%?(TMUbcCn@Dgy#*arr(Vb;Q%fF+^hO)V_^e%?1K(t$mf; z*Y#w%BboWuJ`D*J#!jy%y!L zdH$j93sRPGR;>&<7%q`wXH~K4Xh`+1u5{t$COV%2cZ96m;_d3eRWtv``dMmAHXrHs zT>JiA%ev+42P5>;R(T#SI_=q0c)%)sjcd|j=@~5R?0L6-`^#}>#e0pq1tN?~EgF~h zFs7Yac=XpDpWBD>+wPwTTJYY^R3@g$U##ZJvh&pc?lxD~OS1sRlJD$zb z{J*97|K24)`6*MTI66848OWgELh*4Rf19U^V~E7mseOighYWaJjSVVKGc9_qVLdfU zapShgqV9Vv$5OHycz!N#c`v52#EV0}&g;$l^fOV6-ttzelE-fOwp?EKl4Gar>vO`t zUcKWe(6sVXpVDz6F?#BP=x}Kf9;XA}JO95@-j*x2aaoxB%he?ThVzq_o!9;ShVxP5 zne|QKuBI^#Ivf6HzPNKIdO_;_g1;wpnYN#6VJ}w-SYX(|#>xCV Date: Sun, 14 Apr 2019 23:00:03 +0100 Subject: [PATCH 05/52] Decap existing item names --- src/data/items.h | 508 +++++++++++++++++++++++------------------------ 1 file changed, 254 insertions(+), 254 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 9d45db8f5..54036befa 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -16,7 +16,7 @@ const struct Item gItems[] = [ITEM_MASTER_BALL] = { - .name = _("MASTER BALL"), + .name = _("Master Ball"), .itemId = ITEM_MASTER_BALL, .price = 0, .description = gMasterBallItemDescription, @@ -30,7 +30,7 @@ const struct Item gItems[] = [ITEM_ULTRA_BALL] = { - .name = _("ULTRA BALL"), + .name = _("Ultra Ball"), .itemId = ITEM_ULTRA_BALL, .price = 1200, .description = gUltraBallItemDescription, @@ -44,7 +44,7 @@ const struct Item gItems[] = [ITEM_GREAT_BALL] = { - .name = _("GREAT BALL"), + .name = _("Great Ball"), .itemId = ITEM_GREAT_BALL, .price = 600, .description = gGreatBallItemDescription, @@ -58,7 +58,7 @@ const struct Item gItems[] = [ITEM_POKE_BALL] = { - .name = _("POKé BALL"), + .name = _("Poké Ball"), .itemId = ITEM_POKE_BALL, .price = 200, .description = gPokeBallItemDescription, @@ -72,7 +72,7 @@ const struct Item gItems[] = [ITEM_SAFARI_BALL] = { - .name = _("SAFARI BALL"), + .name = _("Safari Ball"), .itemId = ITEM_SAFARI_BALL, .price = 0, .description = gSafariBallItemDescription, @@ -86,7 +86,7 @@ const struct Item gItems[] = [ITEM_NET_BALL] = { - .name = _("NET BALL"), + .name = _("Net Ball"), .itemId = ITEM_NET_BALL, .price = 1000, .description = gNetBallItemDescription, @@ -100,7 +100,7 @@ const struct Item gItems[] = [ITEM_DIVE_BALL] = { - .name = _("DIVE BALL"), + .name = _("Dive Ball"), .itemId = ITEM_DIVE_BALL, .price = 1000, .description = gDiveBallItemDescription, @@ -114,7 +114,7 @@ const struct Item gItems[] = [ITEM_NEST_BALL] = { - .name = _("NEST BALL"), + .name = _("Nest Ball"), .itemId = ITEM_NEST_BALL, .price = 1000, .description = gNestBallItemDescription, @@ -128,7 +128,7 @@ const struct Item gItems[] = [ITEM_REPEAT_BALL] = { - .name = _("REPEAT BALL"), + .name = _("Repeat Ball"), .itemId = ITEM_REPEAT_BALL, .price = 1000, .description = gRepeatBallItemDescription, @@ -142,7 +142,7 @@ const struct Item gItems[] = [ITEM_TIMER_BALL] = { - .name = _("TIMER BALL"), + .name = _("Timer Ball"), .itemId = ITEM_TIMER_BALL, .price = 1000, .description = gTimerBallItemDescription, @@ -156,7 +156,7 @@ const struct Item gItems[] = [ITEM_LUXURY_BALL] = { - .name = _("LUXURY BALL"), + .name = _("Luxury Ball"), .itemId = ITEM_LUXURY_BALL, .price = 1000, .description = gLuxuryBallItemDescription, @@ -170,7 +170,7 @@ const struct Item gItems[] = [ITEM_PREMIER_BALL] = { - .name = _("PREMIER BALL"), + .name = _("Premier Ball"), .itemId = ITEM_PREMIER_BALL, .price = 200, .description = gPremierBallItemDescription, @@ -182,8 +182,8 @@ const struct Item gItems[] = .secondaryId = 11, }, - [ITEM_LEVEL_BALL] = - { + [ITEM_LEVEL_BALL] = + { .name = _("Level Ball"), .itemId = ITEM_LEVEL_BALL, .price = 2000, @@ -334,13 +334,13 @@ const struct Item gItems[] = .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 22, - }, + }, // Medicine [ITEM_POTION] = { - .name = _("POTION"), + .name = _("Potion"), .itemId = ITEM_POTION, .price = 300, .holdEffectParam = 20, @@ -355,7 +355,7 @@ const struct Item gItems[] = [ITEM_ANTIDOTE] = { - .name = _("ANTIDOTE"), + .name = _("Antidote"), .itemId = ITEM_ANTIDOTE, .price = 100, .description = gAntidoteItemDescription, @@ -369,7 +369,7 @@ const struct Item gItems[] = [ITEM_BURN_HEAL] = { - .name = _("BURN HEAL"), + .name = _("Burn Heal"), .itemId = ITEM_BURN_HEAL, .price = 250, .description = gBurnHealItemDescription, @@ -383,7 +383,7 @@ const struct Item gItems[] = [ITEM_ICE_HEAL] = { - .name = _("ICE HEAL"), + .name = _("Ice Heal"), .itemId = ITEM_ICE_HEAL, .price = 250, .description = gIceHealItemDescription, @@ -397,7 +397,7 @@ const struct Item gItems[] = [ITEM_AWAKENING] = { - .name = _("AWAKENING"), + .name = _("Awakening"), .itemId = ITEM_AWAKENING, .price = 250, .description = gAwakeningItemDescription, @@ -411,7 +411,7 @@ const struct Item gItems[] = [ITEM_PARALYZE_HEAL] = { - .name = _("PARLYZ HEAL"), + .name = _("Parlyz Heal"), .itemId = ITEM_PARALYZE_HEAL, .price = 200, .description = gParalyzeHealItemDescription, @@ -425,7 +425,7 @@ const struct Item gItems[] = [ITEM_FULL_RESTORE] = { - .name = _("FULL RESTORE"), + .name = _("Full Restore"), .itemId = ITEM_FULL_RESTORE, .price = 3000, .holdEffectParam = 255, @@ -440,7 +440,7 @@ const struct Item gItems[] = [ITEM_MAX_POTION] = { - .name = _("MAX POTION"), + .name = _("Max Potion"), .itemId = ITEM_MAX_POTION, .price = 2500, .holdEffectParam = 255, @@ -455,7 +455,7 @@ const struct Item gItems[] = [ITEM_HYPER_POTION] = { - .name = _("HYPER POTION"), + .name = _("Hyper Potion"), .itemId = ITEM_HYPER_POTION, .price = 1200, .holdEffectParam = 200, @@ -470,7 +470,7 @@ const struct Item gItems[] = [ITEM_SUPER_POTION] = { - .name = _("SUPER POTION"), + .name = _("Super Potion"), .itemId = ITEM_SUPER_POTION, .price = 700, .holdEffectParam = 50, @@ -485,7 +485,7 @@ const struct Item gItems[] = [ITEM_FULL_HEAL] = { - .name = _("FULL HEAL"), + .name = _("Full Heal"), .itemId = ITEM_FULL_HEAL, .price = 600, .description = gFullHealItemDescription, @@ -499,7 +499,7 @@ const struct Item gItems[] = [ITEM_REVIVE] = { - .name = _("REVIVE"), + .name = _("Revive"), .itemId = ITEM_REVIVE, .price = 1500, .description = gReviveItemDescription, @@ -513,7 +513,7 @@ const struct Item gItems[] = [ITEM_MAX_REVIVE] = { - .name = _("MAX REVIVE"), + .name = _("Max Revive"), .itemId = ITEM_MAX_REVIVE, .price = 4000, .description = gMaxReviveItemDescription, @@ -527,7 +527,7 @@ const struct Item gItems[] = [ITEM_FRESH_WATER] = { - .name = _("FRESH WATER"), + .name = _("Fresh Water"), .itemId = ITEM_FRESH_WATER, .price = 200, .holdEffectParam = 50, @@ -542,7 +542,7 @@ const struct Item gItems[] = [ITEM_SODA_POP] = { - .name = _("SODA POP"), + .name = _("Soda Pop"), .itemId = ITEM_SODA_POP, .price = 300, .holdEffectParam = 60, @@ -557,7 +557,7 @@ const struct Item gItems[] = [ITEM_LEMONADE] = { - .name = _("LEMONADE"), + .name = _("Lemonade"), .itemId = ITEM_LEMONADE, .price = 350, .holdEffectParam = 80, @@ -572,7 +572,7 @@ const struct Item gItems[] = [ITEM_MOOMOO_MILK] = { - .name = _("MOOMOO MILK"), + .name = _("Moomoo Milk"), .itemId = ITEM_MOOMOO_MILK, .price = 500, .holdEffectParam = 100, @@ -587,7 +587,7 @@ const struct Item gItems[] = [ITEM_ENERGY_POWDER] = { - .name = _("ENERGYPOWDER"), + .name = _("Energypowder"), .itemId = ITEM_ENERGY_POWDER, .price = 500, .description = gEnergyPowderItemDescription, @@ -601,7 +601,7 @@ const struct Item gItems[] = [ITEM_ENERGY_ROOT] = { - .name = _("ENERGY ROOT"), + .name = _("Energy Root"), .itemId = ITEM_ENERGY_ROOT, .price = 800, .description = gEnergyRootItemDescription, @@ -615,7 +615,7 @@ const struct Item gItems[] = [ITEM_HEAL_POWDER] = { - .name = _("HEAL POWDER"), + .name = _("Heal Powder"), .itemId = ITEM_HEAL_POWDER, .price = 450, .description = gHealPowderItemDescription, @@ -629,7 +629,7 @@ const struct Item gItems[] = [ITEM_REVIVAL_HERB] = { - .name = _("REVIVAL HERB"), + .name = _("Revival Herb"), .itemId = ITEM_REVIVAL_HERB, .price = 2800, .description = gRevivalHerbItemDescription, @@ -643,7 +643,7 @@ const struct Item gItems[] = [ITEM_ETHER] = { - .name = _("ETHER"), + .name = _("Ether"), .itemId = ITEM_ETHER, .price = 1200, .holdEffectParam = 10, @@ -658,7 +658,7 @@ const struct Item gItems[] = [ITEM_MAX_ETHER] = { - .name = _("MAX ETHER"), + .name = _("Max Ether"), .itemId = ITEM_MAX_ETHER, .price = 2000, .holdEffectParam = 255, @@ -673,7 +673,7 @@ const struct Item gItems[] = [ITEM_ELIXIR] = { - .name = _("ELIXIR"), + .name = _("Elixir"), .itemId = ITEM_ELIXIR, .price = 3000, .holdEffectParam = 10, @@ -688,7 +688,7 @@ const struct Item gItems[] = [ITEM_MAX_ELIXIR] = { - .name = _("MAX ELIXIR"), + .name = _("Max Elixir"), .itemId = ITEM_MAX_ELIXIR, .price = 4500, .holdEffectParam = 255, @@ -703,7 +703,7 @@ const struct Item gItems[] = [ITEM_LAVA_COOKIE] = { - .name = _("LAVA COOKIE"), + .name = _("Lava Cookie"), .itemId = ITEM_LAVA_COOKIE, .price = 200, .description = gLavaCookieItemDescription, @@ -717,7 +717,7 @@ const struct Item gItems[] = [ITEM_BLUE_FLUTE] = { - .name = _("BLUE FLUTE"), + .name = _("Blue Flute"), .itemId = ITEM_BLUE_FLUTE, .price = 100, .description = gBlueFluteItemDescription, @@ -731,7 +731,7 @@ const struct Item gItems[] = [ITEM_YELLOW_FLUTE] = { - .name = _("YELLOW FLUTE"), + .name = _("Yellow Flute"), .itemId = ITEM_YELLOW_FLUTE, .price = 200, .description = gYellowFluteItemDescription, @@ -745,7 +745,7 @@ const struct Item gItems[] = [ITEM_RED_FLUTE] = { - .name = _("RED FLUTE"), + .name = _("Red Flute"), .itemId = ITEM_RED_FLUTE, .price = 300, .description = gRedFluteItemDescription, @@ -759,7 +759,7 @@ const struct Item gItems[] = [ITEM_BLACK_FLUTE] = { - .name = _("BLACK FLUTE"), + .name = _("Black Flute"), .itemId = ITEM_BLACK_FLUTE, .price = 400, .holdEffectParam = 50, @@ -772,7 +772,7 @@ const struct Item gItems[] = [ITEM_WHITE_FLUTE] = { - .name = _("WHITE FLUTE"), + .name = _("White Flute"), .itemId = ITEM_WHITE_FLUTE, .price = 500, .holdEffectParam = 150, @@ -785,7 +785,7 @@ const struct Item gItems[] = [ITEM_BERRY_JUICE] = { - .name = _("BERRY JUICE"), + .name = _("Berry Juice"), .itemId = ITEM_BERRY_JUICE, .price = 100, .holdEffect = HOLD_EFFECT_RESTORE_HP, @@ -801,7 +801,7 @@ const struct Item gItems[] = [ITEM_SACRED_ASH] = { - .name = _("SACRED ASH"), + .name = _("Sacred Ash"), .itemId = ITEM_SACRED_ASH, .price = 200, .description = gSacredAshItemDescription, @@ -815,7 +815,7 @@ const struct Item gItems[] = [ITEM_SHOAL_SALT] = { - .name = _("SHOAL SALT"), + .name = _("Shoal Salt"), .itemId = ITEM_SHOAL_SALT, .price = 20, .description = gShoalSaltItemDescription, @@ -827,7 +827,7 @@ const struct Item gItems[] = [ITEM_SHOAL_SHELL] = { - .name = _("SHOAL SHELL"), + .name = _("Shoal Shell"), .itemId = ITEM_SHOAL_SHELL, .price = 20, .description = gShoalShellItemDescription, @@ -839,7 +839,7 @@ const struct Item gItems[] = [ITEM_RED_SHARD] = { - .name = _("RED SHARD"), + .name = _("Red Shard"), .itemId = ITEM_RED_SHARD, .price = 200, .description = gRedShardItemDescription, @@ -851,7 +851,7 @@ const struct Item gItems[] = [ITEM_BLUE_SHARD] = { - .name = _("BLUE SHARD"), + .name = _("Blue Shard"), .itemId = ITEM_BLUE_SHARD, .price = 200, .description = gBlueShardItemDescription, @@ -863,7 +863,7 @@ const struct Item gItems[] = [ITEM_YELLOW_SHARD] = { - .name = _("YELLOW SHARD"), + .name = _("Yellow Shard"), .itemId = ITEM_YELLOW_SHARD, .price = 200, .description = gYellowShardItemDescription, @@ -875,7 +875,7 @@ const struct Item gItems[] = [ITEM_GREEN_SHARD] = { - .name = _("GREEN SHARD"), + .name = _("Green Shard"), .itemId = ITEM_GREEN_SHARD, .price = 200, .description = gGreenShardItemDescription, @@ -889,7 +889,7 @@ const struct Item gItems[] = [ITEM_HP_UP] = { - .name = _("HP UP"), + .name = _("HP Up"), .itemId = ITEM_HP_UP, .price = 9800, .description = gHPUpItemDescription, @@ -901,7 +901,7 @@ const struct Item gItems[] = [ITEM_PROTEIN] = { - .name = _("PROTEIN"), + .name = _("Protein"), .itemId = ITEM_PROTEIN, .price = 9800, .description = gProteinItemDescription, @@ -913,7 +913,7 @@ const struct Item gItems[] = [ITEM_IRON] = { - .name = _("IRON"), + .name = _("Iron"), .itemId = ITEM_IRON, .price = 9800, .description = gIronItemDescription, @@ -925,7 +925,7 @@ const struct Item gItems[] = [ITEM_CARBOS] = { - .name = _("CARBOS"), + .name = _("Carbos"), .itemId = ITEM_CARBOS, .price = 9800, .description = gCarbosItemDescription, @@ -937,7 +937,7 @@ const struct Item gItems[] = [ITEM_CALCIUM] = { - .name = _("CALCIUM"), + .name = _("Calcium"), .itemId = ITEM_CALCIUM, .price = 9800, .description = gCalciumItemDescription, @@ -949,7 +949,7 @@ const struct Item gItems[] = [ITEM_RARE_CANDY] = { - .name = _("RARE CANDY"), + .name = _("Rare Candy"), .itemId = ITEM_RARE_CANDY, .price = 4800, .description = gRareCandyItemDescription, @@ -961,7 +961,7 @@ const struct Item gItems[] = [ITEM_PP_UP] = { - .name = _("PP UP"), + .name = _("PP Up"), .itemId = ITEM_PP_UP, .price = 9800, .description = gPPUpItemDescription, @@ -973,7 +973,7 @@ const struct Item gItems[] = [ITEM_ZINC] = { - .name = _("ZINC"), + .name = _("Zinc"), .itemId = ITEM_ZINC, .price = 9800, .description = gZincItemDescription, @@ -985,7 +985,7 @@ const struct Item gItems[] = [ITEM_PP_MAX] = { - .name = _("PP MAX"), + .name = _("PP Max"), .itemId = ITEM_PP_MAX, .price = 9800, .description = gPPMaxItemDescription, @@ -999,7 +999,7 @@ const struct Item gItems[] = [ITEM_GUARD_SPEC] = { - .name = _("GUARD SPEC."), + .name = _("Guard Spec."), .itemId = ITEM_GUARD_SPEC, .price = 700, .description = gGuardSpecItemDescription, @@ -1013,7 +1013,7 @@ const struct Item gItems[] = [ITEM_DIRE_HIT] = { - .name = _("DIRE HIT"), + .name = _("Dire Hit"), .itemId = ITEM_DIRE_HIT, .price = 650, .description = gDireHitItemDescription, @@ -1027,7 +1027,7 @@ const struct Item gItems[] = [ITEM_X_ATTACK] = { - .name = _("X ATTACK"), + .name = _("X Attack"), .itemId = ITEM_X_ATTACK, .price = 500, .description = gXAttackItemDescription, @@ -1041,7 +1041,7 @@ const struct Item gItems[] = [ITEM_X_DEFENSE] = { - .name = _("X DEFEND"), + .name = _("X Defend"), .itemId = ITEM_X_DEFENSE, .price = 550, .description = gXDefendItemDescription, @@ -1055,7 +1055,7 @@ const struct Item gItems[] = [ITEM_X_SPEED] = { - .name = _("X SPEED"), + .name = _("X Speed"), .itemId = ITEM_X_SPEED, .price = 350, .description = gXSpeedItemDescription, @@ -1069,7 +1069,7 @@ const struct Item gItems[] = [ITEM_X_ACCURACY] = { - .name = _("X ACCURACY"), + .name = _("X Accuracy"), .itemId = ITEM_X_ACCURACY, .price = 950, .description = gXAccuracyItemDescription, @@ -1083,7 +1083,7 @@ const struct Item gItems[] = [ITEM_X_SP_ATK] = { - .name = _("X SPECIAL"), + .name = _("X Special"), .itemId = ITEM_X_SP_ATK, .price = 350, .description = gXSpecialItemDescription, @@ -1097,7 +1097,7 @@ const struct Item gItems[] = [ITEM_POKE_DOLL] = { - .name = _("POKé DOLL"), + .name = _("Poké Doll"), .itemId = ITEM_POKE_DOLL, .price = 1000, .description = gPokeDollItemDescription, @@ -1111,7 +1111,7 @@ const struct Item gItems[] = [ITEM_FLUFFY_TAIL] = { - .name = _("FLUFFY TAIL"), + .name = _("Fluffy Tail"), .itemId = ITEM_FLUFFY_TAIL, .price = 1000, .description = gFluffyTailItemDescription, @@ -1127,7 +1127,7 @@ const struct Item gItems[] = [ITEM_SUPER_REPEL] = { - .name = _("SUPER REPEL"), + .name = _("Super Repel"), .itemId = ITEM_SUPER_REPEL, .price = 500, .holdEffectParam = 200, @@ -1140,7 +1140,7 @@ const struct Item gItems[] = [ITEM_MAX_REPEL] = { - .name = _("MAX REPEL"), + .name = _("Max Repel"), .itemId = ITEM_MAX_REPEL, .price = 700, .holdEffectParam = 250, @@ -1153,7 +1153,7 @@ const struct Item gItems[] = [ITEM_ESCAPE_ROPE] = { - .name = _("ESCAPE ROPE"), + .name = _("Escape Rope"), .itemId = ITEM_ESCAPE_ROPE, .price = 550, .description = gEscapeRopeItemDescription, @@ -1165,7 +1165,7 @@ const struct Item gItems[] = [ITEM_REPEL] = { - .name = _("REPEL"), + .name = _("Repel"), .itemId = ITEM_REPEL, .price = 350, .holdEffectParam = 100, @@ -1180,7 +1180,7 @@ const struct Item gItems[] = [ITEM_SUN_STONE] = { - .name = _("SUN STONE"), + .name = _("Sun Stone"), .itemId = ITEM_SUN_STONE, .price = 2100, .description = gSunStoneItemDescription, @@ -1192,7 +1192,7 @@ const struct Item gItems[] = [ITEM_MOON_STONE] = { - .name = _("MOON STONE"), + .name = _("Moon Stone"), .itemId = ITEM_MOON_STONE, .price = 0, .description = gMoonStoneItemDescription, @@ -1204,7 +1204,7 @@ const struct Item gItems[] = [ITEM_FIRE_STONE] = { - .name = _("FIRE STONE"), + .name = _("Fire Stone"), .itemId = ITEM_FIRE_STONE, .price = 2100, .description = gFireStoneItemDescription, @@ -1216,7 +1216,7 @@ const struct Item gItems[] = [ITEM_THUNDER_STONE] = { - .name = _("THUNDERSTONE"), + .name = _("ThunderStone"), .itemId = ITEM_THUNDER_STONE, .price = 2100, .description = gThunderStoneItemDescription, @@ -1228,7 +1228,7 @@ const struct Item gItems[] = [ITEM_WATER_STONE] = { - .name = _("WATER STONE"), + .name = _("Water Stone"), .itemId = ITEM_WATER_STONE, .price = 2100, .description = gWaterStoneItemDescription, @@ -1240,7 +1240,7 @@ const struct Item gItems[] = [ITEM_LEAF_STONE] = { - .name = _("LEAF STONE"), + .name = _("Leaf Stone"), .itemId = ITEM_LEAF_STONE, .price = 2100, .description = gLeafStoneItemDescription, @@ -1254,7 +1254,7 @@ const struct Item gItems[] = [ITEM_TINY_MUSHROOM] = { - .name = _("TINYMUSHROOM"), + .name = _("TinyMushroom"), .itemId = ITEM_TINY_MUSHROOM, .price = 500, .description = gTinyMushroomItemDescription, @@ -1266,7 +1266,7 @@ const struct Item gItems[] = [ITEM_BIG_MUSHROOM] = { - .name = _("BIG MUSHROOM"), + .name = _("Big Mushroom"), .itemId = ITEM_BIG_MUSHROOM, .price = 5000, .description = gBigMushroomItemDescription, @@ -1278,7 +1278,7 @@ const struct Item gItems[] = [ITEM_PEARL] = { - .name = _("PEARL"), + .name = _("Pearl"), .itemId = ITEM_PEARL, .price = 1400, .description = gPearlItemDescription, @@ -1290,7 +1290,7 @@ const struct Item gItems[] = [ITEM_BIG_PEARL] = { - .name = _("BIG PEARL"), + .name = _("Big Pearl"), .itemId = ITEM_BIG_PEARL, .price = 7500, .description = gBigPearlItemDescription, @@ -1302,7 +1302,7 @@ const struct Item gItems[] = [ITEM_STARDUST] = { - .name = _("STARDUST"), + .name = _("Stardust"), .itemId = ITEM_STARDUST, .price = 2000, .description = gStardustItemDescription, @@ -1314,7 +1314,7 @@ const struct Item gItems[] = [ITEM_STAR_PIECE] = { - .name = _("STAR PIECE"), + .name = _("Star Piece"), .itemId = ITEM_STAR_PIECE, .price = 9800, .description = gStarPieceItemDescription, @@ -1326,7 +1326,7 @@ const struct Item gItems[] = [ITEM_NUGGET] = { - .name = _("NUGGET"), + .name = _("Nugget"), .itemId = ITEM_NUGGET, .price = 10000, .description = gNuggetItemDescription, @@ -1338,7 +1338,7 @@ const struct Item gItems[] = [ITEM_HEART_SCALE] = { - .name = _("HEART SCALE"), + .name = _("Heart Scale"), .itemId = ITEM_HEART_SCALE, .price = 100, .description = gHeartScaleItemDescription, @@ -1351,7 +1351,7 @@ const struct Item gItems[] = // Mail [ITEM_ORANGE_MAIL] = { - .name = _("ORANGE MAIL"), + .name = _("Orange Mail"), .itemId = ITEM_ORANGE_MAIL, .price = 50, .description = gOrangeMailItemDescription, @@ -1363,7 +1363,7 @@ const struct Item gItems[] = [ITEM_HARBOR_MAIL] = { - .name = _("HARBOR MAIL"), + .name = _("Harbor Mail"), .itemId = ITEM_HARBOR_MAIL, .price = 50, .description = gHarborMailItemDescription, @@ -1375,7 +1375,7 @@ const struct Item gItems[] = [ITEM_GLITTER_MAIL] = { - .name = _("GLITTER MAIL"), + .name = _("Glitter Mail"), .itemId = ITEM_GLITTER_MAIL, .price = 50, .description = gGlitterMailItemDescription, @@ -1387,7 +1387,7 @@ const struct Item gItems[] = [ITEM_MECH_MAIL] = { - .name = _("MECH MAIL"), + .name = _("Mech Mail"), .itemId = ITEM_MECH_MAIL, .price = 50, .description = gMechMailItemDescription, @@ -1399,7 +1399,7 @@ const struct Item gItems[] = [ITEM_WOOD_MAIL] = { - .name = _("WOOD MAIL"), + .name = _("Wood Mail"), .itemId = ITEM_WOOD_MAIL, .price = 50, .description = gWoodMailItemDescription, @@ -1411,7 +1411,7 @@ const struct Item gItems[] = [ITEM_WAVE_MAIL] = { - .name = _("WAVE MAIL"), + .name = _("Wave Mail"), .itemId = ITEM_WAVE_MAIL, .price = 50, .description = gWaveMailItemDescription, @@ -1423,7 +1423,7 @@ const struct Item gItems[] = [ITEM_BEAD_MAIL] = { - .name = _("BEAD MAIL"), + .name = _("Bead Mail"), .itemId = ITEM_BEAD_MAIL, .price = 50, .description = gBeadMailItemDescription, @@ -1435,7 +1435,7 @@ const struct Item gItems[] = [ITEM_SHADOW_MAIL] = { - .name = _("SHADOW MAIL"), + .name = _("Shadow Mail"), .itemId = ITEM_SHADOW_MAIL, .price = 50, .description = gShadowMailItemDescription, @@ -1447,7 +1447,7 @@ const struct Item gItems[] = [ITEM_TROPIC_MAIL] = { - .name = _("TROPIC MAIL"), + .name = _("Tropic Mail"), .itemId = ITEM_TROPIC_MAIL, .price = 50, .description = gTropicMailItemDescription, @@ -1459,7 +1459,7 @@ const struct Item gItems[] = [ITEM_DREAM_MAIL] = { - .name = _("DREAM MAIL"), + .name = _("Dream Mail"), .itemId = ITEM_DREAM_MAIL, .price = 50, .description = gDreamMailItemDescription, @@ -1471,7 +1471,7 @@ const struct Item gItems[] = [ITEM_FAB_MAIL] = { - .name = _("FAB MAIL"), + .name = _("Fab Mail"), .itemId = ITEM_FAB_MAIL, .price = 50, .description = gFabMailItemDescription, @@ -1483,7 +1483,7 @@ const struct Item gItems[] = [ITEM_RETRO_MAIL] = { - .name = _("RETRO MAIL"), + .name = _("Retro Mail"), .itemId = ITEM_RETRO_MAIL, .price = 0, .description = gRetroMailItemDescription, @@ -1497,7 +1497,7 @@ const struct Item gItems[] = [ITEM_CHERI_BERRY] = { - .name = _("CHERI BERRY"), + .name = _("Cheri Berry"), .itemId = ITEM_CHERI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_PAR, @@ -1512,7 +1512,7 @@ const struct Item gItems[] = [ITEM_CHESTO_BERRY] = { - .name = _("CHESTO BERRY"), + .name = _("Chesto Berry"), .itemId = ITEM_CHESTO_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_SLP, @@ -1527,7 +1527,7 @@ const struct Item gItems[] = [ITEM_PECHA_BERRY] = { - .name = _("PECHA BERRY"), + .name = _("Pecha Berry"), .itemId = ITEM_PECHA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_PSN, @@ -1542,7 +1542,7 @@ const struct Item gItems[] = [ITEM_RAWST_BERRY] = { - .name = _("RAWST BERRY"), + .name = _("Rawst Berry"), .itemId = ITEM_RAWST_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_BRN, @@ -1557,7 +1557,7 @@ const struct Item gItems[] = [ITEM_ASPEAR_BERRY] = { - .name = _("ASPEAR BERRY"), + .name = _("Aspear Berry"), .itemId = ITEM_ASPEAR_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_FRZ, @@ -1572,7 +1572,7 @@ const struct Item gItems[] = [ITEM_LEPPA_BERRY] = { - .name = _("LEPPA BERRY"), + .name = _("Leppa Berry"), .itemId = ITEM_LEPPA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESTORE_PP, @@ -1588,7 +1588,7 @@ const struct Item gItems[] = [ITEM_ORAN_BERRY] = { - .name = _("ORAN BERRY"), + .name = _("Oran Berry"), .itemId = ITEM_ORAN_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESTORE_HP, @@ -1604,7 +1604,7 @@ const struct Item gItems[] = [ITEM_PERSIM_BERRY] = { - .name = _("PERSIM BERRY"), + .name = _("Persim Berry"), .itemId = ITEM_PERSIM_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_CONFUSION, @@ -1619,7 +1619,7 @@ const struct Item gItems[] = [ITEM_LUM_BERRY] = { - .name = _("LUM BERRY"), + .name = _("Lum Berry"), .itemId = ITEM_LUM_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_STATUS, @@ -1634,7 +1634,7 @@ const struct Item gItems[] = [ITEM_SITRUS_BERRY] = { - .name = _("SITRUS BERRY"), + .name = _("Sitrus Berry"), .itemId = ITEM_SITRUS_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESTORE_HP, @@ -1650,7 +1650,7 @@ const struct Item gItems[] = [ITEM_FIGY_BERRY] = { - .name = _("FIGY BERRY"), + .name = _("Figy Berry"), .itemId = ITEM_FIGY_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CONFUSE_SPICY, @@ -1664,7 +1664,7 @@ const struct Item gItems[] = [ITEM_WIKI_BERRY] = { - .name = _("WIKI BERRY"), + .name = _("Wiki Berry"), .itemId = ITEM_WIKI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CONFUSE_DRY, @@ -1678,7 +1678,7 @@ const struct Item gItems[] = [ITEM_MAGO_BERRY] = { - .name = _("MAGO BERRY"), + .name = _("Mago Berry"), .itemId = ITEM_MAGO_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CONFUSE_SWEET, @@ -1692,7 +1692,7 @@ const struct Item gItems[] = [ITEM_AGUAV_BERRY] = { - .name = _("AGUAV BERRY"), + .name = _("Aguav Berry"), .itemId = ITEM_AGUAV_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CONFUSE_BITTER, @@ -1706,7 +1706,7 @@ const struct Item gItems[] = [ITEM_IAPAPA_BERRY] = { - .name = _("IAPAPA BERRY"), + .name = _("Iapapa Berry"), .itemId = ITEM_IAPAPA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CONFUSE_SOUR, @@ -1720,7 +1720,7 @@ const struct Item gItems[] = [ITEM_RAZZ_BERRY] = { - .name = _("RAZZ BERRY"), + .name = _("Razz Berry"), .itemId = ITEM_RAZZ_BERRY, .price = 20, .description = gRazzBerryItemDescription, @@ -1732,7 +1732,7 @@ const struct Item gItems[] = [ITEM_BLUK_BERRY] = { - .name = _("BLUK BERRY"), + .name = _("Bluk Berry"), .itemId = ITEM_BLUK_BERRY, .price = 20, .description = gBlukBerryItemDescription, @@ -1744,7 +1744,7 @@ const struct Item gItems[] = [ITEM_NANAB_BERRY] = { - .name = _("NANAB BERRY"), + .name = _("Nanab Berry"), .itemId = ITEM_NANAB_BERRY, .price = 20, .description = gNanabBerryItemDescription, @@ -1756,7 +1756,7 @@ const struct Item gItems[] = [ITEM_WEPEAR_BERRY] = { - .name = _("WEPEAR BERRY"), + .name = _("Wepear Berry"), .itemId = ITEM_WEPEAR_BERRY, .price = 20, .description = gWepearBerryItemDescription, @@ -1768,7 +1768,7 @@ const struct Item gItems[] = [ITEM_PINAP_BERRY] = { - .name = _("PINAP BERRY"), + .name = _("Pinap Berry"), .itemId = ITEM_PINAP_BERRY, .price = 20, .description = gPinapBerryItemDescription, @@ -1780,7 +1780,7 @@ const struct Item gItems[] = [ITEM_POMEG_BERRY] = { - .name = _("POMEG BERRY"), + .name = _("Pomeg Berry"), .itemId = ITEM_POMEG_BERRY, .price = 20, .description = gPomegBerryItemDescription, @@ -1792,7 +1792,7 @@ const struct Item gItems[] = [ITEM_KELPSY_BERRY] = { - .name = _("KELPSY BERRY"), + .name = _("Kelpsy Berry"), .itemId = ITEM_KELPSY_BERRY, .price = 20, .description = gKelpsyBerryItemDescription, @@ -1804,7 +1804,7 @@ const struct Item gItems[] = [ITEM_QUALOT_BERRY] = { - .name = _("QUALOT BERRY"), + .name = _("Qualot Berry"), .itemId = ITEM_QUALOT_BERRY, .price = 20, .description = gQualotBerryItemDescription, @@ -1816,7 +1816,7 @@ const struct Item gItems[] = [ITEM_HONDEW_BERRY] = { - .name = _("HONDEW BERRY"), + .name = _("Hondew Berry"), .itemId = ITEM_HONDEW_BERRY, .price = 20, .description = gHondewBerryItemDescription, @@ -1828,7 +1828,7 @@ const struct Item gItems[] = [ITEM_GREPA_BERRY] = { - .name = _("GREPA BERRY"), + .name = _("Grepa Berry"), .itemId = ITEM_GREPA_BERRY, .price = 20, .description = gGrepaBerryItemDescription, @@ -1840,7 +1840,7 @@ const struct Item gItems[] = [ITEM_TAMATO_BERRY] = { - .name = _("TAMATO BERRY"), + .name = _("Tamato Berry"), .itemId = ITEM_TAMATO_BERRY, .price = 20, .description = gTamatoBerryItemDescription, @@ -1852,7 +1852,7 @@ const struct Item gItems[] = [ITEM_CORNN_BERRY] = { - .name = _("CORNN BERRY"), + .name = _("Cornn Berry"), .itemId = ITEM_CORNN_BERRY, .price = 20, .description = gCornnBerryItemDescription, @@ -1864,7 +1864,7 @@ const struct Item gItems[] = [ITEM_MAGOST_BERRY] = { - .name = _("MAGOST BERRY"), + .name = _("Magost Berry"), .itemId = ITEM_MAGOST_BERRY, .price = 20, .description = gMagostBerryItemDescription, @@ -1876,7 +1876,7 @@ const struct Item gItems[] = [ITEM_RABUTA_BERRY] = { - .name = _("RABUTA BERRY"), + .name = _("Rabuta Berry"), .itemId = ITEM_RABUTA_BERRY, .price = 20, .description = gRabutaBerryItemDescription, @@ -1888,7 +1888,7 @@ const struct Item gItems[] = [ITEM_NOMEL_BERRY] = { - .name = _("NOMEL BERRY"), + .name = _("Nomel Berry"), .itemId = ITEM_NOMEL_BERRY, .price = 20, .description = gNomelBerryItemDescription, @@ -1900,7 +1900,7 @@ const struct Item gItems[] = [ITEM_SPELON_BERRY] = { - .name = _("SPELON BERRY"), + .name = _("Spelon Berry"), .itemId = ITEM_SPELON_BERRY, .price = 20, .description = gSpelonBerryItemDescription, @@ -1912,7 +1912,7 @@ const struct Item gItems[] = [ITEM_PAMTRE_BERRY] = { - .name = _("PAMTRE BERRY"), + .name = _("Pamtre Berry"), .itemId = ITEM_PAMTRE_BERRY, .price = 20, .description = gPamtreBerryItemDescription, @@ -1924,7 +1924,7 @@ const struct Item gItems[] = [ITEM_WATMEL_BERRY] = { - .name = _("WATMEL BERRY"), + .name = _("Watmel Berry"), .itemId = ITEM_WATMEL_BERRY, .price = 20, .description = gWatmelBerryItemDescription, @@ -1936,7 +1936,7 @@ const struct Item gItems[] = [ITEM_DURIN_BERRY] = { - .name = _("DURIN BERRY"), + .name = _("Durin Berry"), .itemId = ITEM_DURIN_BERRY, .price = 20, .description = gDurinBerryItemDescription, @@ -1948,7 +1948,7 @@ const struct Item gItems[] = [ITEM_BELUE_BERRY] = { - .name = _("BELUE BERRY"), + .name = _("Belue Berry"), .itemId = ITEM_BELUE_BERRY, .price = 20, .description = gBelueBerryItemDescription, @@ -1960,7 +1960,7 @@ const struct Item gItems[] = [ITEM_LIECHI_BERRY] = { - .name = _("LIECHI BERRY"), + .name = _("Liechi Berry"), .itemId = ITEM_LIECHI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_ATTACK_UP, @@ -1974,7 +1974,7 @@ const struct Item gItems[] = [ITEM_GANLON_BERRY] = { - .name = _("GANLON BERRY"), + .name = _("Ganlon Berry"), .itemId = ITEM_GANLON_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_DEFENSE_UP, @@ -1988,7 +1988,7 @@ const struct Item gItems[] = [ITEM_SALAC_BERRY] = { - .name = _("SALAC BERRY"), + .name = _("Salac Berry"), .itemId = ITEM_SALAC_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_SPEED_UP, @@ -2002,7 +2002,7 @@ const struct Item gItems[] = [ITEM_PETAYA_BERRY] = { - .name = _("PETAYA BERRY"), + .name = _("Petaya Berry"), .itemId = ITEM_PETAYA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_SP_ATTACK_UP, @@ -2016,7 +2016,7 @@ const struct Item gItems[] = [ITEM_APICOT_BERRY] = { - .name = _("APICOT BERRY"), + .name = _("Apicot Berry"), .itemId = ITEM_APICOT_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_SP_DEFENSE_UP, @@ -2030,7 +2030,7 @@ const struct Item gItems[] = [ITEM_LANSAT_BERRY] = { - .name = _("LANSAT BERRY"), + .name = _("Lansat Berry"), .itemId = ITEM_LANSAT_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CRITICAL_UP, @@ -2044,7 +2044,7 @@ const struct Item gItems[] = [ITEM_STARF_BERRY] = { - .name = _("STARF BERRY"), + .name = _("Starf Berry"), .itemId = ITEM_STARF_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RANDOM_STAT_UP, @@ -2058,7 +2058,7 @@ const struct Item gItems[] = [ITEM_ENIGMA_BERRY] = { - .name = _("ENIGMA BERRY"), + .name = _("Enigma Berry"), .itemId = ITEM_ENIGMA_BERRY, .price = 20, .description = gEnigmaBerryItemDescription, @@ -2074,7 +2074,7 @@ const struct Item gItems[] = [ITEM_BRIGHT_POWDER] = { - .name = _("BRIGHTPOWDER"), + .name = _("BrightPowder"), .itemId = ITEM_BRIGHT_POWDER, .price = 10, .holdEffect = HOLD_EFFECT_EVASION_UP, @@ -2088,7 +2088,7 @@ const struct Item gItems[] = [ITEM_WHITE_HERB] = { - .name = _("WHITE HERB"), + .name = _("White Herb"), .itemId = ITEM_WHITE_HERB, .price = 100, .holdEffect = HOLD_EFFECT_RESTORE_STATS, @@ -2101,7 +2101,7 @@ const struct Item gItems[] = [ITEM_MACHO_BRACE] = { - .name = _("MACHO BRACE"), + .name = _("Macho Brace"), .itemId = ITEM_MACHO_BRACE, .price = 3000, .holdEffect = HOLD_EFFECT_MACHO_BRACE, @@ -2114,7 +2114,7 @@ const struct Item gItems[] = [ITEM_EXP_SHARE] = { - .name = _("EXP. SHARE"), + .name = _("Exp. Share"), .itemId = ITEM_EXP_SHARE, .price = 3000, .holdEffect = HOLD_EFFECT_EXP_SHARE, @@ -2127,7 +2127,7 @@ const struct Item gItems[] = [ITEM_QUICK_CLAW] = { - .name = _("QUICK CLAW"), + .name = _("Quick Claw"), .itemId = ITEM_QUICK_CLAW, .price = 100, .holdEffect = HOLD_EFFECT_QUICK_CLAW, @@ -2141,7 +2141,7 @@ const struct Item gItems[] = [ITEM_SOOTHE_BELL] = { - .name = _("SOOTHE BELL"), + .name = _("Soothe Bell"), .itemId = ITEM_SOOTHE_BELL, .price = 100, .holdEffect = HOLD_EFFECT_HAPPINESS_UP, @@ -2154,7 +2154,7 @@ const struct Item gItems[] = [ITEM_MENTAL_HERB] = { - .name = _("MENTAL HERB"), + .name = _("Mental Herb"), .itemId = ITEM_MENTAL_HERB, .price = 100, .holdEffect = HOLD_EFFECT_CURE_ATTRACT, @@ -2167,7 +2167,7 @@ const struct Item gItems[] = [ITEM_CHOICE_BAND] = { - .name = _("CHOICE BAND"), + .name = _("Choice Band"), .itemId = ITEM_CHOICE_BAND, .price = 100, .holdEffect = HOLD_EFFECT_CHOICE_BAND, @@ -2180,7 +2180,7 @@ const struct Item gItems[] = [ITEM_KINGS_ROCK] = { - .name = _("KING'S ROCK"), + .name = _("King's Rock"), .itemId = ITEM_KINGS_ROCK, .price = 100, .holdEffect = HOLD_EFFECT_FLINCH, @@ -2194,7 +2194,7 @@ const struct Item gItems[] = [ITEM_SILVER_POWDER] = { - .name = _("SILVERPOWDER"), + .name = _("SilverPowder"), .itemId = ITEM_SILVER_POWDER, .price = 100, .holdEffect = HOLD_EFFECT_BUG_POWER, @@ -2208,7 +2208,7 @@ const struct Item gItems[] = [ITEM_AMULET_COIN] = { - .name = _("AMULET COIN"), + .name = _("Amulet Coin"), .itemId = ITEM_AMULET_COIN, .price = 100, .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, @@ -2222,7 +2222,7 @@ const struct Item gItems[] = [ITEM_CLEANSE_TAG] = { - .name = _("CLEANSE TAG"), + .name = _("Cleanse Tag"), .itemId = ITEM_CLEANSE_TAG, .price = 200, .holdEffect = HOLD_EFFECT_REPEL, @@ -2235,7 +2235,7 @@ const struct Item gItems[] = [ITEM_SOUL_DEW] = { - .name = _("SOUL DEW"), + .name = _("Soul Dew"), .itemId = ITEM_SOUL_DEW, .price = 200, .holdEffect = HOLD_EFFECT_SOUL_DEW, @@ -2248,7 +2248,7 @@ const struct Item gItems[] = [ITEM_DEEP_SEA_TOOTH] = { - .name = _("DEEPSEATOOTH"), + .name = _("DeepSeaTooth"), .itemId = ITEM_DEEP_SEA_TOOTH, .price = 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH, @@ -2261,7 +2261,7 @@ const struct Item gItems[] = [ITEM_DEEP_SEA_SCALE] = { - .name = _("DEEPSEASCALE"), + .name = _("DeepSeaScale"), .itemId = ITEM_DEEP_SEA_SCALE, .price = 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE, @@ -2274,7 +2274,7 @@ const struct Item gItems[] = [ITEM_SMOKE_BALL] = { - .name = _("SMOKE BALL"), + .name = _("Smoke Ball"), .itemId = ITEM_SMOKE_BALL, .price = 200, .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN, @@ -2287,7 +2287,7 @@ const struct Item gItems[] = [ITEM_EVERSTONE] = { - .name = _("EVERSTONE"), + .name = _("Everstone"), .itemId = ITEM_EVERSTONE, .price = 200, .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE, @@ -2300,7 +2300,7 @@ const struct Item gItems[] = [ITEM_FOCUS_BAND] = { - .name = _("FOCUS BAND"), + .name = _("Focus Band"), .itemId = ITEM_FOCUS_BAND, .price = 200, .holdEffect = HOLD_EFFECT_FOCUS_BAND, @@ -2314,7 +2314,7 @@ const struct Item gItems[] = [ITEM_LUCKY_EGG] = { - .name = _("LUCKY EGG"), + .name = _("Lucky Egg"), .itemId = ITEM_LUCKY_EGG, .price = 200, .holdEffect = HOLD_EFFECT_LUCKY_EGG, @@ -2327,7 +2327,7 @@ const struct Item gItems[] = [ITEM_SCOPE_LENS] = { - .name = _("SCOPE LENS"), + .name = _("Scope Lens"), .itemId = ITEM_SCOPE_LENS, .price = 200, .holdEffect = HOLD_EFFECT_SCOPE_LENS, @@ -2340,7 +2340,7 @@ const struct Item gItems[] = [ITEM_METAL_COAT] = { - .name = _("METAL COAT"), + .name = _("Metal Coat"), .itemId = ITEM_METAL_COAT, .price = 100, .holdEffect = HOLD_EFFECT_STEEL_POWER, @@ -2354,7 +2354,7 @@ const struct Item gItems[] = [ITEM_LEFTOVERS] = { - .name = _("LEFTOVERS"), + .name = _("Leftovers"), .itemId = ITEM_LEFTOVERS, .price = 200, .holdEffect = HOLD_EFFECT_LEFTOVERS, @@ -2368,7 +2368,7 @@ const struct Item gItems[] = [ITEM_DRAGON_SCALE] = { - .name = _("DRAGON SCALE"), + .name = _("Dragon Scale"), .itemId = ITEM_DRAGON_SCALE, .price = 2100, .holdEffect = HOLD_EFFECT_DRAGON_SCALE, @@ -2382,7 +2382,7 @@ const struct Item gItems[] = [ITEM_LIGHT_BALL] = { - .name = _("LIGHT BALL"), + .name = _("Light Ball"), .itemId = ITEM_LIGHT_BALL, .price = 100, .holdEffect = HOLD_EFFECT_LIGHT_BALL, @@ -2395,7 +2395,7 @@ const struct Item gItems[] = [ITEM_SOFT_SAND] = { - .name = _("SOFT SAND"), + .name = _("Soft Sand"), .itemId = ITEM_SOFT_SAND, .price = 100, .holdEffect = HOLD_EFFECT_GROUND_POWER, @@ -2409,7 +2409,7 @@ const struct Item gItems[] = [ITEM_HARD_STONE] = { - .name = _("HARD STONE"), + .name = _("Hard Stone"), .itemId = ITEM_HARD_STONE, .price = 100, .holdEffect = HOLD_EFFECT_ROCK_POWER, @@ -2423,7 +2423,7 @@ const struct Item gItems[] = [ITEM_MIRACLE_SEED] = { - .name = _("MIRACLE SEED"), + .name = _("Miracle Seed"), .itemId = ITEM_MIRACLE_SEED, .price = 100, .holdEffect = HOLD_EFFECT_GRASS_POWER, @@ -2437,7 +2437,7 @@ const struct Item gItems[] = [ITEM_BLACK_GLASSES] = { - .name = _("BLACKGLASSES"), + .name = _("BlackGlasses"), .itemId = ITEM_BLACK_GLASSES, .price = 100, .holdEffect = HOLD_EFFECT_DARK_POWER, @@ -2451,7 +2451,7 @@ const struct Item gItems[] = [ITEM_BLACK_BELT] = { - .name = _("BLACK BELT"), + .name = _("Black Belt"), .itemId = ITEM_BLACK_BELT, .price = 100, .holdEffect = HOLD_EFFECT_FIGHTING_POWER, @@ -2465,7 +2465,7 @@ const struct Item gItems[] = [ITEM_MAGNET] = { - .name = _("MAGNET"), + .name = _("Magnet"), .itemId = ITEM_MAGNET, .price = 100, .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, @@ -2479,7 +2479,7 @@ const struct Item gItems[] = [ITEM_MYSTIC_WATER] = { - .name = _("MYSTIC WATER"), + .name = _("Mystic Water"), .itemId = ITEM_MYSTIC_WATER, .price = 100, .holdEffect = HOLD_EFFECT_WATER_POWER, @@ -2493,7 +2493,7 @@ const struct Item gItems[] = [ITEM_SHARP_BEAK] = { - .name = _("SHARP BEAK"), + .name = _("Sharp Beak"), .itemId = ITEM_SHARP_BEAK, .price = 100, .holdEffect = HOLD_EFFECT_FLYING_POWER, @@ -2507,7 +2507,7 @@ const struct Item gItems[] = [ITEM_POISON_BARB] = { - .name = _("POISON BARB"), + .name = _("Poison Barb"), .itemId = ITEM_POISON_BARB, .price = 100, .holdEffect = HOLD_EFFECT_POISON_POWER, @@ -2521,7 +2521,7 @@ const struct Item gItems[] = [ITEM_NEVER_MELT_ICE] = { - .name = _("NEVERMELTICE"), + .name = _("NeverMeltIce"), .itemId = ITEM_NEVER_MELT_ICE, .price = 100, .holdEffect = HOLD_EFFECT_ICE_POWER, @@ -2535,7 +2535,7 @@ const struct Item gItems[] = [ITEM_SPELL_TAG] = { - .name = _("SPELL TAG"), + .name = _("Spell Tag"), .itemId = ITEM_SPELL_TAG, .price = 100, .holdEffect = HOLD_EFFECT_GHOST_POWER, @@ -2549,7 +2549,7 @@ const struct Item gItems[] = [ITEM_TWISTED_SPOON] = { - .name = _("TWISTEDSPOON"), + .name = _("Twistedspoon"), .itemId = ITEM_TWISTED_SPOON, .price = 100, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, @@ -2563,7 +2563,7 @@ const struct Item gItems[] = [ITEM_CHARCOAL] = { - .name = _("CHARCOAL"), + .name = _("Charcoal"), .itemId = ITEM_CHARCOAL, .price = 9800, .holdEffect = HOLD_EFFECT_FIRE_POWER, @@ -2577,7 +2577,7 @@ const struct Item gItems[] = [ITEM_DRAGON_FANG] = { - .name = _("DRAGON FANG"), + .name = _("Dragon Fang"), .itemId = ITEM_DRAGON_FANG, .price = 100, .holdEffect = HOLD_EFFECT_DRAGON_POWER, @@ -2591,7 +2591,7 @@ const struct Item gItems[] = [ITEM_SILK_SCARF] = { - .name = _("SILK SCARF"), + .name = _("Silk Scarf"), .itemId = ITEM_SILK_SCARF, .price = 100, .holdEffect = HOLD_EFFECT_NORMAL_POWER, @@ -2605,7 +2605,7 @@ const struct Item gItems[] = [ITEM_UP_GRADE] = { - .name = _("UP-GRADE"), + .name = _("Up-Grade"), .itemId = ITEM_UP_GRADE, .price = 2100, .holdEffect = HOLD_EFFECT_UP_GRADE, @@ -2618,7 +2618,7 @@ const struct Item gItems[] = [ITEM_SHELL_BELL] = { - .name = _("SHELL BELL"), + .name = _("Shell Bell"), .itemId = ITEM_SHELL_BELL, .price = 200, .holdEffect = HOLD_EFFECT_SHELL_BELL, @@ -2632,7 +2632,7 @@ const struct Item gItems[] = [ITEM_SEA_INCENSE] = { - .name = _("SEA INCENSE"), + .name = _("Sea Incense"), .itemId = ITEM_SEA_INCENSE, .price = 9600, .holdEffect = HOLD_EFFECT_WATER_POWER, @@ -2646,7 +2646,7 @@ const struct Item gItems[] = [ITEM_LAX_INCENSE] = { - .name = _("LAX INCENSE"), + .name = _("Lax Incense"), .itemId = ITEM_LAX_INCENSE, .price = 9600, .holdEffect = HOLD_EFFECT_EVASION_UP, @@ -2660,7 +2660,7 @@ const struct Item gItems[] = [ITEM_LUCKY_PUNCH] = { - .name = _("LUCKY PUNCH"), + .name = _("Lucky Punch"), .itemId = ITEM_LUCKY_PUNCH, .price = 10, .holdEffect = HOLD_EFFECT_LUCKY_PUNCH, @@ -2673,7 +2673,7 @@ const struct Item gItems[] = [ITEM_METAL_POWDER] = { - .name = _("METAL POWDER"), + .name = _("Metal Powder"), .itemId = ITEM_METAL_POWDER, .price = 10, .holdEffect = HOLD_EFFECT_METAL_POWDER, @@ -2686,7 +2686,7 @@ const struct Item gItems[] = [ITEM_THICK_CLUB] = { - .name = _("THICK CLUB"), + .name = _("Thick Club"), .itemId = ITEM_THICK_CLUB, .price = 500, .holdEffect = HOLD_EFFECT_THICK_CLUB, @@ -2699,7 +2699,7 @@ const struct Item gItems[] = [ITEM_STICK] = { - .name = _("STICK"), + .name = _("Stick"), .itemId = ITEM_STICK, .price = 200, .holdEffect = HOLD_EFFECT_STICK, @@ -2712,7 +2712,7 @@ const struct Item gItems[] = [ITEM_RED_SCARF] = { - .name = _("RED SCARF"), + .name = _("Red Scarf"), .itemId = ITEM_RED_SCARF, .price = 100, .description = gRedScarfItemDescription, @@ -2724,7 +2724,7 @@ const struct Item gItems[] = [ITEM_BLUE_SCARF] = { - .name = _("BLUE SCARF"), + .name = _("Blue Scarf"), .itemId = ITEM_BLUE_SCARF, .price = 100, .description = gBlueScarfItemDescription, @@ -2736,7 +2736,7 @@ const struct Item gItems[] = [ITEM_PINK_SCARF] = { - .name = _("PINK SCARF"), + .name = _("Pink Scarf"), .itemId = ITEM_PINK_SCARF, .price = 100, .description = gPinkScarfItemDescription, @@ -2748,7 +2748,7 @@ const struct Item gItems[] = [ITEM_GREEN_SCARF] = { - .name = _("GREEN SCARF"), + .name = _("Green Scarf"), .itemId = ITEM_GREEN_SCARF, .price = 100, .description = gGreenScarfItemDescription, @@ -2760,7 +2760,7 @@ const struct Item gItems[] = [ITEM_YELLOW_SCARF] = { - .name = _("YELLOW SCARF"), + .name = _("Yellow Scarf"), .itemId = ITEM_YELLOW_SCARF, .price = 100, .description = gYellowScarfItemDescription, @@ -2774,7 +2774,7 @@ const struct Item gItems[] = [ITEM_MACH_BIKE] = { - .name = _("MACH BIKE"), + .name = _("Mach Bike"), .itemId = ITEM_MACH_BIKE, .price = 0, .description = gMachBikeItemDescription, @@ -2788,7 +2788,7 @@ const struct Item gItems[] = [ITEM_COIN_CASE] = { - .name = _("COIN CASE"), + .name = _("Coin Case"), .itemId = ITEM_COIN_CASE, .price = 0, .description = gCoinCaseItemDescription, @@ -2801,7 +2801,7 @@ const struct Item gItems[] = [ITEM_ITEMFINDER] = { - .name = _("ITEMFINDER"), + .name = _("Itemfinder"), .itemId = ITEM_ITEMFINDER, .price = 0, .description = gItemfinderItemDescription, @@ -2815,7 +2815,7 @@ const struct Item gItems[] = [ITEM_OLD_ROD] = { - .name = _("OLD ROD"), + .name = _("Old Rod"), .itemId = ITEM_OLD_ROD, .price = 0, .description = gOldRodItemDescription, @@ -2829,7 +2829,7 @@ const struct Item gItems[] = [ITEM_GOOD_ROD] = { - .name = _("GOOD ROD"), + .name = _("Good Rod"), .itemId = ITEM_GOOD_ROD, .price = 0, .description = gGoodRodItemDescription, @@ -2843,7 +2843,7 @@ const struct Item gItems[] = [ITEM_SUPER_ROD] = { - .name = _("SUPER ROD"), + .name = _("Super Rod"), .itemId = ITEM_SUPER_ROD, .price = 0, .description = gSuperRodItemDescription, @@ -2857,7 +2857,7 @@ const struct Item gItems[] = [ITEM_SS_TICKET] = { - .name = _("S.S. TICKET"), + .name = _("S.S. Ticket"), .itemId = ITEM_SS_TICKET, .price = 0, .description = gSSTicketItemDescription, @@ -2870,7 +2870,7 @@ const struct Item gItems[] = [ITEM_CONTEST_PASS] = { - .name = _("CONTEST PASS"), + .name = _("Contest Pass"), .itemId = ITEM_CONTEST_PASS, .price = 0, .description = gContestPassItemDescription, @@ -2883,7 +2883,7 @@ const struct Item gItems[] = [ITEM_WAILMER_PAIL] = { - .name = _("WAILMER PAIL"), + .name = _("Wailmer Pail"), .itemId = ITEM_WAILMER_PAIL, .price = 0, .description = gWailmerPailItemDescription, @@ -2896,7 +2896,7 @@ const struct Item gItems[] = [ITEM_DEVON_GOODS] = { - .name = _("DEVON GOODS"), + .name = _("Devon Goods"), .itemId = ITEM_DEVON_GOODS, .price = 0, .description = gDevonGoodsItemDescription, @@ -2909,7 +2909,7 @@ const struct Item gItems[] = [ITEM_SOOT_SACK] = { - .name = _("SOOT SACK"), + .name = _("Soot Sack"), .itemId = ITEM_SOOT_SACK, .price = 0, .description = gSootSackItemDescription, @@ -2922,7 +2922,7 @@ const struct Item gItems[] = [ITEM_BASEMENT_KEY] = { - .name = _("BASEMENT KEY"), + .name = _("Basement Key"), .itemId = ITEM_BASEMENT_KEY, .price = 0, .description = gBasementKeyItemDescription, @@ -2935,7 +2935,7 @@ const struct Item gItems[] = [ITEM_ACRO_BIKE] = { - .name = _("ACRO BIKE"), + .name = _("Acro Bike"), .itemId = ITEM_ACRO_BIKE, .price = 0, .description = gAcroBikeItemDescription, @@ -2949,7 +2949,7 @@ const struct Item gItems[] = [ITEM_POKEBLOCK_CASE] = { - .name = _("{POKEBLOCK} CASE"), + .name = _("{Pokeblock} Case"), .itemId = ITEM_POKEBLOCK_CASE, .price = 0, .description = gPokeblockCaseItemDescription, @@ -2963,7 +2963,7 @@ const struct Item gItems[] = [ITEM_LETTER] = { - .name = _("LETTER"), + .name = _("Letter"), .itemId = ITEM_LETTER, .price = 0, .description = gLetterItemDescription, @@ -2976,7 +2976,7 @@ const struct Item gItems[] = [ITEM_EON_TICKET] = { - .name = _("EON TICKET"), + .name = _("Eon Ticket"), .itemId = ITEM_EON_TICKET, .price = 0, .description = gEonTicketItemDescription, @@ -2989,7 +2989,7 @@ const struct Item gItems[] = [ITEM_RED_ORB] = { - .name = _("RED ORB"), + .name = _("Red Orb"), .itemId = ITEM_RED_ORB, .price = 0, .description = gRedOrbItemDescription, @@ -3002,7 +3002,7 @@ const struct Item gItems[] = [ITEM_BLUE_ORB] = { - .name = _("BLUE ORB"), + .name = _("Blue Orb"), .itemId = ITEM_BLUE_ORB, .price = 0, .description = gBlueOrbItemDescription, @@ -3015,7 +3015,7 @@ const struct Item gItems[] = [ITEM_SCANNER] = { - .name = _("SCANNER"), + .name = _("Scanner"), .itemId = ITEM_SCANNER, .price = 0, .description = gScannerItemDescription, @@ -3028,7 +3028,7 @@ const struct Item gItems[] = [ITEM_GO_GOGGLES] = { - .name = _("GO-GOGGLES"), + .name = _("Go-Goggles"), .itemId = ITEM_GO_GOGGLES, .price = 0, .description = gGoGogglesItemDescription, @@ -3041,7 +3041,7 @@ const struct Item gItems[] = [ITEM_METEORITE] = { - .name = _("METEORITE"), + .name = _("Meteorite"), .itemId = ITEM_METEORITE, .price = 0, .description = gMeteoriteItemDescription, @@ -3054,7 +3054,7 @@ const struct Item gItems[] = [ITEM_ROOM_1_KEY] = { - .name = _("RM. 1 KEY"), + .name = _("Rm. 1 Key"), .itemId = ITEM_ROOM_1_KEY, .price = 0, .description = gRoom1KeyItemDescription, @@ -3067,7 +3067,7 @@ const struct Item gItems[] = [ITEM_ROOM_2_KEY] = { - .name = _("RM. 2 KEY"), + .name = _("Rm. 2 Key"), .itemId = ITEM_ROOM_2_KEY, .price = 0, .description = gRoom2KeyItemDescription, @@ -3080,7 +3080,7 @@ const struct Item gItems[] = [ITEM_ROOM_4_KEY] = { - .name = _("RM. 4 KEY"), + .name = _("Rm. 4 Key"), .itemId = ITEM_ROOM_4_KEY, .price = 0, .description = gRoom4KeyItemDescription, @@ -3093,7 +3093,7 @@ const struct Item gItems[] = [ITEM_ROOM_6_KEY] = { - .name = _("RM. 6 KEY"), + .name = _("Rm. 6 Key"), .itemId = ITEM_ROOM_6_KEY, .price = 0, .description = gRoom6KeyItemDescription, @@ -3106,7 +3106,7 @@ const struct Item gItems[] = [ITEM_STORAGE_KEY] = { - .name = _("STORAGE KEY"), + .name = _("Storage Key"), .itemId = ITEM_STORAGE_KEY, .price = 0, .description = gStorageKeyItemDescription, @@ -3119,7 +3119,7 @@ const struct Item gItems[] = [ITEM_ROOT_FOSSIL] = { - .name = _("ROOT FOSSIL"), + .name = _("Root Fossil"), .itemId = ITEM_ROOT_FOSSIL, .price = 0, .description = gRootFossilItemDescription, @@ -3132,7 +3132,7 @@ const struct Item gItems[] = [ITEM_CLAW_FOSSIL] = { - .name = _("CLAW FOSSIL"), + .name = _("Claw Fossil"), .itemId = ITEM_CLAW_FOSSIL, .price = 0, .description = gClawFossilItemDescription, @@ -3145,7 +3145,7 @@ const struct Item gItems[] = [ITEM_DEVON_SCOPE] = { - .name = _("DEVON SCOPE"), + .name = _("Devon Scope"), .itemId = ITEM_DEVON_SCOPE, .price = 0, .description = gDevonScopeItemDescription, @@ -3866,7 +3866,7 @@ const struct Item gItems[] = [ITEM_OAKS_PARCEL] = { - .name = _("OAK'S PARCEL"), + .name = _("Oak's Parcel"), .itemId = ITEM_OAKS_PARCEL, .price = 0, .description = gOaksParcelItemDescription, @@ -3879,7 +3879,7 @@ const struct Item gItems[] = [ITEM_POKE_FLUTE] = { - .name = _("POKé FLUTE"), + .name = _("Poké FLUTE"), .itemId = ITEM_POKE_FLUTE, .price = 0, .description = gPokeFluteItemDescription, @@ -3892,7 +3892,7 @@ const struct Item gItems[] = [ITEM_SECRET_KEY] = { - .name = _("SECRET KEY"), + .name = _("Secret Key"), .itemId = ITEM_SECRET_KEY, .price = 0, .description = gSecretKeyItemDescription, @@ -3905,7 +3905,7 @@ const struct Item gItems[] = [ITEM_BIKE_VOUCHER] = { - .name = _("BIKE VOUCHER"), + .name = _("Bike Voucher"), .itemId = ITEM_BIKE_VOUCHER, .price = 0, .description = gBikeVoucherItemDescription, @@ -3918,7 +3918,7 @@ const struct Item gItems[] = [ITEM_GOLD_TEETH] = { - .name = _("GOLD TEETH"), + .name = _("Gold Teeth"), .itemId = ITEM_GOLD_TEETH, .price = 0, .description = gGoldTeethItemDescription, @@ -3931,7 +3931,7 @@ const struct Item gItems[] = [ITEM_OLD_AMBER] = { - .name = _("OLD AMBER"), + .name = _("Old Amber"), .itemId = ITEM_OLD_AMBER, .price = 0, .description = gOldAmberItemDescription, @@ -3944,7 +3944,7 @@ const struct Item gItems[] = [ITEM_CARD_KEY] = { - .name = _("CARD KEY"), + .name = _("Card Key"), .itemId = ITEM_CARD_KEY, .price = 0, .description = gCardKeyItemDescription, @@ -3957,7 +3957,7 @@ const struct Item gItems[] = [ITEM_LIFT_KEY] = { - .name = _("LIFT KEY"), + .name = _("Lift Key"), .itemId = ITEM_LIFT_KEY, .price = 0, .description = gLiftKeyItemDescription, @@ -3970,7 +3970,7 @@ const struct Item gItems[] = [ITEM_HELIX_FOSSIL] = { - .name = _("HELIX FOSSIL"), + .name = _("Helix Fossil"), .itemId = ITEM_HELIX_FOSSIL, .price = 0, .description = gHelixFossilItemDescription, @@ -3983,7 +3983,7 @@ const struct Item gItems[] = [ITEM_DOME_FOSSIL] = { - .name = _("DOME FOSSIL"), + .name = _("Dome Fossil"), .itemId = ITEM_DOME_FOSSIL, .price = 0, .description = gDomeFossilItemDescription, @@ -3996,7 +3996,7 @@ const struct Item gItems[] = [ITEM_SILPH_SCOPE] = { - .name = _("SILPH SCOPE"), + .name = _("Silph Scope"), .itemId = ITEM_SILPH_SCOPE, .price = 0, .description = gSilphScopeItemDescription, @@ -4009,7 +4009,7 @@ const struct Item gItems[] = [ITEM_BICYCLE] = { - .name = _("BICYCLE"), + .name = _("Bicycle"), .itemId = ITEM_BICYCLE, .price = 0, .description = gBicycleItemDescription, @@ -4023,7 +4023,7 @@ const struct Item gItems[] = [ITEM_TOWN_MAP] = { - .name = _("TOWN MAP"), + .name = _("Town Map"), .itemId = ITEM_TOWN_MAP, .price = 0, .description = gTownMapItemDescription, @@ -4037,7 +4037,7 @@ const struct Item gItems[] = [ITEM_VS_SEEKER] = { - .name = _("VS SEEKER"), + .name = _("Vs Seeker"), .itemId = ITEM_VS_SEEKER, .price = 0, .description = gVSSeekerItemDescription, @@ -4051,7 +4051,7 @@ const struct Item gItems[] = [ITEM_FAME_CHECKER] = { - .name = _("FAME CHECKER"), + .name = _("Fame Checker"), .itemId = ITEM_FAME_CHECKER, .price = 0, .description = gFameCheckerItemDescription, @@ -4065,7 +4065,7 @@ const struct Item gItems[] = [ITEM_TM_CASE] = { - .name = _("TM CASE"), + .name = _("TM Case"), .itemId = ITEM_TM_CASE, .price = 0, .description = gTMCaseItemDescription, @@ -4079,7 +4079,7 @@ const struct Item gItems[] = [ITEM_BERRY_POUCH] = { - .name = _("BERRY POUCH"), + .name = _("Berry Pouch"), .itemId = ITEM_BERRY_POUCH, .price = 0, .description = gBerryPouchItemDescription, @@ -4093,7 +4093,7 @@ const struct Item gItems[] = [ITEM_TEACHY_TV] = { - .name = _("TEACHY TV"), + .name = _("Teachy TV"), .itemId = ITEM_TEACHY_TV, .price = 0, .description = gTeachyTVItemDescription, @@ -4107,7 +4107,7 @@ const struct Item gItems[] = [ITEM_TRI_PASS] = { - .name = _("TRI-PASS"), + .name = _("Tri-Pass"), .itemId = ITEM_TRI_PASS, .price = 0, .description = gTriPassItemDescription, @@ -4121,7 +4121,7 @@ const struct Item gItems[] = [ITEM_RAINBOW_PASS] = { - .name = _("RAINBOW PASS"), + .name = _("Rainbow Pass"), .itemId = ITEM_RAINBOW_PASS, .price = 0, .description = gRainbowPassItemDescription, @@ -4135,7 +4135,7 @@ const struct Item gItems[] = [ITEM_TEA] = { - .name = _("TEA"), + .name = _("Tea"), .itemId = ITEM_TEA, .price = 0, .description = gTeaItemDescription, @@ -4149,7 +4149,7 @@ const struct Item gItems[] = [ITEM_MYSTIC_TICKET] = { - .name = _("MYSTICTICKET"), + .name = _("MysticTicket"), .itemId = ITEM_MYSTIC_TICKET, .price = 0, .description = gMysticTicketItemDescription, @@ -4163,7 +4163,7 @@ const struct Item gItems[] = [ITEM_AURORA_TICKET] = { - .name = _("AURORATICKET"), + .name = _("AuroraTicket"), .itemId = ITEM_AURORA_TICKET, .price = 0, .description = gAuroraTicketItemDescription, @@ -4177,7 +4177,7 @@ const struct Item gItems[] = [ITEM_POWDER_JAR] = { - .name = _("POWDER JAR"), + .name = _("Powder Jar"), .itemId = ITEM_POWDER_JAR, .price = 0, .description = gPowderJarItemDescription, @@ -4191,7 +4191,7 @@ const struct Item gItems[] = [ITEM_RUBY] = { - .name = _("RUBY"), + .name = _("Ruby"), .itemId = ITEM_RUBY, .price = 0, .description = gRubyItemDescription, @@ -4205,7 +4205,7 @@ const struct Item gItems[] = [ITEM_SAPPHIRE] = { - .name = _("SAPPHIRE"), + .name = _("Sapphire"), .itemId = ITEM_SAPPHIRE, .price = 0, .description = gSapphireItemDescription, @@ -4221,7 +4221,7 @@ const struct Item gItems[] = [ITEM_MAGMA_EMBLEM] = { - .name = _("MAGMA EMBLEM"), + .name = _("Magma Emblem"), .itemId = ITEM_MAGMA_EMBLEM, .price = 0, .description = gMagmaEmblemItemDescription, @@ -4235,7 +4235,7 @@ const struct Item gItems[] = [ITEM_OLD_SEA_MAP] = { - .name = _("OLD SEA MAP"), + .name = _("Old Sea Map"), .itemId = ITEM_OLD_SEA_MAP, .price = 0, .description = gOldSeaMapItemDescription, From f97125fc636059fbedf49b0338f6de24766d4efe Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 15 Apr 2019 11:50:31 +0200 Subject: [PATCH 06/52] Fill most of what new berries data --- graphics/berries/babiri.png | Bin 0 -> 483 bytes graphics/berries/charti.png | Bin 0 -> 430 bytes graphics/berries/chilan.png | Bin 0 -> 469 bytes graphics/berries/chople.png | Bin 0 -> 498 bytes graphics/berries/coba.png | Bin 0 -> 402 bytes graphics/berries/colbur.png | Bin 0 -> 435 bytes graphics/berries/haban.png | Bin 0 -> 466 bytes graphics/berries/kasib.png | Bin 0 -> 459 bytes graphics/berries/kebia.png | Bin 0 -> 500 bytes graphics/berries/occa.png | Bin 0 -> 434 bytes graphics/berries/passho.png | Bin 0 -> 543 bytes graphics/berries/payapa.png | Bin 0 -> 435 bytes graphics/berries/rindo.png | Bin 0 -> 440 bytes graphics/berries/roseli.png | Bin 0 -> 576 bytes graphics/berries/shuca.png | Bin 0 -> 412 bytes graphics/berries/tanga.png | Bin 0 -> 506 bytes graphics/berries/wacan.png | Bin 0 -> 457 bytes graphics/berries/yache.png | Bin 0 -> 514 bytes .../event_objects/pics/berry_trees/chople.png | Bin 0 -> 697 bytes .../event_objects/pics/berry_trees/colbur.png | Bin 0 -> 665 bytes .../event_objects/pics/berry_trees/haban.png | Bin 0 -> 638 bytes .../event_objects/pics/berry_trees/kasib.png | Bin 0 -> 606 bytes .../event_objects/pics/berry_trees/kebia.png | Bin 0 -> 600 bytes .../event_objects/pics/berry_trees/occa.png | Bin 0 -> 618 bytes .../event_objects/pics/berry_trees/payapa.png | Bin 0 -> 589 bytes .../event_objects/pics/berry_trees/roseli.png | Bin 0 -> 593 bytes .../event_objects/pics/berry_trees/shuca.png | Bin 0 -> 638 bytes .../event_objects/pics/berry_trees/tanga.png | Bin 0 -> 697 bytes .../event_objects/pics/berry_trees/yache.png | Bin 0 -> 559 bytes include/constants/hold_effects.h | 1 + include/constants/items.h | 24 +- include/graphics.h | 36 ++ src/berry.c | 361 ++++++++++++++++++ .../berry_tree_graphics_tables.h | 226 +++++++++++ .../field_event_obj/event_object_graphics.h | 11 + src/data/graphics/berries.h | 36 ++ src/data/items.h | 254 +++++++++++- src/data/text/item_descriptions.h | 91 +++++ src/item_menu_icons.c | 110 +++--- 39 files changed, 1094 insertions(+), 56 deletions(-) create mode 100644 graphics/berries/babiri.png create mode 100644 graphics/berries/charti.png create mode 100644 graphics/berries/chilan.png create mode 100644 graphics/berries/chople.png create mode 100644 graphics/berries/coba.png create mode 100644 graphics/berries/colbur.png create mode 100644 graphics/berries/haban.png create mode 100644 graphics/berries/kasib.png create mode 100644 graphics/berries/kebia.png create mode 100644 graphics/berries/occa.png create mode 100644 graphics/berries/passho.png create mode 100644 graphics/berries/payapa.png create mode 100644 graphics/berries/rindo.png create mode 100644 graphics/berries/roseli.png create mode 100644 graphics/berries/shuca.png create mode 100644 graphics/berries/tanga.png create mode 100644 graphics/berries/wacan.png create mode 100644 graphics/berries/yache.png create mode 100644 graphics/event_objects/pics/berry_trees/chople.png create mode 100644 graphics/event_objects/pics/berry_trees/colbur.png create mode 100644 graphics/event_objects/pics/berry_trees/haban.png create mode 100644 graphics/event_objects/pics/berry_trees/kasib.png create mode 100644 graphics/event_objects/pics/berry_trees/kebia.png create mode 100644 graphics/event_objects/pics/berry_trees/occa.png create mode 100644 graphics/event_objects/pics/berry_trees/payapa.png create mode 100644 graphics/event_objects/pics/berry_trees/roseli.png create mode 100644 graphics/event_objects/pics/berry_trees/shuca.png create mode 100644 graphics/event_objects/pics/berry_trees/tanga.png create mode 100644 graphics/event_objects/pics/berry_trees/yache.png diff --git a/graphics/berries/babiri.png b/graphics/berries/babiri.png new file mode 100644 index 0000000000000000000000000000000000000000..056353bab97ab89017e4513d30079332b0b00a18 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvogpk7Z!#9MHs|O zTq85jgR z3=A9lx&I`x0{I33J|V9E|NjqakqDY1k-b&1`kdz8IZkuFd+q%n_5NBhNGk@o-lTL8 zD9D)P?e6k_Df_3RKsLLli(^Q|oVODkvkp7(xIUdC=U^7arMVVA&-ABExpC@Vnyy zRy2JM@{IW8Au>N-EFeMg)u)crFU>7HiY}(F{q{1YmgV|RuQd)qPhNW|MW{RN^m9#Q zSnxRP7t_8o=~79VOJ{SxSTj{4Vz0{V#cZr=CRrBm3sI;P1tz2eM%+W){zP@s9b`njxgN@xNA DC>gn@ literal 0 HcmV?d00001 diff --git a/graphics/berries/charti.png b/graphics/berries/charti.png new file mode 100644 index 0000000000000000000000000000000000000000..9f119ebac0e9d1d9883bf3b3a92d57e18c57fe3f GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+QqvxpmMpGh`54-^tF zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|Ns9l&X(xuQJgbJbL&>kbLYJ7JW6T6mA53% zc2LN7Ykv1pMn=+gYgEZ)5#7q~oAgBUW>vi5>|7mQ{1|~#Wnsrb(1GX zWXIQ=ISanOWj x^3vTDU7v6&T5;E$2G8@~OZP^;d#$&BmbfOnjj;&FW;0L_c)I$ztaD0e0szAIo2CE& literal 0 HcmV?d00001 diff --git a/graphics/berries/chilan.png b/graphics/berries/chilan.png new file mode 100644 index 0000000000000000000000000000000000000000..8f717bb82cfe103413e8dd976fca23cf26519e51 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvoa_Oo(iq02MURo zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o|Ns9d7aL|z(VWsFv30HDoO531_G&)A=Jox3_POsZ|G#eq z8Gr;j)2mJbxr|BP?k@kAvVS@XaSW-L^K{}yFBU_Aw#ALC*6(?bs0)1K=$@Lu z(YBK-|Y-@`c_S_ zT+e<_bG6e?b%`g>w_FxJ|E#Tatqu6{1-oD!M!lvI6-A0X`wF|NsBrYH2wq+p@>W>6oG6HA};LmX^ng72jtkKkrfezSZgd zlopT~FyQme=?#$0nB?v5@_#A&r=vi&n5T7y$y1IpK&-WR%JW2L`Rc%ef#_!;m<;@P5Sa;bzHh> zuPJ-S_a`@3dCm=*n=8A+X_rcL_OYK)OS8AmT)Xv|-9^dZYjrbv&Y4|KxmVO++w(s1 b@A~=qJ5-C6mc$>~3<^3=S3j3^P6No__o67EnmM z#5JNMI6tkVJh3R1!QICNXpBNxYLSAmo=IWrl7~Pg93=&Q?m!u1Ae+IfK~o+`v7|ft zIx;Y9?C1WI$O_~e1o(uw{{R2qskqv(XQ|@aYfkt62c3J~^Zh?a6Athv@Rbu#iZRLC z-R1vM_D@HFoNb;ijv*Cuo?g1hd&q!?<${{KSu3IqYF<;uQGZf55b9{yg&x zyU!`}lT&B;)vx4SD)o#&*$Lk3e7Pfg%TQj!Q#W#C}zOW>%Vs#yF-@qEcX?jkkAkYw$3 PAfI}=`njxgN@xNAyCRG) literal 0 HcmV?d00001 diff --git a/graphics/berries/colbur.png b/graphics/berries/colbur.png new file mode 100644 index 0000000000000000000000000000000000000000..d422a826e57ce8767d15d8626748ba6dffb6f38f GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvoc6>>|B`P0u&N2 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|Ns9#W;o@&;oAQ}=l)MQ_y5>)kPh6y&HB-7pe$pOx4X;# zrR<-M0y)<`T^vIy=DeMFu#{Pm$K_@z*M{l335?)HO|}$nTlO ze_mzI=l{M|=bn>ofADTu?h}7qedi4t+;88ytnTtCo6Kme@KtfnJ2RolFPvT0i;3jM zEXmq-!2A7!TRJl~zrP!Gq`^EuV}3*OpLre@<(pS*I$1GkdRDXLjXhqKYdaEdoqsrG z%T>2-&H^UQ&Chns+-Q|yUUk0Vu1X+xhvcV3ju+1w9R!#yTK~!Qsn6i3zR>idY}c-- xH9Oxp%D*kTVOrn#PuKZE=?~5wiO26>5NS%G|m0G|-o|Ns9-Sr!+2wan4fJZEY7-O1^DRMhw4;{RLMg0y0QKz}(U zpde$Cx4X;#rR<-M0y*D2T^vIy<~*I`n044d#D&+7|G_fxj@!&zPQ0^vc>cUqLhT;i zBONgdR+xMA-CZxB@hfP-?MsmrhW(PB6|y^RpQQR78(3I{HL^&^9D!u<*lb&q9)GP53bwt=S6wKjwnafNw#ux{;+n+ z@O)6z$&+Ww_bzxd@5^Lnl?|`WrB0q_D2|Z(z0di_i9FUl*$!9NZa%`b<$mUZdbtY{ z8`cCrINBigg)PWn!p~5KN>yh6+cFu`8TgEDT51R^3f#k*%cL+Z$zhjVZSUiv$i@D} lt9|n3aJ{}3I{W$j>*fya{^!;@tzQ5NBTrX9mvv4FO#m*cu9g4* literal 0 HcmV?d00001 diff --git a/graphics/berries/kasib.png b/graphics/berries/kasib.png new file mode 100644 index 0000000000000000000000000000000000000000..f1b09244b07b728c9def33256914900160823a0f GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+QqvoZ*qNS%G|m0G|-o|Ns971qJmKC(p6$Ip(zXd(hth#rKX)N&dg~-ur7)K)O*u z@uAr7KoQ0yZ+DmfOW8ji1#;edx;TbZ%(*(jFz>Jdk89^4PyY+tB`2jCHl{JB*rW^e z$}Lbb5sU4LbNFy$>vrC|6&)(sFC=>3|9t7pR`KQY--`nK?f>h>N&k7dS#e&pxopaipsHio%H!ou77@3WDogd>WT4>=XGN`FF>fDN4)A!-QL07o2*$=9Ryl z__4b=pLKT5m|~!JP@?8!eq-Bd+50zD?ly_E{bnkR?eP4RyKINeotw!<_aYNy?gyDM zJ~%nAts~8N-{X6AKRSOeneKGsy1vgkj%%-HEK5pUD-oKN$M}7htjyhOPVNkO%0H~1 iFI1J1*`X@;Glr3Cx#y*zg5qXS$auQ?xvX!lvI6-A0X`wF|NsAYstzhn4l-OC<+L}->t1q8aq^rwhD+CK&S@!L`o8+y z|E(Z1VBpbG#*08UW0JSK%m1b9pN<0A5}q!OAr*6;UfP&-*g$|SLHhF2;O3Xy83umK zTe_$FwI*G%wd0Yq<=A!o%I5Y{FJ~+~lHIJRk^f*{%y~Y|7fb9MR=U;xDOdk(^M1Ze z?c;s>&rQqwz!61QSk%jbfX6t}5&Jcx=3P zGH=}hmS1fzgPpg2ImW`zaP79owD;^0MLVuv{QPbm`-2HDmQ5CGQTY{oD#Dn9qbvCe zC*QxFV!cNba+q4h%vyqgI~npn3UAbkJ+k-q g=9~J~|J%=-H~xwFK4Vv>DJbwfUHx3vIVCg!0B)Ab2mk;8 literal 0 HcmV?d00001 diff --git a/graphics/berries/occa.png b/graphics/berries/occa.png new file mode 100644 index 0000000000000000000000000000000000000000..1ad829e5f1a65fc9cdc66a0c61f044cb2e0834d2 GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvxu?EPLjzC1qz9m zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o|Ns9#FOIH0AN+l7@6=%L=%t!VuNVJ6zxRB!^ZVXxkZx2k z_lj8-P=qnb+uh~=Qua?rft+ieE{-7;bKXugj+=GbPwJU2(ur8; zyza=wfGwseIPN&t;uc GLK6VK37o(H literal 0 HcmV?d00001 diff --git a/graphics/berries/passho.png b/graphics/berries/passho.png new file mode 100644 index 0000000000000000000000000000000000000000..c5414754505f3307821ecdc3ecae7fd633ab60cd GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvj{Uuxqe!43n(OB z;u=vBoS#-wo>-L1;O^rBG)AE;wMfBO&!n(*$wQzLj*!LpeYZeSkfJR z9T^xl_H+M9WCijK0(?ST|NsAAU2LgYz11nX#d6BMO}l&H+??GHo0|pRM_-WCYv+sb&o}Kj{`9((-iK}6-zO$K zGy3}Q;8cUfY%ii-)c(?LiL?ut*?J|q=t-XF%G{UF<*r=s_n5G8gTo`oWUfZJ+Jdt7!86+iW7(~febB#rXEYj+Wvl4Q4B*s#)?bOJzQ>?ykevcWfPR zN_Iz`UoJO+cZ;CX|KnzEj&G-$S$;hDZsIzd{GS{AqE9^!TWx!bdAjjWW|MlsW9_f& Z?e72g@Aa|x-Wmf6XHQo@mvv4FO#mZ*RJiJteCbG}DyZP}~%zvtMo?@N<=BtTj*K$E%o ze4rp>lDE4HLkFv@2at2!)5S5QV$Rh`d-)D2h_tTk)J*Q4RWjwa`HQ#G9&=))Y8fuy zT$-3__;91{g`=lauN%+PfBvsgVE_7Gp-kS4Z`8vT?seWOaJG7yLVHG)8vyMBLg2p?}U=Djx3MlsW}%)6p9`7 z3QW?J?=O%#o8yz=t0jA;w2p0o=TbYyC9+`x-l+?mgr_vi_7!TeI5Hk%U|-b6^My4a zw_%<5JrmY*k_|7?f49CrILF3y#^mE2kC-<~y#Bw}F1N<;&>ivT4}e}|@O1TaS?83{ F1OWYNo0tFq literal 0 HcmV?d00001 diff --git a/graphics/berries/rindo.png b/graphics/berries/rindo.png new file mode 100644 index 0000000000000000000000000000000000000000..91e895d04311e573be0436d3a2b2a91fc07b1b2d GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+QqvxtfCtS-&k4ipkE zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|Ns9Fs&)!mYUp*$(&?U4%UaE?&kfi9U;6(4T98%@p!s^% zVW1#mlDE6d|E27ojsiJ%JY5_^D&{<$?dtzf0*>R_L6Wp@)M*?KZzrO48qJ_Gm|6H;=>n(g%l*u-NqbhFy(GS++g(KykU- z@*fO~Y-aV#YG+hP9`Etns(;nB?RZXdP211XggGCSo%g>pKQFzLM`y8AxA~H}ICOjxXWd8vF0RR60008~h>XHBe00Cl4M@0Xn2lB-L00Cr4 zL_t(|oZXPIQo=wKMRx|l89LA(U{`yGO=xJ4ywKQCY-ns4g%qZ-!@vg!+R!;Kq_8x^ z!Wj`H@dq-)N10G{2?w z^@VzsDa~iwk6+-(;GR+r&8fc%oGr>%)oWCNPPpR1B>Wi5pvo2CrUKTa7d}a#UFCvP z24KDRh`eK)HMBSdaO0b)pQ2pXYD@uWtXncDQgx673@}7r1_h>SlqtH`#C--ieb(@NlWhdQR^ShW_1fxl7C|W O0000FTm(%bt6d*N!Q^zi0UWyVJ4nOF>#Oz+PA0 zGN2%1lDE6d|E27ojsiIcJY5_^D&{<$aFFw`0gtP1(2K3gCdZhku;>evytr#Ib3sXy z3wOx}uOrJ`f)-rA#J}^;^#A)e6#rk!W+lyV;406Zcmp}c9W#Ul-mEj2x2Dp6KC6@* zpBP7pZjTU;^ZS_1 hZ=am`CmR1tS20gd@wt%t?6xb&x1O$kF6*2UngB#$m_Yyl literal 0 HcmV?d00001 diff --git a/graphics/berries/tanga.png b/graphics/berries/tanga.png new file mode 100644 index 0000000000000000000000000000000000000000..702da676f35fbd278b27926d4d37d832fc1655b0 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+Qqvxpf9KVAGJ4JagD z;u=vBoS#-wo>-L1;O^rBG)AE;wMfBO&!n(*$wQzLj*!LpeYZeSkfJR z9T^xl_H+M9WCijK0(?ST|Ns9VRBV`?t?AVx;5A1eYO7-PJ;Nze1orNgxOY$D`~Nv0 z1CT&|ot+Di%b4Wt?(%;r`=_Howw$MnV@SoEyB7@e4jb^W25@l%YzclUaY9CS9`j44 z#+A|?`y7qg<7CoLUE6vhNJCs>R`9e<(hieK8>dY^n_kz+_M_aC=XlZm-{*t=pKPD? zQkCs}^-{O@{gO8K*LSV{I4}Mf$GQ7it4og_%8VDhvo6}%T((B+>^yXbx6 zIS-!lvI6-A0X`wF|NsBjERM3Q&Q@I8V)%S%_4~bZrWoG4Ch+~e<^TWZK)O-E zq^qmjfFg`Z-tI2{m$H943go=?ba4!+nDcg$VbBo+9#>n&nB-|QbDL`!g?=)1ALX5N zZ?o&A{KU7M2kt2B)a?t7%x;_aaQgqV*Qd|n__#ja)OX*z^{3s>PA^nk&2Wfrs%F^m z_(7f!n~|mDy~L`uj2~EJOsedpH;5Vt&t<&FC*z^S#TKw}X$n`4;A#HzcCidGGbddC zvGe>U)fxMz?PxC2u8h4t!}^s1>y$k23GS7L;|)ree^Qtw?QlEDu2#3q)lRvfxIf^7 g>4(SlKij|ZUj5=BJNwm@J)m&$boFyt=akR{0Ka0cga7~l literal 0 HcmV?d00001 diff --git a/graphics/berries/yache.png b/graphics/berries/yache.png new file mode 100644 index 0000000000000000000000000000000000000000..3f397827701679cf57db19244f171ec6afdcb507 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD+QqvxrFvhJDa}02C50 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|NsBDEH+duZc$vTnEgImvuCMc&sxQ$YYpcd)7*M2=-j=Q z=kGygz<_zCVKb1;nB?v5@_#A&r=vi&nx~6nNX49|7aYBgI`FVPSmh~U0T25{5PJ7~)tsP+IJFA*+-ERFZU)i@)Cs(Jf zbs6 z7iS~8BaYfPvnwSDZ7_Ud{k)^(et2U>*gdTmvL=krRVLeTIIzsDzPME+PxpYx6W&*> zt2leOmFer2o~l|HYKvlyiGQLI2et z-kcC>ISA%bV#NS4VgMMNVoGW;F);ub|Ns90003V0bYTDh00Cl4M@0Xn2lB-L00G@e zL_t(|ob8fJYU4ltZanoEe<82Ua+Al^$LFc^a@kk2A08e&0dJp__7uyMgIV=~MS#@1ppB{_d3X^+Rv-kCS4)R-SM2cmK+)xG7nfGH){zPq#v*Sk(fb zWd(sc4^PG%mnJ7Abafp}DU2sBpjwbb;-z`Y{L&olg;uOt$Cj*ALhliBp|C(85OkSe z9@FfhqgRt6$JsA_?R2($=zVf-`^=ZtJfpZ+L7*vG?unzWyJJjT(+Z)n3Oiras)q+c zab*>ikh^f8^_2-$&buRQJyFPP)@p%=dM>LPA6iIFvXwxkXmxhsgVa(vX8}S{#U@A; zAk;Onh1NHQaK=OD&2!HXqDbpH9u|sbLRhRjc*OtTZ(Ji{FaCj?W6}Eu_W_Ql$fwJVL_oNzTCzjE_m#n+kQNREbx%%XNorR#AMw< z*Fr+3#ibo5<8jJtJ3=-%VJOYQu`P?H+8-?A^6;5`04@ker2o~l|HYKvlyiGQL28Sv zIZ9#(5Fpiaq@+P}QXoOq)zyoOltDpK|Ns90001r;HTTCjU3%NGgiEv+d!(B5J@A1WA%SZWOSqPLB2s0J zF;dfTBNbA+&%n%@7Mviswo>=<%_q-q_K$`5zy8)GZMWF;t(6tsV$-)a$O@i>7EAR0 z@ucIAcJhwcUn5mX&=PT!x4t(-?Cc~B>nZW z>fZ#?y`DI&Fww9)2Ng)YtPD9d0!^SG4oam1A#dG&f5n` zfNqd3s)%lp4OBx%qkz#qpxz(;It6!000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPer2o~l|HYKvlyiGQLI2et z-kcC>ISA%bV#NS4VgMMNVoGW;F);ub|Ns90003V0bYTDh00Cl4M??UK1szBL00E*& zL_t(|ob6LPQo}G1Ri_yr18N%XBIyLOW+)gn(n6861d6mUsa!E3ckmHtlEMvYagM=0 zDUc8+t|?g0_~p%h-gqj=7L7S9a1F1<7xRRJyLM^2eN8&w(TZ)sUnB2XjKJ@M4J>RkdTIt1d0lr*RkFRxo^V0BGNd*(RH%I*N)W~Yed$AZ^)c~tT ztR&+Kn?_66bl{5lM2O0b(e5}081u$?<+|L~$NMOvA|0UYHthr_lQwNSft;Dz&hK%u zxxQ?>^T?U&i`4CLlGg1Qa$veD2?ZyR9znE{b}eP(#FR!bkLwq5B8}mRfAzWfpNSv0 YFA?=^Jgow6Bme*a07*qoM6N<$g3`GSkN^Mx literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/berry_trees/kasib.png b/graphics/event_objects/pics/berry_trees/kasib.png new file mode 100644 index 0000000000000000000000000000000000000000..b8a8401e8d18324936526664b62d24b62afd842a GIT binary patch literal 606 zcmV-k0-^nhP)er2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M@0Xn2lB-L00DwY zL_t(|oXt})Zo@DP)E0#Qa{}Z81u|tZf_5)J>jSkl1X_ZK9Q?2P6_rTEb!<7!ST2VP z@5~En8?!9-0>Fh{so;AM>@WUBM^@gAFHP|3195In!p+%0d1ilMtH$6GulFwTP4%w4 zFrjUH@)0K7UXQ|Ir+iVN?*qn1@i1UoRA6oscT6}gE*rP$foRII5J{DTdMu^eSsW70GAE9He-z3>>Cx&1jGqT=+ zT&H*7`Vbdu=&Rzh3_$E8BQ`lB$nt=Pyu{6iaDV&I_L#X5{gxpM73X}CS$q+>^(qwn z<%%(*I?0j#Nu;1c#W^2Gf+rp6h^z_)7knNeohl2hopUOUjHhyUq!~wF7&#S+V8Xc= z0UB0e!~Dp-DMtvNGnx`#MCfv34W}dZgnE!woR5THpJIygfFXZaYZ%{+?93Rr>--Zm s;|H1%z{zX4hRcFHaSfN{|Ger2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M@0Xn2lB-L00DeS zL_t(|ob8gaj)O1^hBI9x-p>Tx9tSb8#0l($lqWcK>QavODKAbqskGHe47Z#vi}Q)t z|8E;1{?A`I(#iHGetJ)(HR8nmD#ieg~ZmZNfl@agN{}t!eDgdW@^F|S-)d*VFf5r zr-WR=2ak2MB77Y%b}yH3`#44JmwB1k8zQD&2+&|F+(_L*%zrAoFtCGNY-!mbHqq`PO^p4Y@RW~KWF--&B{is&-f8 me`r^XgLk`PyzPv?e7*qQ(9s~q8A;Uu0000er2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M@0Xn2lB-L00E9k zL_t(|oXwKGYQr!P$2AMwhsc<Z^rc&i^Xz^e7=wAp1xg8a{S_EpJ6zB>T_0@+u(QO8wD1jHj5YLk^lez07*qoM6N<$ Ef?rMr*#H0l literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/berry_trees/payapa.png b/graphics/event_objects/pics/berry_trees/payapa.png new file mode 100644 index 0000000000000000000000000000000000000000..14aed0c235f690995af689d6b86d1c6e9a60881e GIT binary patch literal 589 zcmV-T0er2o~l|HYKvlyiGQL28Sv zIZ9#(5Fpiaq@+P}QXoOq)zyoOltDpK|Ns90001r;H2Jl$Q4qOKsFqBT#M-iii5_O(pxJ+XhPo0cybt1Vj)H))={txcOB!=VJe{?-b8mk z#il$n!Qd$ilQg%fW|3`|>f7OSg^Z8a*~ZL?}-i zs%_%uq1rby)jfJIUFrbwn`4W^Zo%XJwGFJ8f#DA00000NkvXXu0mjfBRl++ literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/berry_trees/roseli.png b/graphics/event_objects/pics/berry_trees/roseli.png new file mode 100644 index 0000000000000000000000000000000000000000..f59bf93a2d9e237a2cc6dd8672d663f42ff82caf GIT binary patch literal 593 zcmV-X0er2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M@0Xn2lB-L00DJL zL_t(|ob8jpYQr!P#x-OT^ewV>O4dLL9g2rMLY_x9bjx4~QVjJV9oS39kas9_s*1OG z@l*8fB>y2ebm|r@KcDsKyVLnB#C_eD5b#GlEXg|{RWTo5`xKUTq_QfTiwB38QmRa) zD6qf3V6e62XisL0CtcNQ#xZ|#^iITnllKy-*HCA>ig#Ig-stRQe1+Y8&I;7XR1!Kt#|yMnm0DRbFOh*wbC z7ehR(l@T&mb=jqc_-vWY<3=+#o79lwVV&!OsdORpw7mccv-ZLVUsuh?_dqJ$B#vry zkZ2_6dbh{g27ay1CqGg=fOFg>uK_+OHqccQ{+!Ougy@`xQ9<&Zw071+9+Ah!gBgjn z<4~C?wWBXS5@1Sv$b7gw6PuQK9Fer2o~l|HYKvlyiGQL6pVz zT8q69F;f4ewAE^Ri$PMfq+)w>K{+`X|Ns90003#almP$$00Cl4M@0Xn2lB-L00E*& zL_t(|ob6LRPs1<}^^nPPCkB2?kh-vRgN<&C`3dZ{X9mXuGMjx;@^4zCN*<8tK!*MX z?%9Qwrp?U2Mat{beZ0%vRfvE4nolCo6vmyi=;k(87rW2xj~2-+IsPPr&jC~dPO6$g=v zc<6^4@PLnrMQV?s1e%}$)|_%7U9Rk;GYXR54ykn8TIEkUx1Iw@25KQm0S@MbR>>c6 zZJ7(H5g55bOS#g3z}|~Km|zA`U4g&W;s$)i!`TOlpt5AYgkw9%?GRnR^os$!|EP8p z9qnpNGfQHVfhFZ9dVXOAv@(dr416)G-f!FX`MTz@k_skrZ;trksgc!`_hK=;ss>iI zm`lbvHjS3B>A)59i4c_=qy2G?Fy@W(%5}M|x2H)&MLI&cSvMU{Cas%v201e|8-KuV z{dnJOE+c2I?$YLfU0O9$$bsphBoyo*J%MN??OV#oi78EB9@j7AM4G}g|LRNgzYsrd YUk=68+r#QS?*IS*07*qoM6N<$f((Ze!~g&Q literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/berry_trees/tanga.png b/graphics/event_objects/pics/berry_trees/tanga.png new file mode 100644 index 0000000000000000000000000000000000000000..28e86f6f4d98a5248ce093f7745594e8ee66deb6 GIT binary patch literal 697 zcmV;q0!ICbP)er2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M@0Xn2lB-L00G@e zL_t(|ob8i6P9s4Og*!lM32_R@NfwC%?52d>lWo>jlA{i`yCi~%;Rtq)&CV$t5PCC0 zJ0Y<|FlX3THMWGt28oP-4*cd>_48H#IQPB2>XJODm*alCeB|MyP(J1l6GEf4B$tr2 z_}Cu+l@LqJK5z;g_`qw)eVSN(3NdK_C4BPO8yoN84S;lIZ$dowmSButyfS)1y#!WK zZAM;az%a__N~{BOETM_)D~EtF_uh32c*N;2%7_Fq=7K4kz-_+`p{B-lbMvQnGk6r- zGrGEC{@qtXr}lhHgaibdhr(+DqGAP`FQknA8 zYzbBO34vrC0-*zjE<%5&59%k=89Yvbl-UU}kVO-@uNjT0-BP1|(vkUY0gnUI&0$yT zpk7iCoeiVeX28e6L-j780fWtJ17$p^LGOt3X?N8|9tV)Lg5RBod%6}`;{PX+Kc*wE zJ*@(IG7`_8e_ULx-&ecV!`s6Z!0*}S=f%zXeSQ1XhWGUE`PXK()8!F8SgXxuz5GCr fWUQ7S>gU#fB`--p$PST600000NkvXXu0mjf+#4(| literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/berry_trees/yache.png b/graphics/event_objects/pics/berry_trees/yache.png new file mode 100644 index 0000000000000000000000000000000000000000..bde43935485fd8ce0ea13368e61a96c894cd72ed GIT binary patch literal 559 zcmV+~0?_@5P)er2o~l|HYKvlyiGQLCwwH zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M??UK1szBL00C1; zL_t(|ob8c6O2j}E#;14~5WK`Bkj^4AXk#&C1_H9%W)C2nwAr{DvDs4yf*@GfSnLr5 z!99S*Hm;<}0X&2AFJ`g|v3I}bdt|;J-{S?Lz4rP~@~-UAx>pPUpC%xdh0wz^?}IS1 z$+a=Dn5dw@%L!J)L7Eml5b%o`Vy5%KBIg1DNhC<*CvTc*;2T7*XBJQnepBU`Fy2rJ zVk!X}Y(a#$-Gx&{HN46xrXUn3oQ5P#=O#E>J0KTLSYknWBdT1eh9t{W5W;CzvL2uv zj)TaLeFhOu=5jRz!O6u;1(Pbb4V$s!5OF`EK9f~g7O5+Qr9N+bdKsADcIASc_z|J% ztc2*ZqK{{D&FfpU5qiIO9nL9#lrKOiC(M1fVAo*%P~1G|A0pKYw%`r`_0wI=I{&5N x=*{(Uy Date: Tue, 16 Apr 2019 09:38:49 +0200 Subject: [PATCH 07/52] Balls caching effects --- include/wild_encounter.h | 2 + src/battle_main.c | 2 + src/battle_script_commands.c | 86 +++++++++++++++++++++++++++++++----- src/wild_encounter.c | 2 + 4 files changed, 80 insertions(+), 12 deletions(-) diff --git a/include/wild_encounter.h b/include/wild_encounter.h index 55bbaa7dd..a9479d34d 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -29,6 +29,8 @@ struct WildPokemonHeader const struct WildPokemonInfo *fishingMonsInfo; }; +extern bool8 gIsFishingEncounter; + extern const struct WildPokemonHeader gWildMonHeaders[]; void DisableWildEncounters(bool8 disabled); diff --git a/src/battle_main.c b/src/battle_main.c index 76bd6d877..9364c2385 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -47,6 +47,7 @@ #include "trig.h" #include "tv.h" #include "util.h" +#include "wild_encounter.h" #include "window.h" #include "constants/abilities.h" #include "constants/battle_move_effects.h" @@ -5195,6 +5196,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void) { if (!gPaletteFade.active) { + gIsFishingEncounter = FALSE; ResetSpriteData(); if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7e783bef5..ed4e210f2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -42,6 +42,8 @@ #include "constants/battle_string_ids.h" #include "battle_setup.h" #include "overworld.h" +#include "wild_encounter.h" +#include "rtc.h" #include "party_menu.h" #include "battle_arena.h" #include "battle_pike.h" @@ -10077,7 +10079,7 @@ static void atkEE_removelightscreenreflect(void) // brick break static void atkEF_handleballthrow(void) { - u8 ballMultiplier = 0; + u8 ballMultiplier = 10; if (gBattleControllerExecFlags) return; @@ -10099,7 +10101,7 @@ static void atkEF_handleballthrow(void) } else { - u32 odds; + u32 odds, i; u8 catchRate; if (gLastUsedItem == ITEM_SAFARI_BALL) @@ -10114,14 +10116,10 @@ static void atkEF_handleballthrow(void) case ITEM_NET_BALL: if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG)) ballMultiplier = 30; - else - ballMultiplier = 10; break; case ITEM_DIVE_BALL: if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) ballMultiplier = 35; - else - ballMultiplier = 10; break; case ITEM_NEST_BALL: if (gBattleMons[gBattlerTarget].level < 40) @@ -10130,16 +10128,10 @@ static void atkEF_handleballthrow(void) if (ballMultiplier <= 9) ballMultiplier = 10; } - else - { - ballMultiplier = 10; - } break; case ITEM_REPEAT_BALL: if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT)) ballMultiplier = 30; - else - ballMultiplier = 10; break; case ITEM_TIMER_BALL: ballMultiplier = gBattleResults.battleTurnCounter + 10; @@ -10148,8 +10140,70 @@ static void atkEF_handleballthrow(void) break; case ITEM_LUXURY_BALL: case ITEM_PREMIER_BALL: + case ITEM_FRIEND_BALL: + case ITEM_HEAL_BALL: + case ITEM_CHERISH_BALL: ballMultiplier = 10; break; + case ITEM_SPORT_BALL: + ballMultiplier = 15; + break; + case ITEM_LEVEL_BALL: + if (gBattleMons[gBattlerAttacker].level >= 4 * gBattleMons[gBattlerTarget].level) + ballMultiplier = 80; + else if (gBattleMons[gBattlerAttacker].level > 2 * gBattleMons[gBattlerTarget].level) + ballMultiplier = 40; + else if (gBattleMons[gBattlerAttacker].level > gBattleMons[gBattlerTarget].level) + ballMultiplier = 20; + break; + case ITEM_LURE_BALL: + if (gIsFishingEncounter) + ballMultiplier = 30; + break; + case ITEM_MOON_BALL: + for (i = 0; i < EVOS_PER_MON; i++) + { + if (gEvolutionTable[gBattleMons[gBattlerTarget].species][i].method == EVO_ITEM + && gEvolutionTable[gBattleMons[gBattlerTarget].species][i].param == ITEM_MOON_STONE) + ballMultiplier = 40; + } + break; + case ITEM_LOVE_BALL: + if (gBattleMons[gBattlerTarget].species == gBattleMons[gBattlerAttacker].species) + { + u8 gender1 = GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]); + u8 gender2 = GetMonGender(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]); + + if (gender1 != gender2 && gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS) + ballMultiplier = 80; + } + break; + case ITEM_HEAVY_BALL: + i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1); + if (i < 1024) + ballMultiplier = 5; + else if (i < 2048) + ballMultiplier = 10; + else if (i < 3072) + ballMultiplier = 20; + else if (i < 4096) + ballMultiplier = 30; + else + ballMultiplier = 40; + break; + case ITEM_FAST_BALL: + if (gBaseStats[gBattleMons[gBattlerTarget].species].baseSpeed >= 10) + ballMultiplier = 40; + break; + case ITEM_QUICK_BALL: + if (gBattleResults.battleTurnCounter == 0) + ballMultiplier = 40; + break; + case ITEM_DUSK_BALL: + RtcCalcLocalTime(); + if ((gLocalTime.hours >= 20 && gLocalTime.hours <= 3) || gMapHeader.cave || gMapHeader.mapType == MAP_TYPE_UNDERGROUND) + ballMultiplier = 30; + break; } } else @@ -10213,6 +10267,14 @@ static void atkEF_handleballthrow(void) gBattleCommunication[MULTISTRING_CHOOSER] = 0; else gBattleCommunication[MULTISTRING_CHOOSER] = 1; + + if (gLastUsedItem == ITEM_HEAL_BALL) + { + MonRestorePP(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]); + HealStatusConditions(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], gBattlerPartyIndexes[gBattlerTarget], STATUS1_ANY, gBattlerTarget); + gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP; + SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_HP, &gBattleMons[gBattlerTarget].hp); + } } else // not caught { diff --git a/src/wild_encounter.c b/src/wild_encounter.c index e42bf8a23..01b3378c8 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -38,6 +38,7 @@ static bool8 IsAbilityAllowingEncounter(u8 level); // EWRAM vars EWRAM_DATA static u8 sWildEncountersDisabled = 0; +EWRAM_DATA bool8 gIsFishingEncounter = 0; EWRAM_DATA static u32 sFeebasRngValue = 0; #include "data/wild_encounters.h" @@ -756,6 +757,7 @@ void FishingWildEncounter(u8 rod) } IncrementGameStat(GAME_STAT_FISHING_CAPTURES); SetPokemonAnglerSpecies(species); + gIsFishingEncounter = TRUE; BattleSetup_StartWildBattle(); } From 50eeddfec6ab3690ad66d3ade54f465f6d117385 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 17 Apr 2019 13:05:19 +0200 Subject: [PATCH 08/52] Evolution stone item effects --- src/data/pokemon/item_effects.h | 38 ++++++++++----------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index a17f249ef..37efcc08a 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -284,27 +284,7 @@ const u8 gItemEffect_XSpecial[8] = { [7] = 1, }; -const u8 gItemEffect_SunStone[6] = { - [4] = ITEM4_EVO_STONE, -}; - -const u8 gItemEffect_MoonStone[6] = { - [4] = ITEM4_EVO_STONE, -}; - -const u8 gItemEffect_FireStone[6] = { - [4] = ITEM4_EVO_STONE, -}; - -const u8 gItemEffect_ThunderStone[6] = { - [4] = ITEM4_EVO_STONE, -}; - -const u8 gItemEffect_WaterStone[6] = { - [4] = ITEM4_EVO_STONE, -}; - -const u8 gItemEffect_LeafStone[6] = { +const u8 gItemEffect_EvoStone[6] = { [4] = ITEM4_EVO_STONE, }; @@ -450,12 +430,16 @@ const u8 *const gItemEffectTable[] = [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, [ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecial, - [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone, - [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone, - [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone, - [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_ThunderStone, - [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone, - [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone, + [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_DAWN_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_DUSK_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_SHINY_STONE - ITEM_POTION] = gItemEffect_EvoStone, + [ITEM_ICE_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry, [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry, [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry, From 8e3f2d1e2d2bf4cf8cb20cb431f5c72a9d654ae9 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 12:38:51 -0300 Subject: [PATCH 09/52] Sweet Heart and Big Malasada data. --- src/data/items.h | 29 +++++++++++++++++++++++++++++ src/data/pokemon/item_effects.h | 11 +++++++++++ src/data/text/item_descriptions.h | 10 ++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 71860eb8d..47fce26dc 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -799,6 +799,35 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_SWEET_HEART] = + { + .name = _("Sweet Heart"), + .itemId = ITEM_SWEET_HEART, + .price = 3000, + .holdEffectParam = 20, + .description = sSweetHeartDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = 1, + .battleUseFunc = ItemUseInBattle_Medicine, + .secondaryId = 0, + }, + + [ITEM_BIG_MALASADA] = + { + .name = _("Big Malasada"), + .itemId = ITEM_BIG_MALASADA, + .price = 350, + .description = sBigMalasadaDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = 1, + .battleUseFunc = ItemUseInBattle_Medicine, + .secondaryId = 0, + }, + [ITEM_SACRED_ASH] = { .name = _("Sacred Ash"), diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 37efcc08a..b0dc15925 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -154,6 +154,15 @@ const u8 gItemEffect_BerryJuice[7] = { [6] = 20, }; +const u8 gItemEffect_SweetHeart[7] = { + [4] = ITEM4_HEAL_HP, + [6] = 20, +}; + +const u8 gItemEffect_BigMalasada[6] = { + [3] = ITEM3_STATUS_ALL, +}; + const u8 gItemEffect_SacredAsh[7] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, @@ -413,6 +422,8 @@ const u8 *const gItemEffectTable[] = [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, + [ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart, + [ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada, [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index f76e03a2a..a4dc8df07 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -270,6 +270,16 @@ static const u8 sBerryJuiceDesc[] = _( "that restores HP\n" "by 20 points."); +static const u8 sSweetHeartDesc[] = _( + "A sweet chocolate\n" + "that restores HP\n" + "by 20 points."); + +static const u8 sBigMalasadaDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one POKéMON."); + static const u8 sSacredAshDesc[] = _( "Fully revives and\n" "restores all\n" From c5f6f5e58800e52cd29cdafef8ef5e2b024e3436 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 13:06:08 -0300 Subject: [PATCH 10/52] Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense. --- src/data/items.h | 32 +++++++++++++++++++++++++++++-- src/data/pokemon/item_effects.h | 17 ++++++++++++++-- src/data/text/item_descriptions.h | 12 +++++++++++- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 47fce26dc..45f9d056b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -828,6 +828,20 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_OLD_GATEAU] = + { + .name = _("Old Gateau"), + .itemId = ITEM_OLD_GATEAU, + .price = 350, + .description = sOldGateauDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = 1, + .battleUseFunc = ItemUseInBattle_Medicine, + .secondaryId = 0, + }, + [ITEM_SACRED_ASH] = { .name = _("Sacred Ash"), @@ -1112,10 +1126,24 @@ const struct Item gItems[] = [ITEM_X_SP_ATK] = { - .name = _("X Special"), + .name = _("X Sp. Atk."), .itemId = ITEM_X_SP_ATK, .price = 350, - .description = sXSpecialDesc, + .description = sXSpecialAttackDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_StatIncrease, + .secondaryId = 0, + }, + + [ITEM_X_SP_DEF] = + { + .name = _("X Sp. Def."), + .itemId = ITEM_X_SP_DEF, + .price = 2000, + .description = sXSpecialDefenseDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index b0dc15925..c2a11d782 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -163,6 +163,10 @@ const u8 gItemEffect_BigMalasada[6] = { [3] = ITEM3_STATUS_ALL, }; +const u8 gItemEffect_OldGateau[6] = { + [3] = ITEM3_STATUS_ALL, +}; + const u8 gItemEffect_SacredAsh[7] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, @@ -286,7 +290,14 @@ const u8 gItemEffect_XAccuracy[8] = { [7] = 1, }; -const u8 gItemEffect_XSpecial[8] = { +const u8 gItemEffect_XSpecialAttack[8] = { + [2] = 1, + [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, + [6] = 1, + [7] = 1, +}; + +const u8 gItemEffect_XSpecialDefense[8] = { [2] = 1, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, @@ -424,6 +435,7 @@ const u8 *const gItemEffectTable[] = [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, [ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart, [ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada, + [ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_OldGateau, [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, @@ -440,7 +452,8 @@ const u8 *const gItemEffectTable[] = [ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefend, [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, - [ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecial, + [ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecialAttack, + [ITEM_X_SP_DEF - ITEM_POTION] = gItemEffect_XSpecialDefense, [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index a4dc8df07..813753505 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -280,6 +280,11 @@ static const u8 sBigMalasadaDesc[] = _( "status problems of\n" "one POKéMON."); +static const u8 sOldGateauDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one POKéMON."); + static const u8 sSacredAshDesc[] = _( "Fully revives and\n" "restores all\n" @@ -392,11 +397,16 @@ static const u8 sXAccuracyDesc[] = _( "of attack moves\n" "during one battle."); -static const u8 sXSpecialDesc[] = _( +static const u8 sXSpecialAttackDesc[] = _( "Raises the stat\n" "SP. ATK during one\n" "battle."); +static const u8 sXSpecialDefenseDesc[] = _( + "Raises the stat\n" + "SP. DEF during one\n" + "battle."); + static const u8 sPokeDollDesc[] = _( "Use to flee from\n" "any battle with\n" From b1ab37820bb5a238a2c557d430f55ac55d8a9130 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 13:39:58 -0300 Subject: [PATCH 11/52] Dawn, Dusk, Shiny and Ice Stones data. --- src/data/items.h | 61 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 24 ++++++++++++ 2 files changed, 85 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 45f9d056b..ad42737af 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1208,6 +1208,19 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_ABILITY_CAPSULE] = + { + .name = _("Ab. Capsule"), + .itemId = ITEM_ABILITY_CAPSULE, + .price = 10000, + .holdEffectParam = 0, + .description = sAbilityCapsuleDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + [ITEM_ESCAPE_ROPE] = { .name = _("Escape Rope"), @@ -1307,6 +1320,54 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_DAWN_STONE] = + { + .name = _("Dawn Stone"), + .itemId = ITEM_DAWN_STONE, + .price = 2100, + .description = sDawnStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_DUSK_STONE] = + { + .name = _("Dusk Stone"), + .itemId = ITEM_DUSK_STONE, + .price = 2100, + .description = sDuskStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_SHINY_STONE] = + { + .name = _("Shiny Stone"), + .itemId = ITEM_SHINY_STONE, + .price = 2100, + .description = sShinyStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_ICE_STONE] = + { + .name = _("Ice Stone"), + .itemId = ITEM_ICE_STONE, + .price = 2100, + .description = sIceStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + // Valuable items [ITEM_TINY_MUSHROOM] = diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 813753505..3959afc77 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -428,6 +428,10 @@ static const u8 sMaxRepelDesc[] = _( "POKéMON for 250\n" "steps."); +static const u8 sAbilityCapsuleDesc[] = _( + "Switches a POKé-\n" + "MON's ability."); + static const u8 sEscapeRopeDesc[] = _( "Use to escape\n" "instantly from a\n" @@ -469,6 +473,26 @@ static const u8 sLeafStoneDesc[] = _( "species of POKéMON\n" "evolve."); +static const u8 sDawnStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sDuskStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sShinyStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sIceStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + // Valuable items static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n" From f521bec102cb5e36926caded99c1b8ad18ae200f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 14:09:51 -0300 Subject: [PATCH 12/52] Added the 7 Apricorns' data. --- src/data/items.h | 84 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 36 +++++++++++++ 2 files changed, 120 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index ad42737af..048e06e06 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1370,6 +1370,90 @@ const struct Item gItems[] = // Valuable items + [ITEM_RED_APRICORN] = + { + .name = _("Red Apricorn"), + .itemId = ITEM_RED_APRICORN, + .price = 200, + .description = sRedApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLUE_APRICORN] = + { + .name = _("Blu Apricorn"), + .itemId = ITEM_BLUE_APRICORN, + .price = 200, + .description = sBlueApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_YELLOW_APRICORN] = + { + .name = _("Ylw Apricorn"), + .itemId = ITEM_YELLOW_APRICORN, + .price = 200, + .description = sYellowApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GREEN_APRICORN] = + { + .name = _("Grn Apricorn"), + .itemId = ITEM_GREEN_APRICORN, + .price = 200, + .description = sGreenApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PINK_APRICORN] = + { + .name = _("Pnk Apricorn"), + .itemId = ITEM_PINK_APRICORN, + .price = 200, + .description = sPinkApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WHITE_APRICORN] = + { + .name = _("Wht Apricorn"), + .itemId = ITEM_WHITE_APRICORN, + .price = 200, + .description = sWhiteApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLACK_APRICORN] = + { + .name = _("Blk Apricorn"), + .itemId = ITEM_BLACK_APRICORN, + .price = 200, + .description = sBlackApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_TINY_MUSHROOM] = { .name = _("TinyMushroom"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 3959afc77..9dfbdd93c 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -494,6 +494,42 @@ static const u8 sIceStoneDesc[] = _( "evolve."); // Valuable items + +static const u8 sRedApricornDesc[] = _( + "A red apricorn.\n" + "It assails your\n" + "nostrils."); + +static const u8 sBlueApricornDesc[] = _( + "A blue apricorn.\n" + "It smells a bit\n" + "like grass."); + +static const u8 sYellowApricornDesc[] = _( + "A yellow apricorn.\n" + "It has an invigor-\n" + "ating scent."); + +static const u8 sGreenApricornDesc[] = _( + "A green apricorn.\n" + "It has a strange,\n" + "aromatic scent."); + +static const u8 sPinkApricornDesc[] = _( + "A pink apricorn.\n" + "It has a nice,\n" + "sweet scent."); + +static const u8 sWhiteApricornDesc[] = _( + "A white apricorn.\n" + "It doesn't smell\n" + "like anything."); + +static const u8 sBlackApricornDesc[] = _( + "A black apricorn.\n" + "It has an inde-\n" + "scribable scent."); + static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n" "that would sell\n" From 3d12e76411bbf7960e8c7fbed0cf3d6bbe6d987b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 14:25:52 -0300 Subject: [PATCH 13/52] Added Oricorio's Nectars' data. --- src/data/items.h | 52 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 20 ++++++++++++ 2 files changed, 72 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 048e06e06..c3478dbd1 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1550,6 +1550,58 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_RED_NECTAR] = + { + .name = _("Red Nectar"), + .itemId = ITEM_RED_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sRedNectarDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + + [ITEM_YELLOW_NECTAR] = + { + .name = _("Yellow Nectar"), + .itemId = ITEM_YELLOW_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sYellowNectarDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + + [ITEM_PINK_NECTAR] = + { + .name = _("Pink Nectar"), + .itemId = ITEM_PINK_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sPinkNectarDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + + [ITEM_PURPLE_NECTAR] = + { + .name = _("Purple Nectar"), + .itemId = ITEM_PURPLE_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sPurpleNectarDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + // Mail [ITEM_ORANGE_MAIL] = { diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 9dfbdd93c..10989e3eb 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -570,6 +570,26 @@ static const u8 sHeartScaleDesc[] = _( "It is coveted by\n" "collectors."); +static const u8 sRedNectarDesc[] = _( + "Flower nectar that\n" + "changes the form\n" + "of certain POKéMON."); + +static const u8 sYellowNectarDesc[] = _( + "Flower nectar that\n" + "changes the form\n" + "of certain POKéMON."); + +static const u8 sPinkNectarDesc[] = _( + "Flower nectar that\n" + "changes the form\n" + "of certain POKéMON."); + +static const u8 sPurpleNectarDesc[] = _( + "Flower nectar that\n" + "changes the form\n" + "of certain POKéMON."); + // Mail static const u8 sOrangeMailDesc[] = _( "A ZIGZAGOON-print\n" From 850c93ec64234a19ffb40b401c2266f367086dfc Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 14:44:39 -0300 Subject: [PATCH 14/52] Rare Bone data. --- src/data/items.h | 12 ++++++++++++ src/data/text/item_descriptions.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index c3478dbd1..952e23716 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1602,6 +1602,18 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_RARE_BONE] = + { + .name = _("Rare Bone"), + .itemId = ITEM_RARE_BONE, + .price = 5000, + .description = sRareBoneDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + // Mail [ITEM_ORANGE_MAIL] = { diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 10989e3eb..767c88d1a 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -590,6 +590,11 @@ static const u8 sPurpleNectarDesc[] = _( "changes the form\n" "of certain POKéMON."); +static const u8 sRareBoneDesc[] = _( + "A very rare bone.\n" + "It can be sold at\n" + "a high price."); + // Mail static const u8 sOrangeMailDesc[] = _( "A ZIGZAGOON-print\n" From e0540dff468e6da166aebbd864cfc24543958a9d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 15:00:51 -0300 Subject: [PATCH 15/52] Oval Stone, Protector, Electirizer and Magmarizer data. --- src/data/items.h | 48 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 20 +++++++++++++ 2 files changed, 68 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 952e23716..bf7ce3d56 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2898,6 +2898,54 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_OVAL_STONE] = + { + .name = _("Oval Stone"), + .itemId = ITEM_OVAL_STONE, + .price = 2000, + .description = sOvalStoneDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PROTECTOR] = + { + .name = _("Protector"), + .itemId = ITEM_PROTECTOR, + .price = 2000, + .description = sProtectorDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ELECTIRIZER] = + { + .name = _("Electirizer"), + .itemId = ITEM_ELECTIRIZER, + .price = 2000, + .description = sElectirizerDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MAGMARIZER] = + { + .name = _("Magmarizer"), + .itemId = ITEM_MAGMARIZER, + .price = 2000, + .description = sMagmarizerDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_LIGHT_BALL] = { .name = _("Light Ball"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 767c88d1a..2ad0f49c8 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1078,6 +1078,26 @@ static const u8 sDragonScaleDesc[] = _( "held by DRAGON-\n" "type POKéMON."); +static const u8 sOvalStoneDesc[] = _( + "Helps a certain\n" + "POKéMON to evolve.\n" + "Looks like an egg."); + +static const u8 sProtectorDesc[] = _( + "A certain POKéMON\n" + "loves it. It's quite\n" + "heavy."); + +static const u8 sElectirizerDesc[] = _( + "A certain POKéMON\n" + "loves it. It's full\n" + "of electricity."); + +static const u8 sMagmarizerDesc[] = _( + "A certain POKéMON\n" + "loves it. It's full\n" + "of magma energy."); + static const u8 sLightBallDesc[] = _( "A hold item that\n" "raises the SP. ATK\n" From 331642772838b348f9387f8bcd3bc124aa3b49be Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 15:34:38 -0300 Subject: [PATCH 16/52] Dubious Disc, Reaper Cloth, Razor Claw, Razor Fang and Prism Scale data. --- src/data/items.h | 63 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 25 ++++++++++++ 2 files changed, 88 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index bf7ce3d56..c75bcd3ff 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2946,6 +2946,69 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_DUBIOUS_DISC] = + { + .name = _("Dubious Disc"), + .itemId = ITEM_DUBIOUS_DISC, + .price = 2000, + .description = sDubiousDiscDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_REAPER_CLOTH] = + { + .name = _("Reaper Cloth"), + .itemId = ITEM_REAPER_CLOTH, + .price = 2000, + .description = sReaperClothDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RAZOR_CLAW] = + { + .name = _("Razor Claw"), + .itemId = ITEM_RAZOR_CLAW, + .price = 2000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder. + .description = sRazorClawDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RAZOR_FANG] = + { + .name = _("Razor Fang"), + .itemId = ITEM_RAZOR_FANG, + .price = 2000, + .holdEffect = HOLD_EFFECT_FLINCH, + .holdEffectParam = 10, + .description = sRazorFangDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PRISM_SCALE] = + { + .name = _("Prism Scale"), + .itemId = ITEM_PRISM_SCALE, + .price = 2000, + .description = sPrismScaleDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_LIGHT_BALL] = { .name = _("Light Ball"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 2ad0f49c8..1783b66f8 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1098,6 +1098,31 @@ static const u8 sMagmarizerDesc[] = _( "loves it. It's full\n" "of magma energy."); +static const u8 sDubiousDiscDesc[] = _( + "A certain POKéMON\n" + "loves it. It's over-\n" + "flowing with data."); + +static const u8 sReaperClothDesc[] = _( + "A certain POKéMON\n" + "loves it. It's imbued\n" + "with strong energy."); + +static const u8 sRazorClawDesc[] = _( + "Helps a certain\n" + "POKéMON to evolve.\n" + "It's a sharp claw."); + +static const u8 sRazorFangDesc[] = _( + "Helps a certain\n" + "POKéMON to evolve.\n" + "It's a sharp fang."); + +static const u8 sPrismScaleDesc[] = _( + "A mysterious scale.\n" + "It helps a certain\n" + "POKéMON to evolve."); + static const u8 sLightBallDesc[] = _( "A hold item that\n" "raises the SP. ATK\n" From a48c8f6aba5e13ad759ec6bb20677935d0a52516 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 15:42:36 -0300 Subject: [PATCH 17/52] Sachet and Whipped Dream data. --- src/data/items.h | 24 ++++++++++++++++++++++++ src/data/text/item_descriptions.h | 10 ++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index c75bcd3ff..34b30d311 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3009,6 +3009,30 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_WHIPPED_DREAM] = + { + .name = _("WhippedDream"), + .itemId = ITEM_WHIPPED_DREAM, + .price = 2000, + .description = sWhippedDreamDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SACHET] = + { + .name = _("Sachet"), + .itemId = ITEM_SACHET, + .price = 2000, + .description = sSachetDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_LIGHT_BALL] = { .name = _("Light Ball"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 1783b66f8..28d82a292 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1123,6 +1123,16 @@ static const u8 sPrismScaleDesc[] = _( "It helps a certain\n" "POKéMON to evolve."); +static const u8 sWhippedDreamDesc[] = _( + "A soft and sweet\n" + "treat loved by some\n" + "POKéMON."); + +static const u8 sSachetDesc[] = _( + "A sachet filled with\n" + "perfumes loved by\n" + "some POKéMON."); + static const u8 sLightBallDesc[] = _( "A hold item that\n" "raises the SP. ATK\n" From 71472b1439723c2ceeffd8b9e53f22a46591305d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 16:07:48 -0300 Subject: [PATCH 18/52] Power items data. --- src/data/items.h | 78 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 34 +++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 34b30d311..5cb64c1a9 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3283,6 +3283,84 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_POWER_BRACER] = + { + .name = _("Power Bracer"), + .itemId = ITEM_POWER_BRACER, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerBracerDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_BELT] = + { + .name = _("Power Belt"), + .itemId = ITEM_POWER_BELT, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerBeltDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_LENS] = + { + .name = _("Power Lens"), + .itemId = ITEM_POWER_LENS, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerLensDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_BAND] = + { + .name = _("Power Band"), + .itemId = ITEM_POWER_BAND, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerBandDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_ANKLET] = + { + .name = _("Power Anklet"), + .itemId = ITEM_POWER_ANKLET, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerAnkletDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_WEIGHT] = + { + .name = _("Power Weight"), + .itemId = ITEM_POWER_WEIGHT, + .price = 3000, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .description = sPowerWeightDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_SEA_INCENSE] = { .name = _("Sea Incense"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 28d82a292..8a8575909 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1104,8 +1104,8 @@ static const u8 sDubiousDiscDesc[] = _( "flowing with data."); static const u8 sReaperClothDesc[] = _( - "A certain POKéMON\n" - "loves it. It's imbued\n" + "Loved by a certain\n" + "POKéMON. Imbued\n" "with strong energy."); static const u8 sRazorClawDesc[] = _( @@ -1222,6 +1222,36 @@ static const u8 sShellBellDesc[] = _( "restores HP upon\n" "striking the foe."); +static const u8 sPowerBracerDesc[] = _( + "A hold item that\n" + "promotes ATK gain,\n" + "but reduces SPEED."); + +static const u8 sPowerBeltDesc[] = _( + "A hold item that\n" + "promotes DEF gain,\n" + "but reduces SPEED."); + +static const u8 sPowerLensDesc[] = _( + "Hold item that pro-\n" + "motes SP. ATK gain,\n" + "but reduces SPEED."); + +static const u8 sPowerBandDesc[] = _( + "Hold item that pro-\n" + "motes SP. DEF gain,\n" + "but reduces SPEED."); + +static const u8 sPowerAnkletDesc[] = _( + "A hold item that\n" + "promotes SPD gain,\n" + "but reduces SPEED."); + +static const u8 sPowerWeightDesc[] = _( + "A hold item that\n" + "promotes HP gain,\n" + "but reduces SPEED."); + static const u8 sSeaIncenseDesc[] = _( "A hold item that\n" "slightly boosts\n" From cda17700c391c537210c0b568b2563fc4f3ef720 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 19:41:10 -0300 Subject: [PATCH 19/52] Defined a lot of hold effects and added more items data. --- include/constants/hold_effects.h | 26 ++++-- src/data/items.h | 142 +++++++++++++++++++++++++++++- src/data/text/item_descriptions.h | 58 +++++++++++- 3 files changed, 213 insertions(+), 13 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index feede12fb..494c4f506 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -106,20 +106,30 @@ #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 +#define HOLD_EFFECT_DRIVE 118 +#define HOLD_EFFECT_GEMS 119 +#define HOLD_EFFECT_ROCKY_HELMET 120 +#define HOLD_EFFECT_AIR_BALLOON 121 +#define HOLD_EFFECT_RED_CARD 122 +#define HOLD_EFFECT_RING_TARGET 123 +#define HOLD_EFFECT_BINDING_BAND 124 +#define HOLD_EFFECT_EJECT_BUTTON 125 +#define HOLD_EFFECT_ABSORB_BULB 126 +#define HOLD_EFFECT_CELL_BATTERY 127 // Gen6 hold effects -#define HOLD_EFFECT_FAIRY_POWER 129 -#define HOLD_EFFECT_MEGA_STONE 130 -#define HOLD_EFFECT_SAFETY_GOOGLES 131 +#define HOLD_EFFECT_FAIRY_POWER 129 +#define HOLD_EFFECT_MEGA_STONE 130 +#define HOLD_EFFECT_SAFETY_GOOGLES 131 +#define HOLD_EFFECT_LUMINOUS_MOSS 132 +#define HOLD_EFFECT_SNOWBALL 133 +#define HOLD_EFFECT_WEAKNESS_POLICY 134 // 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_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)) diff --git a/src/data/items.h b/src/data/items.h index 5cb64c1a9..db8e38962 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -5628,11 +5628,67 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_ROCKY_HELMET] = + { + .name = _("Rocky Helmet"), + .itemId = ITEM_ROCKY_HELMET, + .price = 2000, + .holdEffect = HOLD_EFFECT_ROCKY_HELMET, + .holdEffectParam = 0, + .description = sRockyHelmetDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_AIR_BALLOON] = + { + .name = _("Air Balloon"), + .itemId = ITEM_AIR_BALLOON, + .price = 2000, + .holdEffect = HOLD_EFFECT_AIR_BALLOON, + .holdEffectParam = 0, + .description = sAirBalloonDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RED_CARD] = + { + .name = _("Red Card"), + .itemId = ITEM_RED_CARD, + .price = 2000, + .holdEffect = HOLD_EFFECT_RED_CARD, + .holdEffectParam = 0, + .description = sRedCardDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RING_TARGET] = + { + .name = _("Ring Target"), + .itemId = ITEM_RING_TARGET, + .price = 2000, + .holdEffect = HOLD_EFFECT_RING_TARGET, + .holdEffectParam = 0, + .description = sRingTargetDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_BINDING_BAND] = { .name = _("Binding Band"), .itemId = ITEM_BINDING_BAND, - .price = 200, + .price = 2000, .holdEffect = HOLD_EFFECT_BINDING_BAND, .description = sBindingBandDesc, .pocket = POCKET_ITEMS, @@ -5641,6 +5697,90 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_EJECT_BUTTON] = + { + .name = _("Eject Button"), + .itemId = ITEM_EJECT_BUTTON, + .price = 2000, + .holdEffect = HOLD_EFFECT_EJECT_BUTTON, + .holdEffectParam = 0, + .description = sEjectButtonDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ABSORB_BULB] = + { + .name = _("Absorb Bulb"), + .itemId = ITEM_ABSORB_BULB, + .price = 2000, + .holdEffect = HOLD_EFFECT_ABSORB_BULB, + .holdEffectParam = 0, + .description = sAbsorbBulbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CELL_BATTERY] = + { + .name = _("Cell Battery"), + .itemId = ITEM_CELL_BATTERY, + .price = 2000, + .holdEffect = HOLD_EFFECT_CELL_BATTERY, + .holdEffectParam = 0, + .description = sCellBatteryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LUMINOUS_MOSS] = + { + .name = _("LuminousMoss"), + .itemId = ITEM_LUMINOUS_MOSS, + .price = 2000, + .holdEffect = HOLD_EFFECT_LUMINOUS_MOSS, + .holdEffectParam = 0, + .description = sLuminousMossDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SNOWBALL] = + { + .name = _("Snowball"), + .itemId = ITEM_SNOWBALL, + .price = 2000, + .holdEffect = HOLD_EFFECT_SNOWBALL, + .holdEffectParam = 0, + .description = sSnowballDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WEAKNESS_POLICY] = + { + .name = _("Weak. Policy"), + .itemId = ITEM_WEAKNESS_POLICY, + .price = 1000, + .holdEffect = HOLD_EFFECT_WEAKNESS_POLICY, + .holdEffectParam = 0, + .description = sWeaknessPolicyDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_DOUSE_DRIVE] = { .name = _("Douse Drive"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8a8575909..fa898bd1c 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -2126,11 +2126,61 @@ static const u8 sFloatStoneDesc[] = _( "reduces the weight\n" "of Pokémon when held."); +static const u8 sRockyHelmetDesc[] = _( + "Hurts the foe if\n" + "they touch its\n" + "holder."); + +static const u8 sAirBalloonDesc[] = _( + "Elevates the holder\n" + "in the air. If hit,\n" + "this item will burst."); + +static const u8 sRedCardDesc[] = _( + "Switches out the\n" + "foe if they hit the\n" + "holder."); + +static const u8 sRingTargetDesc[] = _( + "Moves that wouldn't\n" + "have effect will\n" + "land on its holder."); + static const u8 sBindingBandDesc[] = _( - "This band increases\n" - "the power of binding\n" + "Increases the\n" + "power of binding\n" "moves when held."); +static const u8 sEjectButtonDesc[] = _( + "Switches out the\n" + "user if they're hit\n" + "by the foe."); + +static const u8 sAbsorbBulbDesc[] = _( + "Raises SP. ATK if\n" + "the holder is hit by\n" + "a Water-type move."); + +static const u8 sCellBatteryDesc[] = _( + "Raises ATK if the\n" + "holder is hit by an\n" + "Electric-type move."); + +static const u8 sLuminousMossDesc[] = _( + "Raises SP. DEF if\n" + "the holder is hit by\n" + "a Water-type move."); + +static const u8 sSnowballDesc[] = _( + "Raises ATK if its\n" + "holder is hit by an\n" + "Ice-type move."); + +static const u8 sWeaknessPolicyDesc[] = _( + "If hit by a Super\n" + "Effective move, ups\n" + "ATK and SP. ATK."); + static const u8 sDouseDriveDesc[] = _( "Changes Genesect's\n" "Techno Blast so it\n" @@ -2243,8 +2293,8 @@ static const u8 sFairyGemDesc[] = _( static const u8 sAssaultVestDesc[] = _( "Raises Sp. Def but\n" - "prevents the use of\n" - "status moves."); + "prevents the use\n" + "of status moves."); static const u8 sPixiePlateDesc[] = _( "A stone tablet that\n" From e77960d2f36a7e029bc72a656d81056441cc8152 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 20:07:12 -0300 Subject: [PATCH 20/52] Updated the effects of the Sea and Lax Incenses, and added the item data of the Gen. 4 incenses. --- src/data/items.h | 105 ++++++++++++++++++++++++++++-- src/data/text/item_descriptions.h | 35 ++++++++++ 2 files changed, 136 insertions(+), 4 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index db8e38962..1b2ad0c77 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3365,9 +3365,9 @@ const struct Item gItems[] = { .name = _("Sea Incense"), .itemId = ITEM_SEA_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_WATER_POWER, - .holdEffectParam = 5, + .holdEffectParam = 20, .description = sSeaIncenseDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3379,9 +3379,9 @@ const struct Item gItems[] = { .name = _("Lax Incense"), .itemId = ITEM_LAX_INCENSE, - .price = 9600, + .price = 5000, .holdEffect = HOLD_EFFECT_EVASION_UP, - .holdEffectParam = 5, + .holdEffectParam = 10, .description = sLaxIncenseDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3389,6 +3389,103 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_ODD_INCENSE] = + { + .name = _("Odd Incense"), + .itemId = ITEM_ODD_INCENSE, + .price = 2000, + .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, + .holdEffectParam = 20, + .description = sOddIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROCK_INCENSE] = + { + .name = _("Rock Incense"), + .itemId = ITEM_ROCK_INCENSE, + .price = 2000, + .holdEffect = HOLD_EFFECT_ROCK_POWER, + .holdEffectParam = 20, + .description = sRockIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FULL_INCENSE] = + { + .name = _("Full Incense"), + .itemId = ITEM_FULL_INCENSE, + .price = 5000, + .holdEffect = HOLD_EFFECT_LAGGING_TAIL, + .holdEffectParam = 5, + .description = sFullIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WAVE_INCENSE] = + { + .name = _("Wave Incense"), + .itemId = ITEM_WAVE_INCENSE, + .price = 2000, + .holdEffect = HOLD_EFFECT_WATER_POWER, + .holdEffectParam = 20, + .description = sWaveIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROSE_INCENSE] = + { + .name = _("Rose Incense"), + .itemId = ITEM_ROSE_INCENSE, + .price = 2000, + .holdEffect = HOLD_EFFECT_GRASS_POWER, + .holdEffectParam = 20, + .description = sRoseIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LUCK_INCENSE] = + { + .name = _("Luck Incense"), + .itemId = ITEM_LUCK_INCENSE, + .price = 11000, + .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, + .holdEffectParam = 10, + .description = sLuckIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PURE_INCENSE] = + { + .name = _("Pure Incense"), + .itemId = ITEM_PURE_INCENSE, + .price = 6000, + .holdEffect = HOLD_EFFECT_REPEL, + .description = sPureIncenseDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_LUCKY_PUNCH] = { .name = _("Lucky Punch"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index fa898bd1c..6afa07198 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1262,6 +1262,41 @@ static const u8 sLaxIncenseDesc[] = _( "slightly lowers the\n" "foe's accuracy."); +static const u8 sOddIncenseDesc[] = _( + "A hold item that\n" + "boosts PSYCHIC-\n" + "type moves."); + +static const u8 sRockIncenseDesc[] = _( + "A hold item that\n" + "raises the power of\n" + "ROCK-type moves."); + +static const u8 sFullIncenseDesc[] = _( + "A held item that\n" + "makes the holder\n" + "move slower."); + +static const u8 sWaveIncenseDesc[] = _( + "A hold item that\n" + "slightly boosts\n" + "WATER-type moves."); + +static const u8 sRoseIncenseDesc[] = _( + "A hold item that\n" + "raises the power of\n" + "GRASS-type moves."); + +static const u8 sLuckIncenseDesc[] = _( + "Doubles money in\n" + "battle if the\n" + "holder takes part."); + +static const u8 sPureIncenseDesc[] = _( + "A hold item that\n" + "helps repel wild\n" + "POKéMON."); + static const u8 sLuckyPunchDesc[] = _( "A hold item that\n" "raises CHANSEY's\n" From 90e94f50d973c37d866d74629ee662872e3b0dad Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 22:07:43 -0300 Subject: [PATCH 21/52] Defined a hold effect for every battle-related item, and added all the missing items' data. --- include/constants/hold_effects.h | 26 +- src/data/items.h | 401 +++++++++++++++++++++++++++--- src/data/text/item_descriptions.h | 120 +++++++++ 3 files changed, 510 insertions(+), 37 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 494c4f506..759931cd1 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -100,7 +100,14 @@ #define HOLD_EFFECT_ADAMANT_ORB 94 #define HOLD_EFFECT_LUSTROUS_ORB 95 #define HOLD_EFFECT_GRISEOUS_ORB 96 -#define HOLD_EFFECT_RESIST_BERRY 97 +#define HOLD_EFFECT_GRACIDEA 97 +#define HOLD_EFFECT_RESIST_BERRY 98 +#define HOLD_EFFECT_POWER_BRACER 99 +#define HOLD_EFFECT_POWER_BELT 100 +#define HOLD_EFFECT_POWER_LENS 101 +#define HOLD_EFFECT_POWER_BAND 102 +#define HOLD_EFFECT_POWER_ANKLET 103 +#define HOLD_EFFECT_POWER_WEIGHT 104 // Gen5 hold effects #define HOLD_EFFECT_FLOAT_STONE 115 @@ -130,6 +137,23 @@ #define HOLD_EFFECT_TERRAIN_EXTENDER 150 #define HOLD_EFFECT_SEEDS 151 #define HOLD_EFFECT_ADRENALINE_ORB 152 +#define HOLD_EFFECT_BUG_MEMORY 153 +#define HOLD_EFFECT_DARK_MEMORY 154 +#define HOLD_EFFECT_DRAGON_MEMORY 155 +#define HOLD_EFFECT_ELECTRIC_MEMORY 156 +#define HOLD_EFFECT_FAIRY_MEMORY 157 +#define HOLD_EFFECT_FIGHTING_MEMORY 158 +#define HOLD_EFFECT_FIRE_MEMORY 159 +#define HOLD_EFFECT_FLYING_MEMORY 160 +#define HOLD_EFFECT_GHOST_MEMORY 161 +#define HOLD_EFFECT_GRASS_MEMORY 162 +#define HOLD_EFFECT_GROUND_MEMORY 163 +#define HOLD_EFFECT_ICE_MEMORY 164 +#define HOLD_EFFECT_POISON_MEMORY 165 +#define HOLD_EFFECT_PSYCHIC_MEMORY 166 +#define HOLD_EFFECT_ROCK_MEMORY 167 +#define HOLD_EFFECT_STEEL_MEMORY 168 +#define HOLD_EFFECT_WATER_MEMORY 169 #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) diff --git a/src/data/items.h b/src/data/items.h index 1b2ad0c77..6de0fc741 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3288,7 +3288,7 @@ const struct Item gItems[] = .name = _("Power Bracer"), .itemId = ITEM_POWER_BRACER, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_BRACER, .description = sPowerBracerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3301,7 +3301,7 @@ const struct Item gItems[] = .name = _("Power Belt"), .itemId = ITEM_POWER_BELT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_BELT, .description = sPowerBeltDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3314,7 +3314,7 @@ const struct Item gItems[] = .name = _("Power Lens"), .itemId = ITEM_POWER_LENS, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_LENS, .description = sPowerLensDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3327,7 +3327,7 @@ const struct Item gItems[] = .name = _("Power Band"), .itemId = ITEM_POWER_BAND, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_BAND, .description = sPowerBandDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3340,7 +3340,7 @@ const struct Item gItems[] = .name = _("Power Anklet"), .itemId = ITEM_POWER_ANKLET, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_ANKLET, .description = sPowerAnkletDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3353,7 +3353,7 @@ const struct Item gItems[] = .name = _("Power Weight"), .itemId = ITEM_POWER_WEIGHT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, // Placeholder? + .holdEffect = HOLD_EFFECT_POWER_WEIGHT, .description = sPowerWeightDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3945,32 +3945,6 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_ROOT_FOSSIL] = - { - .name = _("Root Fossil"), - .itemId = ITEM_ROOT_FOSSIL, - .price = 0, - .description = sRootFossilDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_CLAW_FOSSIL] = - { - .name = _("Claw Fossil"), - .itemId = ITEM_CLAW_FOSSIL, - .price = 0, - .description = sClawFossilDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - [ITEM_DEVON_SCOPE] = { .name = _("Devon Scope"), @@ -4796,14 +4770,40 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_ARMOR_FOSSIL] = + { + .name = _("Armor Fossil"), + .itemId = ITEM_ARMOR_FOSSIL, + .price = 0, + .description = sArmorFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SKULL_FOSSIL] = + { + .name = _("Skull Fossil"), + .itemId = ITEM_SKULL_FOSSIL, + .price = 0, + .description = sSkullFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_HELIX_FOSSIL] = { .name = _("Helix Fossil"), .itemId = ITEM_HELIX_FOSSIL, .price = 0, .description = sHelixFossilDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, + .importance = 0, + .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, @@ -4815,8 +4815,86 @@ const struct Item gItems[] = .itemId = ITEM_DOME_FOSSIL, .price = 0, .description = sDomeFossilDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROOT_FOSSIL] = + { + .name = _("Root Fossil"), + .itemId = ITEM_ROOT_FOSSIL, + .price = 0, + .description = sRootFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CLAW_FOSSIL] = + { + .name = _("Claw Fossil"), + .itemId = ITEM_CLAW_FOSSIL, + .price = 0, + .description = sClawFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_COVER_FOSSIL] = + { + .name = _("Covet Fossil"), + .itemId = ITEM_COVER_FOSSIL, + .price = 0, + .description = sCoverFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PLUME_FOSSIL] = + { + .name = _("Plume Fossil"), + .itemId = ITEM_PLUME_FOSSIL, + .price = 0, + .description = sPlumeFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_JAW_FOSSIL] = + { + .name = _("Jaw Fossil"), + .itemId = ITEM_JAW_FOSSIL, + .price = 0, + .description = sJawFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SAIL_FOSSIL] = + { + .name = _("Sail Fossil"), + .itemId = ITEM_SAIL_FOSSIL, + .price = 0, + .description = sSailFossilDesc, + .importance = 0, + .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, @@ -5474,6 +5552,257 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_GRACIDEA] = + { + .name = _("Gracidea"), + .itemId = ITEM_GRACIDEA, + .price = 200, + .holdEffect = HOLD_EFFECT_GRACIDEA, + .description = sGracideaDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BUG_MEMORY] = + { + .name = _("Bug Memory"), + .itemId = ITEM_BUG_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_BUG_MEMORY, + .holdEffectParam = 0, + .description = sBugMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DARK_MEMORY] = + { + .name = _("Dark Memory"), + .itemId = ITEM_DARK_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_DARK_MEMORY, + .holdEffectParam = 0, + .description = sDarkMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DRAGON_MEMORY] = + { + .name = _("Dragon Memory"), + .itemId = ITEM_DRAGON_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_DRAGON_MEMORY, + .holdEffectParam = 0, + .description = sDragonMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ELECTRIC_MEMORY] = + { + .name = _("Elec. Memory"), + .itemId = ITEM_ELECTRIC_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_ELECTRIC_MEMORY, + .holdEffectParam = 0, + .description = sElectricMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FAIRY_MEMORY] = + { + .name = _("Fairy Memory"), + .itemId = ITEM_FAIRY_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_FAIRY_MEMORY, + .holdEffectParam = 0, + .description = sFairyMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FIGHTING_MEMORY] = + { + .name = _("Fight Memory"), + .itemId = ITEM_FIGHTING_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_FIGHTING_MEMORY, + .holdEffectParam = 0, + .description = sFightingMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FIRE_MEMORY] = + { + .name = _("Fire Memory"), + .itemId = ITEM_FIRE_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_FIRE_MEMORY, + .holdEffectParam = 0, + .description = sFireMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FLYING_MEMORY] = + { + .name = _("Flying Memory"), + .itemId = ITEM_FLYING_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_FLYING_MEMORY, + .holdEffectParam = 0, + .description = sFlyingMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GHOST_MEMORY] = + { + .name = _("Ghost Memory"), + .itemId = ITEM_GHOST_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_GHOST_MEMORY, + .holdEffectParam = 0, + .description = sGhostMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GRASS_MEMORY] = + { + .name = _("Grass Memory"), + .itemId = ITEM_GRASS_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_GRASS_MEMORY, + .holdEffectParam = 0, + .description = sGrassMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GROUND_MEMORY] = + { + .name = _("Ground Memory"), + .itemId = ITEM_GROUND_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_GROUND_MEMORY, + .holdEffectParam = 0, + .description = sGroundMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ICE_MEMORY] = + { + .name = _("Ice Memory"), + .itemId = ITEM_ICE_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_ICE_MEMORY, + .holdEffectParam = 0, + .description = sIceMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POISON_MEMORY] = + { + .name = _("Poison Memory"), + .itemId = ITEM_POISON_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_POISON_MEMORY, + .holdEffectParam = 0, + .description = sPoisonMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PSYCHIC_MEMORY] = + { + .name = _("PsychicMemory"), + .itemId = ITEM_PSYCHIC_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_PSYCHIC_MEMORY, + .holdEffectParam = 0, + .description = sPsychicMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROCK_MEMORY] = + { + .name = _("Rock Memory"), + .itemId = ITEM_ROCK_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_ROCK_MEMORY, + .holdEffectParam = 0, + .description = sRockMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_STEEL_MEMORY] = + { + .name = _("Steel Memory"), + .itemId = ITEM_STEEL_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_STEEL_MEMORY, + .holdEffectParam = 0, + .description = sSteelMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WATER_MEMORY] = + { + .name = _("Water Memory"), + .itemId = ITEM_WATER_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_WATER_MEMORY, + .holdEffectParam = 0, + .description = sWaterMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_FLAME_PLATE] = { .name = _("Flame Plate"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 6afa07198..40a0c2f0b 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1819,6 +1819,16 @@ static const u8 sLiftKeyDesc[] = _( "used in TEAM\n" "ROCKET's HIDEOUT."); +static const u8 sArmorFossilDesc[] = _( + "A piece of a\n" + "prehistoric POKé-\n" + "MON's head."); + +static const u8 sSkullFossilDesc[] = _( + "A piece of a\n" + "prehistoric POKé-\n" + "MON's head."); + static const u8 sHelixFossilDesc[] = _( "A piece of an\n" "ancient marine\n" @@ -1829,6 +1839,26 @@ static const u8 sDomeFossilDesc[] = _( "ancient marine\n" "POKéMON's shell."); +static const u8 sCoverFossilDesc[] = _( + "A piece of a\n" + "prehistoric POKé-\n" + "MON's back."); + +static const u8 sPlumeFossilDesc[] = _( + "A piece of a\n" + "prehistoric POKé-\n" + "MON's wing."); + +static const u8 sJawFossilDesc[] = _( + "A piece of a prehis-\n" + "toric POKéMON's\n" + "large jaw."); + +static const u8 sSailFossilDesc[] = _( + "A piece of a prehis-\n" + "toric POKéMON's\n" + "skin sail."); + static const u8 sSilphScopeDesc[] = _( "SILPH CO's scope\n" "makes unseeable\n" @@ -2071,6 +2101,96 @@ static const u8 sGriseousOrbDesc[] = _( "Giratina's Dragon\n" "and Ghost-type moves."); +static const u8 sGracideaDesc[] = _( + "Bouquets made with\n" + "it are offered as a\n" + "token of gratitude."); + +static const u8 sBugMemoryDesc[] = _( + "A disc with Bug\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sDarkMemoryDesc[] = _( + "A disc with Dark\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sDragonMemoryDesc[] = _( + "A disc with Dragon\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sElectricMemoryDesc[] = _( + "A disc with Electric\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sFairyMemoryDesc[] = _( + "A disc with Fairy\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sFightingMemoryDesc[] = _( + "A disc with Fighting\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sFireMemoryDesc[] = _( + "A disc with Fire\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sFlyingMemoryDesc[] = _( + "A disc with Flying\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sGhostMemoryDesc[] = _( + "A disc with Ghost\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sGrassMemoryDesc[] = _( + "A disc with Grass\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sGroundMemoryDesc[] = _( + "A disc with Ground\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sIceMemoryDesc[] = _( + "A disc with Ice\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sPoisonMemoryDesc[] = _( + "A disc with Poison\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sPsychicMemoryDesc[] = _( + "A disc with Psychic\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sRockMemoryDesc[] = _( + "A disc with Rock\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sSteelMemoryDesc[] = _( + "A disc with Steel\n" + "type data. It swaps\n" + "Silvally's type."); + +static const u8 sWaterMemoryDesc[] = _( + "A disc with Water\n" + "type data. It swaps\n" + "Silvally's type."); + static const u8 sFlamePlateDesc[] = _( "A stone tablet that\n" "boosts the power of\n" From 36d83719504431fbc97d93209190320edddcdbdc Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 2 May 2019 15:11:06 -0300 Subject: [PATCH 22/52] Added the sprites and the data for the missing items. --- .../items/icon_palettes/ability_capsule.pal | 19 ++ graphics/items/icon_palettes/absorb_bulb.pal | 19 ++ graphics/items/icon_palettes/air_balloon.pal | 19 ++ graphics/items/icon_palettes/armor_fossil.pal | 19 ++ graphics/items/icon_palettes/babiri_berry.pal | 19 ++ graphics/items/icon_palettes/big_malasada.pal | 19 ++ .../items/icon_palettes/black_apricorn.pal | 19 ++ .../items/icon_palettes/blue_apricorn.pal | 19 ++ graphics/items/icon_palettes/bug_memory.pal | 19 ++ graphics/items/icon_palettes/cell_battery.pal | 19 ++ graphics/items/icon_palettes/charti_berry.pal | 19 ++ graphics/items/icon_palettes/chilan_berry.pal | 19 ++ graphics/items/icon_palettes/chople_berry.pal | 19 ++ graphics/items/icon_palettes/coba_berry.pal | 19 ++ graphics/items/icon_palettes/colbur_berry.pal | 19 ++ graphics/items/icon_palettes/cover_fossil.pal | 19 ++ graphics/items/icon_palettes/custap_berry.pal | 19 ++ graphics/items/icon_palettes/dark_memory.pal | 19 ++ graphics/items/icon_palettes/dawn_stone.pal | 19 ++ .../items/icon_palettes/dragon_memory.pal | 19 ++ graphics/items/icon_palettes/dubious_disc.pal | 19 ++ graphics/items/icon_palettes/dusk_stone.pal | 19 ++ graphics/items/icon_palettes/eject_button.pal | 19 ++ graphics/items/icon_palettes/electirizer.pal | 19 ++ .../items/icon_palettes/electric_memory.pal | 19 ++ graphics/items/icon_palettes/fairy_memory.pal | 19 ++ .../items/icon_palettes/fighting_memory.pal | 19 ++ graphics/items/icon_palettes/fire_memory.pal | 19 ++ .../items/icon_palettes/flying_memory.pal | 19 ++ graphics/items/icon_palettes/full_incense.pal | 19 ++ graphics/items/icon_palettes/ghost_memory.pal | 19 ++ graphics/items/icon_palettes/gracidea.pal | 19 ++ graphics/items/icon_palettes/grass_memory.pal | 19 ++ .../items/icon_palettes/green_apricorn.pal | 19 ++ .../items/icon_palettes/ground_memory.pal | 19 ++ graphics/items/icon_palettes/haban_berry.pal | 19 ++ graphics/items/icon_palettes/ice_memory.pal | 19 ++ graphics/items/icon_palettes/ice_stone.pal | 19 ++ graphics/items/icon_palettes/jaboca_berry.pal | 19 ++ graphics/items/icon_palettes/jaw_fossil.pal | 19 ++ graphics/items/icon_palettes/kasib_berry.pal | 19 ++ graphics/items/icon_palettes/kebia_berry.pal | 19 ++ graphics/items/icon_palettes/kee_berry.pal | 19 ++ graphics/items/icon_palettes/luck_incense.pal | 19 ++ .../items/icon_palettes/luminous_moss.pal | 19 ++ graphics/items/icon_palettes/magmarizer.pal | 19 ++ .../items/icon_palettes/maranga_berry.pal | 19 ++ graphics/items/icon_palettes/micle_berry.pal | 19 ++ graphics/items/icon_palettes/occa_berry.pal | 19 ++ graphics/items/icon_palettes/odd_incense.pal | 19 ++ graphics/items/icon_palettes/odd_keystone.pal | 19 ++ graphics/items/icon_palettes/old_gateau.pal | 19 ++ graphics/items/icon_palettes/oval_stone.pal | 19 ++ graphics/items/icon_palettes/passho_berry.pal | 19 ++ graphics/items/icon_palettes/payapa_berry.pal | 19 ++ .../items/icon_palettes/pink_apricorn.pal | 19 ++ graphics/items/icon_palettes/pink_nectar.pal | 19 ++ graphics/items/icon_palettes/plume_fossil.pal | 19 ++ .../items/icon_palettes/poison_memory.pal | 19 ++ graphics/items/icon_palettes/power_anklet.pal | 19 ++ graphics/items/icon_palettes/power_band.pal | 19 ++ graphics/items/icon_palettes/power_belt.pal | 19 ++ graphics/items/icon_palettes/power_bracer.pal | 19 ++ graphics/items/icon_palettes/power_lens.pal | 19 ++ graphics/items/icon_palettes/power_weight.pal | 19 ++ graphics/items/icon_palettes/prism_scale.pal | 19 ++ graphics/items/icon_palettes/protector.pal | 19 ++ .../items/icon_palettes/psychic_memory.pal | 19 ++ graphics/items/icon_palettes/pure_incense.pal | 19 ++ .../items/icon_palettes/purple_nectar.pal | 19 ++ graphics/items/icon_palettes/rare_bone.pal | 19 ++ graphics/items/icon_palettes/razor_claw.pal | 19 ++ graphics/items/icon_palettes/razor_fang.pal | 19 ++ graphics/items/icon_palettes/reaper_cloth.pal | 19 ++ graphics/items/icon_palettes/red_apricorn.pal | 19 ++ graphics/items/icon_palettes/red_card.pal | 19 ++ graphics/items/icon_palettes/red_nectar.pal | 19 ++ graphics/items/icon_palettes/rindo_berry.pal | 19 ++ graphics/items/icon_palettes/ring_target.pal | 19 ++ graphics/items/icon_palettes/rock_incense.pal | 19 ++ graphics/items/icon_palettes/rock_memory.pal | 19 ++ graphics/items/icon_palettes/rocky_helmet.pal | 19 ++ graphics/items/icon_palettes/rose_incense.pal | 19 ++ graphics/items/icon_palettes/roseli_berry.pal | 19 ++ graphics/items/icon_palettes/rowap_berry.pal | 19 ++ graphics/items/icon_palettes/sachet.pal | 19 ++ graphics/items/icon_palettes/sail_fossil.pal | 19 ++ graphics/items/icon_palettes/shiny_stone.pal | 19 ++ graphics/items/icon_palettes/shuca_berry.pal | 19 ++ graphics/items/icon_palettes/skull_fossil.pal | 19 ++ graphics/items/icon_palettes/snowball.pal | 19 ++ graphics/items/icon_palettes/steel_memory.pal | 19 ++ graphics/items/icon_palettes/sweet_heart.pal | 19 ++ graphics/items/icon_palettes/tanga_berry.pal | 19 ++ graphics/items/icon_palettes/wacan_berry.pal | 19 ++ graphics/items/icon_palettes/water_memory.pal | 19 ++ graphics/items/icon_palettes/wave_incense.pal | 19 ++ .../items/icon_palettes/weakness_policy.pal | 19 ++ .../items/icon_palettes/whipped_dream.pal | 19 ++ .../items/icon_palettes/white_apricorn.pal | 19 ++ .../items/icon_palettes/x_special_defense.pal | 19 ++ graphics/items/icon_palettes/yache_berry.pal | 19 ++ .../items/icon_palettes/yellow_apricorn.pal | 19 ++ .../items/icon_palettes/yellow_nectar.pal | 19 ++ graphics/items/icons/ability_capsule.png | Bin 0 -> 349 bytes graphics/items/icons/absorb_bulb.png | Bin 0 -> 365 bytes graphics/items/icons/air_balloon.png | Bin 0 -> 343 bytes graphics/items/icons/armor_fossil.png | Bin 0 -> 457 bytes graphics/items/icons/babiri_berry.png | Bin 0 -> 391 bytes graphics/items/icons/big_malasada.png | Bin 0 -> 393 bytes graphics/items/icons/black_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/blue_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/bug_memory.png | Bin 0 -> 423 bytes graphics/items/icons/cell_battery.png | Bin 0 -> 289 bytes graphics/items/icons/charti_berry.png | Bin 0 -> 359 bytes graphics/items/icons/chilan_berry.png | Bin 0 -> 377 bytes graphics/items/icons/chople_berry.png | Bin 0 -> 388 bytes graphics/items/icons/coba_berry.png | Bin 0 -> 370 bytes graphics/items/icons/colbur_berry.png | Bin 0 -> 376 bytes graphics/items/icons/cover_fossil.png | Bin 0 -> 418 bytes graphics/items/icons/custap_berry.png | Bin 0 -> 406 bytes graphics/items/icons/dark_memory.png | Bin 0 -> 419 bytes graphics/items/icons/dawn_stone.png | Bin 0 -> 375 bytes graphics/items/icons/dragon_memory.png | Bin 0 -> 420 bytes graphics/items/icons/dubious_disc.png | Bin 0 -> 377 bytes graphics/items/icons/dusk_stone.png | Bin 0 -> 376 bytes graphics/items/icons/eject_button.png | Bin 0 -> 370 bytes graphics/items/icons/electirizer.png | Bin 0 -> 371 bytes graphics/items/icons/electric_memory.png | Bin 0 -> 421 bytes graphics/items/icons/fairy_memory.png | Bin 0 -> 422 bytes graphics/items/icons/fighting_memory.png | Bin 0 -> 419 bytes graphics/items/icons/fire_memory.png | Bin 0 -> 422 bytes graphics/items/icons/flying_memory.png | Bin 0 -> 420 bytes graphics/items/icons/full_incense.png | Bin 0 -> 409 bytes graphics/items/icons/ghost_memory.png | Bin 0 -> 421 bytes graphics/items/icons/gracidea.png | Bin 0 -> 446 bytes graphics/items/icons/grass_memory.png | Bin 0 -> 421 bytes graphics/items/icons/green_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/ground_memory.png | Bin 0 -> 420 bytes graphics/items/icons/haban_berry.png | Bin 0 -> 401 bytes graphics/items/icons/ice_memory.png | Bin 0 -> 415 bytes graphics/items/icons/ice_stone.png | Bin 0 -> 422 bytes graphics/items/icons/jaboca_berry.png | Bin 0 -> 395 bytes graphics/items/icons/jaw_fossil.png | Bin 0 -> 444 bytes graphics/items/icons/kasib_berry.png | Bin 0 -> 403 bytes graphics/items/icons/kebia_berry.png | Bin 0 -> 393 bytes graphics/items/icons/kee_berry.png | Bin 0 -> 447 bytes graphics/items/icons/luck_incense.png | Bin 0 -> 404 bytes graphics/items/icons/luminous_moss.png | Bin 0 -> 385 bytes graphics/items/icons/magmarizer.png | Bin 0 -> 376 bytes graphics/items/icons/maranga_berry.png | Bin 0 -> 401 bytes graphics/items/icons/micle_berry.png | Bin 0 -> 340 bytes graphics/items/icons/occa_berry.png | Bin 0 -> 366 bytes graphics/items/icons/odd_incense.png | Bin 0 -> 402 bytes graphics/items/icons/odd_keystone.png | Bin 0 -> 395 bytes graphics/items/icons/old_gateau.png | Bin 0 -> 330 bytes graphics/items/icons/oval_stone.png | Bin 0 -> 364 bytes graphics/items/icons/passho_berry.png | Bin 0 -> 383 bytes graphics/items/icons/payapa_berry.png | Bin 0 -> 390 bytes graphics/items/icons/pink_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/pink_nectar.png | Bin 0 -> 379 bytes graphics/items/icons/plume_fossil.png | Bin 0 -> 393 bytes graphics/items/icons/poison_memory.png | Bin 0 -> 419 bytes graphics/items/icons/power_anklet.png | Bin 0 -> 415 bytes graphics/items/icons/power_band.png | Bin 0 -> 417 bytes graphics/items/icons/power_belt.png | Bin 0 -> 412 bytes graphics/items/icons/power_bracer.png | Bin 0 -> 401 bytes graphics/items/icons/power_lens.png | Bin 0 -> 428 bytes graphics/items/icons/power_weight.png | Bin 0 -> 404 bytes graphics/items/icons/prism_scale.png | Bin 0 -> 325 bytes graphics/items/icons/protector.png | Bin 0 -> 381 bytes graphics/items/icons/psychic_memory.png | Bin 0 -> 420 bytes graphics/items/icons/pure_incense.png | Bin 0 -> 401 bytes graphics/items/icons/purple_nectar.png | Bin 0 -> 379 bytes graphics/items/icons/rare_bone.png | Bin 0 -> 331 bytes graphics/items/icons/razor_claw.png | Bin 0 -> 360 bytes graphics/items/icons/razor_fang.png | Bin 0 -> 342 bytes graphics/items/icons/reaper_cloth.png | Bin 0 -> 401 bytes graphics/items/icons/red_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/red_card.png | Bin 0 -> 311 bytes graphics/items/icons/red_nectar.png | Bin 0 -> 380 bytes graphics/items/icons/rindo_berry.png | Bin 0 -> 353 bytes graphics/items/icons/ring_target.png | Bin 0 -> 330 bytes graphics/items/icons/rock_incense.png | Bin 0 -> 407 bytes graphics/items/icons/rock_memory.png | Bin 0 -> 414 bytes graphics/items/icons/rocky_helmet.png | Bin 0 -> 385 bytes graphics/items/icons/rose_incense.png | Bin 0 -> 408 bytes graphics/items/icons/roseli_berry.png | Bin 0 -> 400 bytes graphics/items/icons/rowap_berry.png | Bin 0 -> 440 bytes graphics/items/icons/sachet.png | Bin 0 -> 369 bytes graphics/items/icons/sail_fossil.png | Bin 0 -> 438 bytes graphics/items/icons/shiny_stone.png | Bin 0 -> 390 bytes graphics/items/icons/shuca_berry.png | Bin 0 -> 369 bytes graphics/items/icons/skull_fossil.png | Bin 0 -> 450 bytes graphics/items/icons/snowball.png | Bin 0 -> 333 bytes graphics/items/icons/steel_memory.png | Bin 0 -> 419 bytes graphics/items/icons/sweet_heart.png | Bin 0 -> 328 bytes graphics/items/icons/tanga_berry.png | Bin 0 -> 416 bytes graphics/items/icons/wacan_berry.png | Bin 0 -> 386 bytes graphics/items/icons/water_memory.png | Bin 0 -> 417 bytes graphics/items/icons/wave_incense.png | Bin 0 -> 400 bytes graphics/items/icons/weakness_policy.png | Bin 0 -> 316 bytes graphics/items/icons/whipped_dream.png | Bin 0 -> 392 bytes graphics/items/icons/white_apricorn.png | Bin 0 -> 367 bytes graphics/items/icons/x_special_defense.png | Bin 0 -> 410 bytes graphics/items/icons/yache_berry.png | Bin 0 -> 395 bytes graphics/items/icons/yellow_apricorn.png | Bin 0 -> 368 bytes graphics/items/icons/yellow_nectar.png | Bin 0 -> 379 bytes include/graphics.h | 210 +++++++++++- src/data/graphics/items.h | 314 ++++++++++++++++++ src/data/item_icon_table.h | 105 ++++++ 211 files changed, 2604 insertions(+), 1 deletion(-) create mode 100755 graphics/items/icon_palettes/ability_capsule.pal create mode 100755 graphics/items/icon_palettes/absorb_bulb.pal create mode 100755 graphics/items/icon_palettes/air_balloon.pal create mode 100755 graphics/items/icon_palettes/armor_fossil.pal create mode 100755 graphics/items/icon_palettes/babiri_berry.pal create mode 100755 graphics/items/icon_palettes/big_malasada.pal create mode 100755 graphics/items/icon_palettes/black_apricorn.pal create mode 100755 graphics/items/icon_palettes/blue_apricorn.pal create mode 100755 graphics/items/icon_palettes/bug_memory.pal create mode 100755 graphics/items/icon_palettes/cell_battery.pal create mode 100755 graphics/items/icon_palettes/charti_berry.pal create mode 100755 graphics/items/icon_palettes/chilan_berry.pal create mode 100755 graphics/items/icon_palettes/chople_berry.pal create mode 100755 graphics/items/icon_palettes/coba_berry.pal create mode 100755 graphics/items/icon_palettes/colbur_berry.pal create mode 100755 graphics/items/icon_palettes/cover_fossil.pal create mode 100755 graphics/items/icon_palettes/custap_berry.pal create mode 100755 graphics/items/icon_palettes/dark_memory.pal create mode 100755 graphics/items/icon_palettes/dawn_stone.pal create mode 100755 graphics/items/icon_palettes/dragon_memory.pal create mode 100755 graphics/items/icon_palettes/dubious_disc.pal create mode 100755 graphics/items/icon_palettes/dusk_stone.pal create mode 100755 graphics/items/icon_palettes/eject_button.pal create mode 100755 graphics/items/icon_palettes/electirizer.pal create mode 100755 graphics/items/icon_palettes/electric_memory.pal create mode 100755 graphics/items/icon_palettes/fairy_memory.pal create mode 100755 graphics/items/icon_palettes/fighting_memory.pal create mode 100755 graphics/items/icon_palettes/fire_memory.pal create mode 100755 graphics/items/icon_palettes/flying_memory.pal create mode 100755 graphics/items/icon_palettes/full_incense.pal create mode 100755 graphics/items/icon_palettes/ghost_memory.pal create mode 100755 graphics/items/icon_palettes/gracidea.pal create mode 100755 graphics/items/icon_palettes/grass_memory.pal create mode 100755 graphics/items/icon_palettes/green_apricorn.pal create mode 100755 graphics/items/icon_palettes/ground_memory.pal create mode 100755 graphics/items/icon_palettes/haban_berry.pal create mode 100755 graphics/items/icon_palettes/ice_memory.pal create mode 100755 graphics/items/icon_palettes/ice_stone.pal create mode 100755 graphics/items/icon_palettes/jaboca_berry.pal create mode 100755 graphics/items/icon_palettes/jaw_fossil.pal create mode 100755 graphics/items/icon_palettes/kasib_berry.pal create mode 100755 graphics/items/icon_palettes/kebia_berry.pal create mode 100755 graphics/items/icon_palettes/kee_berry.pal create mode 100755 graphics/items/icon_palettes/luck_incense.pal create mode 100755 graphics/items/icon_palettes/luminous_moss.pal create mode 100755 graphics/items/icon_palettes/magmarizer.pal create mode 100755 graphics/items/icon_palettes/maranga_berry.pal create mode 100755 graphics/items/icon_palettes/micle_berry.pal create mode 100755 graphics/items/icon_palettes/occa_berry.pal create mode 100755 graphics/items/icon_palettes/odd_incense.pal create mode 100755 graphics/items/icon_palettes/odd_keystone.pal create mode 100755 graphics/items/icon_palettes/old_gateau.pal create mode 100755 graphics/items/icon_palettes/oval_stone.pal create mode 100755 graphics/items/icon_palettes/passho_berry.pal create mode 100755 graphics/items/icon_palettes/payapa_berry.pal create mode 100755 graphics/items/icon_palettes/pink_apricorn.pal create mode 100755 graphics/items/icon_palettes/pink_nectar.pal create mode 100755 graphics/items/icon_palettes/plume_fossil.pal create mode 100755 graphics/items/icon_palettes/poison_memory.pal create mode 100755 graphics/items/icon_palettes/power_anklet.pal create mode 100755 graphics/items/icon_palettes/power_band.pal create mode 100755 graphics/items/icon_palettes/power_belt.pal create mode 100755 graphics/items/icon_palettes/power_bracer.pal create mode 100755 graphics/items/icon_palettes/power_lens.pal create mode 100755 graphics/items/icon_palettes/power_weight.pal create mode 100755 graphics/items/icon_palettes/prism_scale.pal create mode 100755 graphics/items/icon_palettes/protector.pal create mode 100755 graphics/items/icon_palettes/psychic_memory.pal create mode 100755 graphics/items/icon_palettes/pure_incense.pal create mode 100755 graphics/items/icon_palettes/purple_nectar.pal create mode 100755 graphics/items/icon_palettes/rare_bone.pal create mode 100755 graphics/items/icon_palettes/razor_claw.pal create mode 100755 graphics/items/icon_palettes/razor_fang.pal create mode 100755 graphics/items/icon_palettes/reaper_cloth.pal create mode 100755 graphics/items/icon_palettes/red_apricorn.pal create mode 100755 graphics/items/icon_palettes/red_card.pal create mode 100755 graphics/items/icon_palettes/red_nectar.pal create mode 100755 graphics/items/icon_palettes/rindo_berry.pal create mode 100755 graphics/items/icon_palettes/ring_target.pal create mode 100755 graphics/items/icon_palettes/rock_incense.pal create mode 100755 graphics/items/icon_palettes/rock_memory.pal create mode 100755 graphics/items/icon_palettes/rocky_helmet.pal create mode 100755 graphics/items/icon_palettes/rose_incense.pal create mode 100755 graphics/items/icon_palettes/roseli_berry.pal create mode 100755 graphics/items/icon_palettes/rowap_berry.pal create mode 100755 graphics/items/icon_palettes/sachet.pal create mode 100755 graphics/items/icon_palettes/sail_fossil.pal create mode 100755 graphics/items/icon_palettes/shiny_stone.pal create mode 100755 graphics/items/icon_palettes/shuca_berry.pal create mode 100755 graphics/items/icon_palettes/skull_fossil.pal create mode 100755 graphics/items/icon_palettes/snowball.pal create mode 100755 graphics/items/icon_palettes/steel_memory.pal create mode 100755 graphics/items/icon_palettes/sweet_heart.pal create mode 100755 graphics/items/icon_palettes/tanga_berry.pal create mode 100755 graphics/items/icon_palettes/wacan_berry.pal create mode 100755 graphics/items/icon_palettes/water_memory.pal create mode 100755 graphics/items/icon_palettes/wave_incense.pal create mode 100755 graphics/items/icon_palettes/weakness_policy.pal create mode 100755 graphics/items/icon_palettes/whipped_dream.pal create mode 100755 graphics/items/icon_palettes/white_apricorn.pal create mode 100755 graphics/items/icon_palettes/x_special_defense.pal create mode 100755 graphics/items/icon_palettes/yache_berry.pal create mode 100755 graphics/items/icon_palettes/yellow_apricorn.pal create mode 100755 graphics/items/icon_palettes/yellow_nectar.pal create mode 100755 graphics/items/icons/ability_capsule.png create mode 100755 graphics/items/icons/absorb_bulb.png create mode 100755 graphics/items/icons/air_balloon.png create mode 100755 graphics/items/icons/armor_fossil.png create mode 100755 graphics/items/icons/babiri_berry.png create mode 100755 graphics/items/icons/big_malasada.png create mode 100755 graphics/items/icons/black_apricorn.png create mode 100755 graphics/items/icons/blue_apricorn.png create mode 100755 graphics/items/icons/bug_memory.png create mode 100755 graphics/items/icons/cell_battery.png create mode 100755 graphics/items/icons/charti_berry.png create mode 100755 graphics/items/icons/chilan_berry.png create mode 100755 graphics/items/icons/chople_berry.png create mode 100755 graphics/items/icons/coba_berry.png create mode 100755 graphics/items/icons/colbur_berry.png create mode 100755 graphics/items/icons/cover_fossil.png create mode 100755 graphics/items/icons/custap_berry.png create mode 100755 graphics/items/icons/dark_memory.png create mode 100755 graphics/items/icons/dawn_stone.png create mode 100755 graphics/items/icons/dragon_memory.png create mode 100755 graphics/items/icons/dubious_disc.png create mode 100755 graphics/items/icons/dusk_stone.png create mode 100755 graphics/items/icons/eject_button.png create mode 100755 graphics/items/icons/electirizer.png create mode 100755 graphics/items/icons/electric_memory.png create mode 100755 graphics/items/icons/fairy_memory.png create mode 100755 graphics/items/icons/fighting_memory.png create mode 100755 graphics/items/icons/fire_memory.png create mode 100755 graphics/items/icons/flying_memory.png create mode 100755 graphics/items/icons/full_incense.png create mode 100755 graphics/items/icons/ghost_memory.png create mode 100755 graphics/items/icons/gracidea.png create mode 100755 graphics/items/icons/grass_memory.png create mode 100755 graphics/items/icons/green_apricorn.png create mode 100755 graphics/items/icons/ground_memory.png create mode 100755 graphics/items/icons/haban_berry.png create mode 100755 graphics/items/icons/ice_memory.png create mode 100755 graphics/items/icons/ice_stone.png create mode 100755 graphics/items/icons/jaboca_berry.png create mode 100755 graphics/items/icons/jaw_fossil.png create mode 100755 graphics/items/icons/kasib_berry.png create mode 100755 graphics/items/icons/kebia_berry.png create mode 100755 graphics/items/icons/kee_berry.png create mode 100755 graphics/items/icons/luck_incense.png create mode 100755 graphics/items/icons/luminous_moss.png create mode 100755 graphics/items/icons/magmarizer.png create mode 100755 graphics/items/icons/maranga_berry.png create mode 100755 graphics/items/icons/micle_berry.png create mode 100755 graphics/items/icons/occa_berry.png create mode 100755 graphics/items/icons/odd_incense.png create mode 100755 graphics/items/icons/odd_keystone.png create mode 100755 graphics/items/icons/old_gateau.png create mode 100755 graphics/items/icons/oval_stone.png create mode 100755 graphics/items/icons/passho_berry.png create mode 100755 graphics/items/icons/payapa_berry.png create mode 100755 graphics/items/icons/pink_apricorn.png create mode 100755 graphics/items/icons/pink_nectar.png create mode 100755 graphics/items/icons/plume_fossil.png create mode 100755 graphics/items/icons/poison_memory.png create mode 100755 graphics/items/icons/power_anklet.png create mode 100755 graphics/items/icons/power_band.png create mode 100755 graphics/items/icons/power_belt.png create mode 100755 graphics/items/icons/power_bracer.png create mode 100755 graphics/items/icons/power_lens.png create mode 100755 graphics/items/icons/power_weight.png create mode 100755 graphics/items/icons/prism_scale.png create mode 100755 graphics/items/icons/protector.png create mode 100755 graphics/items/icons/psychic_memory.png create mode 100755 graphics/items/icons/pure_incense.png create mode 100755 graphics/items/icons/purple_nectar.png create mode 100755 graphics/items/icons/rare_bone.png create mode 100755 graphics/items/icons/razor_claw.png create mode 100755 graphics/items/icons/razor_fang.png create mode 100755 graphics/items/icons/reaper_cloth.png create mode 100755 graphics/items/icons/red_apricorn.png create mode 100755 graphics/items/icons/red_card.png create mode 100755 graphics/items/icons/red_nectar.png create mode 100755 graphics/items/icons/rindo_berry.png create mode 100755 graphics/items/icons/ring_target.png create mode 100755 graphics/items/icons/rock_incense.png create mode 100755 graphics/items/icons/rock_memory.png create mode 100755 graphics/items/icons/rocky_helmet.png create mode 100755 graphics/items/icons/rose_incense.png create mode 100755 graphics/items/icons/roseli_berry.png create mode 100755 graphics/items/icons/rowap_berry.png create mode 100755 graphics/items/icons/sachet.png create mode 100755 graphics/items/icons/sail_fossil.png create mode 100755 graphics/items/icons/shiny_stone.png create mode 100755 graphics/items/icons/shuca_berry.png create mode 100755 graphics/items/icons/skull_fossil.png create mode 100755 graphics/items/icons/snowball.png create mode 100755 graphics/items/icons/steel_memory.png create mode 100755 graphics/items/icons/sweet_heart.png create mode 100755 graphics/items/icons/tanga_berry.png create mode 100755 graphics/items/icons/wacan_berry.png create mode 100755 graphics/items/icons/water_memory.png create mode 100755 graphics/items/icons/wave_incense.png create mode 100755 graphics/items/icons/weakness_policy.png create mode 100755 graphics/items/icons/whipped_dream.png create mode 100755 graphics/items/icons/white_apricorn.png create mode 100755 graphics/items/icons/x_special_defense.png create mode 100755 graphics/items/icons/yache_berry.png create mode 100755 graphics/items/icons/yellow_apricorn.png create mode 100755 graphics/items/icons/yellow_nectar.png diff --git a/graphics/items/icon_palettes/ability_capsule.pal b/graphics/items/icon_palettes/ability_capsule.pal new file mode 100755 index 000000000..08bc90959 --- /dev/null +++ b/graphics/items/icon_palettes/ability_capsule.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +107 165 230 +123 123 156 +156 156 189 +206 206 255 +189 255 255 +132 214 255 +189 189 239 +222 222 255 +90 90 90 +222 132 255 +206 173 247 +140 140 247 +173 107 255 +230 206 255 diff --git a/graphics/items/icon_palettes/absorb_bulb.pal b/graphics/items/icon_palettes/absorb_bulb.pal new file mode 100755 index 000000000..8551b917b --- /dev/null +++ b/graphics/items/icon_palettes/absorb_bulb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +222 222 115 +189 140 66 +156 99 41 +181 173 115 +132 74 33 +214 173 115 +90 66 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/air_balloon.pal b/graphics/items/icon_palettes/air_balloon.pal new file mode 100755 index 000000000..3fb7948b9 --- /dev/null +++ b/graphics/items/icon_palettes/air_balloon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +66 66 66 +247 123 123 +239 74 74 +247 173 173 +49 49 49 +165 49 49 +206 206 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/armor_fossil.pal b/graphics/items/icon_palettes/armor_fossil.pal new file mode 100755 index 000000000..4c4b3a4b8 --- /dev/null +++ b/graphics/items/icon_palettes/armor_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 192 160 +216 136 96 +192 112 80 +136 88 56 +208 136 104 +224 160 112 +80 56 40 +168 96 64 +112 80 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/babiri_berry.pal b/graphics/items/icon_palettes/babiri_berry.pal new file mode 100755 index 000000000..e867db13a --- /dev/null +++ b/graphics/items/icon_palettes/babiri_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +104 168 48 +160 224 72 +200 240 152 +160 128 48 +232 208 120 +72 104 40 +88 120 56 +64 80 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/big_malasada.pal b/graphics/items/icon_palettes/big_malasada.pal new file mode 100755 index 000000000..60fca4191 --- /dev/null +++ b/graphics/items/icon_palettes/big_malasada.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +180 106 49 +205 131 41 +156 90 49 +213 156 65 +213 148 90 +139 82 41 +246 197 98 +222 172 74 +246 197 106 +246 222 74 +180 82 74 +238 98 90 +255 172 197 +246 123 123 diff --git a/graphics/items/icon_palettes/black_apricorn.pal b/graphics/items/icon_palettes/black_apricorn.pal new file mode 100755 index 000000000..63d139493 --- /dev/null +++ b/graphics/items/icon_palettes/black_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +247 189 123 +115 82 66 +173 107 49 +123 123 123 +74 74 74 +222 156 99 +189 189 189 +255 255 255 +99 99 99 +57 57 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blue_apricorn.pal b/graphics/items/icon_palettes/blue_apricorn.pal new file mode 100755 index 000000000..411abd8ae --- /dev/null +++ b/graphics/items/icon_palettes/blue_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +49 123 239 +33 82 165 +206 148 99 +132 181 255 +255 255 255 +41 107 206 +41 66 107 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/bug_memory.pal b/graphics/items/icon_palettes/bug_memory.pal new file mode 100755 index 000000000..c653b1698 --- /dev/null +++ b/graphics/items/icon_palettes/bug_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 248 +48 48 48 +172 236 128 +232 244 240 +248 252 248 +224 244 208 +184 236 152 +216 244 192 +208 244 176 +144 228 104 +120 120 144 +96 96 120 +160 236 104 +136 164 168 +112 128 136 +160 188 192 diff --git a/graphics/items/icon_palettes/cell_battery.pal b/graphics/items/icon_palettes/cell_battery.pal new file mode 100755 index 000000000..1e28e6a35 --- /dev/null +++ b/graphics/items/icon_palettes/cell_battery.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +140 140 148 +206 206 214 +255 255 255 +156 231 255 +41 198 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/charti_berry.pal b/graphics/items/icon_palettes/charti_berry.pal new file mode 100755 index 000000000..721b2bd15 --- /dev/null +++ b/graphics/items/icon_palettes/charti_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +168 152 48 +200 168 32 +208 184 8 +248 232 40 +248 248 184 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/chilan_berry.pal b/graphics/items/icon_palettes/chilan_berry.pal new file mode 100755 index 000000000..72a54a9b9 --- /dev/null +++ b/graphics/items/icon_palettes/chilan_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +160 224 72 +168 136 64 +232 208 120 +208 168 64 +104 168 48 +88 120 56 +248 232 176 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/chople_berry.pal b/graphics/items/icon_palettes/chople_berry.pal new file mode 100755 index 000000000..404a16ff0 --- /dev/null +++ b/graphics/items/icon_palettes/chople_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +168 48 48 +216 64 64 +248 80 80 +248 136 120 +248 184 160 +232 168 56 +184 120 32 +240 216 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/coba_berry.pal b/graphics/items/icon_palettes/coba_berry.pal new file mode 100755 index 000000000..497d19db5 --- /dev/null +++ b/graphics/items/icon_palettes/coba_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +48 88 120 +48 112 168 +40 200 216 +128 240 248 +80 160 208 +112 184 232 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/colbur_berry.pal b/graphics/items/icon_palettes/colbur_berry.pal new file mode 100755 index 000000000..b218b1b5f --- /dev/null +++ b/graphics/items/icon_palettes/colbur_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 184 240 +240 104 224 +192 40 176 +248 144 232 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/cover_fossil.pal b/graphics/items/icon_palettes/cover_fossil.pal new file mode 100755 index 000000000..17aca6ea2 --- /dev/null +++ b/graphics/items/icon_palettes/cover_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +123 123 165 +140 140 181 +115 115 165 +82 82 140 +99 99 156 +165 165 198 +66 66 115 +198 198 214 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/custap_berry.pal b/graphics/items/icon_palettes/custap_berry.pal new file mode 100755 index 000000000..b237f92fc --- /dev/null +++ b/graphics/items/icon_palettes/custap_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +240 208 104 +160 128 48 +240 168 112 +232 80 64 +192 64 64 +248 192 160 +248 120 112 +248 216 200 +208 120 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dark_memory.pal b/graphics/items/icon_palettes/dark_memory.pal new file mode 100755 index 000000000..7850c59fb --- /dev/null +++ b/graphics/items/icon_palettes/dark_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 248 +48 48 48 +128 184 184 +184 212 208 +200 228 224 +232 244 240 +248 252 248 +160 204 200 +96 164 168 +116 116 144 +96 96 120 +80 156 160 +184 112 112 +136 88 88 +200 148 144 +88 88 112 diff --git a/graphics/items/icon_palettes/dawn_stone.pal b/graphics/items/icon_palettes/dawn_stone.pal new file mode 100755 index 000000000..a5af707a7 --- /dev/null +++ b/graphics/items/icon_palettes/dawn_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +144 248 232 +24 248 216 +16 200 192 +8 216 176 +248 248 248 +24 176 160 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dragon_memory.pal b/graphics/items/icon_palettes/dragon_memory.pal new file mode 100755 index 000000000..4b0a86416 --- /dev/null +++ b/graphics/items/icon_palettes/dragon_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +180 213 255 +230 246 255 +139 189 255 +156 197 255 +255 255 255 +172 180 213 +205 230 255 +213 180 172 +123 123 148 +98 98 123 +255 180 131 +172 139 123 +131 106 98 +197 164 156 diff --git a/graphics/items/icon_palettes/dubious_disc.pal b/graphics/items/icon_palettes/dubious_disc.pal new file mode 100755 index 000000000..502d7af56 --- /dev/null +++ b/graphics/items/icon_palettes/dubious_disc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +120 88 104 +248 176 248 +216 176 200 +184 0 176 +248 32 232 +192 176 192 +176 104 152 +144 88 120 +160 112 176 +168 152 184 +168 144 128 +192 128 168 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dusk_stone.pal b/graphics/items/icon_palettes/dusk_stone.pal new file mode 100755 index 000000000..a5be7f480 --- /dev/null +++ b/graphics/items/icon_palettes/dusk_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +184 144 184 +168 120 168 +232 168 224 +136 88 144 +144 104 160 +112 80 120 +96 72 96 +80 64 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/eject_button.pal b/graphics/items/icon_palettes/eject_button.pal new file mode 100755 index 000000000..363a27e60 --- /dev/null +++ b/graphics/items/icon_palettes/eject_button.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 222 24 +198 214 222 +140 140 140 +214 181 24 +255 115 33 +255 66 24 +107 132 148 +181 41 33 +140 165 181 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electirizer.pal b/graphics/items/icon_palettes/electirizer.pal new file mode 100755 index 000000000..e750bb16a --- /dev/null +++ b/graphics/items/icon_palettes/electirizer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 248 16 +120 120 120 +88 88 16 +248 248 208 +80 80 80 +160 152 0 +168 168 168 +224 216 184 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electric_memory.pal b/graphics/items/icon_palettes/electric_memory.pal new file mode 100755 index 000000000..3567d9e8e --- /dev/null +++ b/graphics/items/icon_palettes/electric_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 205 57 +255 230 123 +255 255 222 +255 238 156 +255 255 255 +255 255 189 +255 222 90 +255 197 24 +123 123 148 +98 98 123 +255 197 0 +180 164 131 +139 131 115 +197 189 164 diff --git a/graphics/items/icon_palettes/fairy_memory.pal b/graphics/items/icon_palettes/fairy_memory.pal new file mode 100755 index 000000000..229a7f8dc --- /dev/null +++ b/graphics/items/icon_palettes/fairy_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +49 49 49 +205 148 255 +222 189 246 +255 255 255 +230 205 238 +213 172 246 +246 222 255 +189 131 255 +222 139 238 +123 123 148 +98 98 123 +246 148 213 +180 115 148 +139 98 123 +197 156 180 diff --git a/graphics/items/icon_palettes/fighting_memory.pal b/graphics/items/icon_palettes/fighting_memory.pal new file mode 100755 index 000000000..873621d21 --- /dev/null +++ b/graphics/items/icon_palettes/fighting_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +238 164 90 +238 197 156 +255 238 230 +246 213 189 +238 180 123 +255 255 255 +230 148 57 +230 131 24 +230 115 0 +123 123 148 +98 98 123 +189 139 123 +148 115 106 +205 172 156 diff --git a/graphics/items/icon_palettes/fire_memory.pal b/graphics/items/icon_palettes/fire_memory.pal new file mode 100755 index 000000000..a5a760f7c --- /dev/null +++ b/graphics/items/icon_palettes/fire_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 189 65 +255 238 222 +255 255 255 +255 230 189 +255 197 98 +238 172 32 +255 222 156 +255 180 41 +255 205 131 +123 123 148 +98 98 123 +180 131 131 +139 106 115 +197 164 164 diff --git a/graphics/items/icon_palettes/flying_memory.pal b/graphics/items/icon_palettes/flying_memory.pal new file mode 100755 index 000000000..1891eeeb8 --- /dev/null +++ b/graphics/items/icon_palettes/flying_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +189 238 255 +213 246 255 +246 246 255 +180 205 222 +172 222 238 +172 238 255 +255 255 255 +156 238 255 +197 197 197 +123 123 148 +98 98 123 +123 189 189 +106 148 139 +156 205 205 diff --git a/graphics/items/icon_palettes/full_incense.pal b/graphics/items/icon_palettes/full_incense.pal new file mode 100755 index 000000000..7b4948f23 --- /dev/null +++ b/graphics/items/icon_palettes/full_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +120 96 40 +248 184 184 +216 72 72 +248 248 104 +240 232 32 +248 248 168 +112 96 48 +216 208 0 +152 136 0 +176 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ghost_memory.pal b/graphics/items/icon_palettes/ghost_memory.pal new file mode 100755 index 000000000..aa10565da --- /dev/null +++ b/graphics/items/icon_palettes/ghost_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +49 49 49 +222 172 246 +230 205 246 +255 238 255 +213 148 246 +230 189 246 +255 255 255 +197 123 238 +238 222 246 +180 98 222 +123 123 148 +98 98 123 +131 131 189 +106 115 148 +156 156 205 diff --git a/graphics/items/icon_palettes/gracidea.pal b/graphics/items/icon_palettes/gracidea.pal new file mode 100755 index 000000000..a1d740e73 --- /dev/null +++ b/graphics/items/icon_palettes/gracidea.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +247 107 132 +255 140 165 +82 148 16 +99 206 8 +255 173 189 +173 49 74 +255 214 222 +198 123 74 +247 239 90 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/grass_memory.pal b/graphics/items/icon_palettes/grass_memory.pal new file mode 100755 index 000000000..07a5778f9 --- /dev/null +++ b/graphics/items/icon_palettes/grass_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +156 238 197 +197 246 213 +255 255 255 +139 238 180 +238 246 246 +213 246 230 +123 238 172 +180 246 205 +123 123 148 +98 98 123 +106 238 164 +131 180 180 +106 139 139 +164 197 197 diff --git a/graphics/items/icon_palettes/green_apricorn.pal b/graphics/items/icon_palettes/green_apricorn.pal new file mode 100755 index 000000000..2d8947844 --- /dev/null +++ b/graphics/items/icon_palettes/green_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +57 189 99 +24 132 57 +206 148 99 +132 239 165 +255 255 255 +41 156 74 +33 90 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ground_memory.pal b/graphics/items/icon_palettes/ground_memory.pal new file mode 100755 index 000000000..b9272a0dc --- /dev/null +++ b/graphics/items/icon_palettes/ground_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +246 238 90 +255 255 156 +255 255 255 +230 213 82 +255 255 123 +255 255 222 +255 255 90 +255 255 189 +222 197 65 +123 123 148 +98 98 123 +164 148 131 +131 115 106 +180 164 156 diff --git a/graphics/items/icon_palettes/haban_berry.pal b/graphics/items/icon_palettes/haban_berry.pal new file mode 100755 index 000000000..857889ed0 --- /dev/null +++ b/graphics/items/icon_palettes/haban_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 120 120 +248 152 152 +232 64 64 +208 32 32 +160 40 40 +96 48 48 +80 48 72 +104 56 96 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ice_memory.pal b/graphics/items/icon_palettes/ice_memory.pal new file mode 100755 index 000000000..201520bd9 --- /dev/null +++ b/graphics/items/icon_palettes/ice_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +197 246 255 +255 255 255 +213 246 255 +172 238 255 +156 238 255 +230 246 255 +139 230 246 +131 213 238 +123 123 148 +98 98 123 +131 180 180 +106 139 139 +164 205 197 +0 0 0 diff --git a/graphics/items/icon_palettes/ice_stone.pal b/graphics/items/icon_palettes/ice_stone.pal new file mode 100755 index 000000000..b922cbbab --- /dev/null +++ b/graphics/items/icon_palettes/ice_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +189 238 246 +148 213 222 +222 246 255 +238 255 255 +246 255 255 +98 189 205 +57 156 180 +213 238 246 +24 106 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/jaboca_berry.pal b/graphics/items/icon_palettes/jaboca_berry.pal new file mode 100755 index 000000000..7f937b28e --- /dev/null +++ b/graphics/items/icon_palettes/jaboca_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +240 232 104 +160 128 48 +96 96 40 +120 120 48 +200 184 40 +248 248 208 +160 152 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/jaw_fossil.pal b/graphics/items/icon_palettes/jaw_fossil.pal new file mode 100755 index 000000000..d06360faf --- /dev/null +++ b/graphics/items/icon_palettes/jaw_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +132 140 181 +173 173 173 +115 115 156 +66 66 99 +90 90 132 +132 132 173 +198 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/kasib_berry.pal b/graphics/items/icon_palettes/kasib_berry.pal new file mode 100755 index 000000000..81a6165aa --- /dev/null +++ b/graphics/items/icon_palettes/kasib_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 248 184 +168 120 48 +224 64 184 +248 104 200 +176 48 144 +248 160 224 +104 56 96 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/kebia_berry.pal b/graphics/items/icon_palettes/kebia_berry.pal new file mode 100755 index 000000000..b63d95d44 --- /dev/null +++ b/graphics/items/icon_palettes/kebia_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +40 152 40 +48 192 56 +80 232 96 +40 104 40 +128 168 48 +144 192 56 +176 240 152 +128 112 96 +104 88 80 +208 248 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/kee_berry.pal b/graphics/items/icon_palettes/kee_berry.pal new file mode 100755 index 000000000..7d25b433a --- /dev/null +++ b/graphics/items/icon_palettes/kee_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +156 222 115 +115 189 82 +82 156 49 +49 115 33 +230 140 90 +255 173 123 +189 132 107 +206 99 66 +148 123 99 +255 222 189 +230 189 165 +0 0 0 +189 156 132 +0 0 0 diff --git a/graphics/items/icon_palettes/luck_incense.pal b/graphics/items/icon_palettes/luck_incense.pal new file mode 100755 index 000000000..84abcd949 --- /dev/null +++ b/graphics/items/icon_palettes/luck_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +112 80 40 +160 232 248 +88 176 224 +240 200 64 +216 224 120 +240 240 192 +56 136 184 +216 160 64 +152 112 64 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/luminous_moss.pal b/graphics/items/icon_palettes/luminous_moss.pal new file mode 100755 index 000000000..51bad6ab7 --- /dev/null +++ b/graphics/items/icon_palettes/luminous_moss.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +60 120 56 +216 252 160 +32 164 8 +112 228 56 +152 244 100 +248 252 248 +72 72 88 +40 196 8 +72 228 16 +52 48 48 +200 228 168 +144 140 152 +200 196 208 +112 112 152 +0 0 0 diff --git a/graphics/items/icon_palettes/magmarizer.pal b/graphics/items/icon_palettes/magmarizer.pal new file mode 100755 index 000000000..4e0a0b196 --- /dev/null +++ b/graphics/items/icon_palettes/magmarizer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +232 104 104 +136 136 136 +104 48 48 +240 160 160 +96 96 96 +176 48 48 +120 96 96 +240 152 48 +248 248 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/maranga_berry.pal b/graphics/items/icon_palettes/maranga_berry.pal new file mode 100755 index 000000000..30c39e54c --- /dev/null +++ b/graphics/items/icon_palettes/maranga_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +247 247 140 +148 140 49 +189 181 49 +189 181 123 +123 107 49 +99 82 41 +148 132 99 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/micle_berry.pal b/graphics/items/icon_palettes/micle_berry.pal new file mode 100755 index 000000000..9bc9af2da --- /dev/null +++ b/graphics/items/icon_palettes/micle_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +72 120 64 +56 168 56 +64 200 64 +136 232 136 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/occa_berry.pal b/graphics/items/icon_palettes/occa_berry.pal new file mode 100755 index 000000000..c8f33e015 --- /dev/null +++ b/graphics/items/icon_palettes/occa_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +120 208 152 +48 104 72 +232 112 48 +248 144 96 +216 120 64 +184 96 32 +56 160 96 +248 184 144 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/odd_incense.pal b/graphics/items/icon_palettes/odd_incense.pal new file mode 100755 index 000000000..f51f61c90 --- /dev/null +++ b/graphics/items/icon_palettes/odd_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +48 48 48 +136 48 152 +240 192 240 +248 128 248 +216 168 216 +112 96 48 +224 56 240 +160 96 200 +120 72 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/odd_keystone.pal b/graphics/items/icon_palettes/odd_keystone.pal new file mode 100755 index 000000000..89db79825 --- /dev/null +++ b/graphics/items/icon_palettes/odd_keystone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +216 160 112 +192 144 104 +248 192 152 +128 104 80 +160 128 96 +248 208 184 +104 80 64 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/old_gateau.pal b/graphics/items/icon_palettes/old_gateau.pal new file mode 100755 index 000000000..6d819579b --- /dev/null +++ b/graphics/items/icon_palettes/old_gateau.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +115 115 115 +173 107 156 +189 132 173 +165 82 140 +107 58 90 +132 66 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/oval_stone.pal b/graphics/items/icon_palettes/oval_stone.pal new file mode 100755 index 000000000..f5681b929 --- /dev/null +++ b/graphics/items/icon_palettes/oval_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +96 96 96 +200 208 216 +216 232 240 +144 160 168 +200 216 232 +248 248 248 +160 168 176 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/passho_berry.pal b/graphics/items/icon_palettes/passho_berry.pal new file mode 100755 index 000000000..64ba104b5 --- /dev/null +++ b/graphics/items/icon_palettes/passho_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +48 96 160 +200 160 56 +232 224 104 +40 104 208 +64 128 232 +120 168 248 +128 112 64 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/payapa_berry.pal b/graphics/items/icon_palettes/payapa_berry.pal new file mode 100755 index 000000000..190039e34 --- /dev/null +++ b/graphics/items/icon_palettes/payapa_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +176 232 104 +112 168 32 +72 96 40 +96 96 96 +120 56 104 +136 40 112 +192 40 152 +240 64 216 +248 128 224 +248 168 232 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pink_apricorn.pal b/graphics/items/icon_palettes/pink_apricorn.pal new file mode 100755 index 000000000..485ed3f0b --- /dev/null +++ b/graphics/items/icon_palettes/pink_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +255 148 181 +222 99 140 +206 148 99 +255 198 222 +255 255 255 +239 123 165 +148 74 99 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pink_nectar.pal b/graphics/items/icon_palettes/pink_nectar.pal new file mode 100755 index 000000000..e6167ec00 --- /dev/null +++ b/graphics/items/icon_palettes/pink_nectar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 139 139 +255 205 205 +255 90 90 +255 246 246 +90 65 65 +123 90 82 +148 98 82 +189 148 156 +115 74 65 +123 74 74 +255 197 189 +255 123 115 +189 90 90 +0 0 0 diff --git a/graphics/items/icon_palettes/plume_fossil.pal b/graphics/items/icon_palettes/plume_fossil.pal new file mode 100755 index 000000000..0d9f2b825 --- /dev/null +++ b/graphics/items/icon_palettes/plume_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +123 123 165 +99 99 156 +115 115 165 +66 66 115 +82 82 140 +165 165 198 +140 140 181 +198 198 214 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poison_memory.pal b/graphics/items/icon_palettes/poison_memory.pal new file mode 100755 index 000000000..3d3b9e43d --- /dev/null +++ b/graphics/items/icon_palettes/poison_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +49 49 49 +255 205 172 +255 238 230 +255 255 255 +255 222 197 +230 148 156 +255 189 148 +255 180 123 +205 123 189 +180 98 222 +123 123 148 +98 98 123 +172 123 189 +131 106 148 +189 156 205 diff --git a/graphics/items/icon_palettes/power_anklet.pal b/graphics/items/icon_palettes/power_anklet.pal new file mode 100755 index 000000000..6c7c5b643 --- /dev/null +++ b/graphics/items/icon_palettes/power_anklet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +96 96 96 +48 48 48 +32 168 216 +96 208 232 +136 232 240 +56 192 208 +48 120 168 +48 64 144 +32 144 192 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_band.pal b/graphics/items/icon_palettes/power_band.pal new file mode 100755 index 000000000..160108bc9 --- /dev/null +++ b/graphics/items/icon_palettes/power_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +96 96 96 +48 48 48 +208 184 32 +232 224 96 +240 240 176 +224 208 64 +152 144 40 +104 96 40 +192 160 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_belt.pal b/graphics/items/icon_palettes/power_belt.pal new file mode 100755 index 000000000..e4e815796 --- /dev/null +++ b/graphics/items/icon_palettes/power_belt.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +96 96 96 +48 48 48 +200 136 64 +232 176 96 +240 208 152 +232 160 104 +136 104 48 +112 64 24 +176 112 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_bracer.pal b/graphics/items/icon_palettes/power_bracer.pal new file mode 100755 index 000000000..c3cb52c47 --- /dev/null +++ b/graphics/items/icon_palettes/power_bracer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +96 96 96 +48 48 48 +216 88 88 +240 112 112 +248 144 144 +168 72 72 +112 56 56 +184 80 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_lens.pal b/graphics/items/icon_palettes/power_lens.pal new file mode 100755 index 000000000..fe384576d --- /dev/null +++ b/graphics/items/icon_palettes/power_lens.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +48 48 48 +240 80 240 +248 96 248 +240 176 248 +104 56 112 +144 64 152 +192 64 216 +160 64 184 +32 224 248 +56 144 248 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/power_weight.pal b/graphics/items/icon_palettes/power_weight.pal new file mode 100755 index 000000000..8224c5b9a --- /dev/null +++ b/graphics/items/icon_palettes/power_weight.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +96 96 96 +48 48 48 +64 200 80 +96 232 120 +152 240 168 +72 152 88 +72 184 88 +56 104 64 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/prism_scale.pal b/graphics/items/icon_palettes/prism_scale.pal new file mode 100755 index 000000000..15d3698bf --- /dev/null +++ b/graphics/items/icon_palettes/prism_scale.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +82 82 82 +189 239 255 +132 206 239 +173 173 222 +49 49 49 +206 140 206 +239 107 189 +255 156 214 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/protector.pal b/graphics/items/icon_palettes/protector.pal new file mode 100755 index 000000000..224b5495b --- /dev/null +++ b/graphics/items/icon_palettes/protector.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +224 112 56 +232 152 112 +216 88 32 +104 56 40 +168 96 56 +136 72 48 +80 48 40 +152 80 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/psychic_memory.pal b/graphics/items/icon_palettes/psychic_memory.pal new file mode 100755 index 000000000..af0dadf34 --- /dev/null +++ b/graphics/items/icon_palettes/psychic_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 172 164 +255 222 213 +255 255 255 +255 197 197 +255 189 180 +255 246 246 +255 230 230 +255 213 205 +255 180 172 +123 123 148 +98 98 123 +180 139 131 +139 115 115 +197 172 164 diff --git a/graphics/items/icon_palettes/pure_incense.pal b/graphics/items/icon_palettes/pure_incense.pal new file mode 100755 index 000000000..83918a517 --- /dev/null +++ b/graphics/items/icon_palettes/pure_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +104 104 104 +248 248 248 +208 112 112 +216 216 216 +232 232 232 +112 96 48 +200 200 200 +152 152 152 +248 240 80 +184 184 184 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/purple_nectar.pal b/graphics/items/icon_palettes/purple_nectar.pal new file mode 100755 index 000000000..7b6def78c --- /dev/null +++ b/graphics/items/icon_palettes/purple_nectar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +213 139 255 +238 205 255 +197 90 255 +255 246 255 +90 65 65 +123 90 82 +148 98 82 +189 148 156 +115 74 65 +123 74 74 +255 197 189 +255 123 115 +189 90 90 +0 0 0 diff --git a/graphics/items/icon_palettes/rare_bone.pal b/graphics/items/icon_palettes/rare_bone.pal new file mode 100755 index 000000000..2ba2fbbb1 --- /dev/null +++ b/graphics/items/icon_palettes/rare_bone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +224 232 200 +184 192 160 +128 128 96 +208 208 168 +152 152 128 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/razor_claw.pal b/graphics/items/icon_palettes/razor_claw.pal new file mode 100755 index 000000000..b4f818746 --- /dev/null +++ b/graphics/items/icon_palettes/razor_claw.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 248 248 +128 136 144 +208 216 216 +152 160 168 +104 112 120 +176 192 200 +80 80 80 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/razor_fang.pal b/graphics/items/icon_palettes/razor_fang.pal new file mode 100755 index 000000000..ee390f2c6 --- /dev/null +++ b/graphics/items/icon_palettes/razor_fang.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +160 144 88 +208 192 128 +232 224 184 +104 112 120 +176 192 200 +152 160 168 +248 248 248 +128 136 144 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/reaper_cloth.pal b/graphics/items/icon_palettes/reaper_cloth.pal new file mode 100755 index 000000000..8ab71423f --- /dev/null +++ b/graphics/items/icon_palettes/reaper_cloth.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +80 72 88 +48 48 48 +144 128 168 +128 104 136 +168 152 184 +104 88 120 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_apricorn.pal b/graphics/items/icon_palettes/red_apricorn.pal new file mode 100755 index 000000000..8025f6c43 --- /dev/null +++ b/graphics/items/icon_palettes/red_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +255 66 49 +189 33 24 +206 148 99 +255 148 148 +255 255 255 +222 49 33 +115 41 33 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_card.pal b/graphics/items/icon_palettes/red_card.pal new file mode 100755 index 000000000..5309dc86c --- /dev/null +++ b/graphics/items/icon_palettes/red_card.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +66 66 66 +255 82 66 +49 49 49 +239 24 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_nectar.pal b/graphics/items/icon_palettes/red_nectar.pal new file mode 100755 index 000000000..5f1a8336d --- /dev/null +++ b/graphics/items/icon_palettes/red_nectar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +255 90 90 +255 148 148 +255 49 49 +255 222 205 +90 65 65 +255 189 189 +123 90 82 +148 98 82 +189 148 156 +115 74 65 +123 74 74 +255 197 189 +255 123 115 +189 90 90 diff --git a/graphics/items/icon_palettes/rindo_berry.pal b/graphics/items/icon_palettes/rindo_berry.pal new file mode 100755 index 000000000..bdf699dcc --- /dev/null +++ b/graphics/items/icon_palettes/rindo_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 240 48 +80 216 96 +56 112 72 +208 200 16 +120 112 48 +32 168 48 +184 248 160 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ring_target.pal b/graphics/items/icon_palettes/ring_target.pal new file mode 100755 index 000000000..4773d5912 --- /dev/null +++ b/graphics/items/icon_palettes/ring_target.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +66 66 66 +173 140 66 +148 115 49 +115 115 123 +206 206 214 +255 255 255 +123 99 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rock_incense.pal b/graphics/items/icon_palettes/rock_incense.pal new file mode 100755 index 000000000..d3e3fe323 --- /dev/null +++ b/graphics/items/icon_palettes/rock_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +96 72 32 +216 208 160 +192 160 104 +200 184 112 +112 96 48 +168 136 64 +136 104 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rock_memory.pal b/graphics/items/icon_palettes/rock_memory.pal new file mode 100755 index 000000000..f11cde989 --- /dev/null +++ b/graphics/items/icon_palettes/rock_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +222 197 115 +246 238 222 +255 255 255 +222 189 90 +238 222 172 +238 230 197 +230 213 148 +213 180 65 +123 123 148 +98 98 123 +172 148 139 +139 115 115 +197 172 164 +0 0 0 diff --git a/graphics/items/icon_palettes/rocky_helmet.pal b/graphics/items/icon_palettes/rocky_helmet.pal new file mode 100755 index 000000000..92bc3c24c --- /dev/null +++ b/graphics/items/icon_palettes/rocky_helmet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +198 198 198 +156 156 156 +82 82 82 +214 156 0 +255 198 0 +255 222 123 +57 156 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rose_incense.pal b/graphics/items/icon_palettes/rose_incense.pal new file mode 100755 index 000000000..379551e9c --- /dev/null +++ b/graphics/items/icon_palettes/rose_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +48 48 48 +120 120 48 +248 240 80 +240 248 152 +232 232 200 +248 248 248 +112 96 48 +208 200 112 +152 152 80 +232 120 232 +224 56 192 +176 48 160 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/roseli_berry.pal b/graphics/items/icon_palettes/roseli_berry.pal new file mode 100755 index 000000000..94bf9414f --- /dev/null +++ b/graphics/items/icon_palettes/roseli_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +57 49 49 +49 49 49 +198 57 66 +140 41 66 +222 82 82 +239 156 132 +41 57 74 +99 123 181 +57 90 140 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rowap_berry.pal b/graphics/items/icon_palettes/rowap_berry.pal new file mode 100755 index 000000000..3050dc608 --- /dev/null +++ b/graphics/items/icon_palettes/rowap_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +216 208 128 +200 152 56 +176 152 64 +40 168 176 +56 216 224 +152 120 48 +16 144 152 +48 112 120 +40 88 96 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sachet.pal b/graphics/items/icon_palettes/sachet.pal new file mode 100755 index 000000000..7c59557a5 --- /dev/null +++ b/graphics/items/icon_palettes/sachet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 128 64 +49 49 49 +74 74 74 +189 115 198 +173 99 181 +99 66 123 +148 90 165 +247 214 115 +214 173 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sail_fossil.pal b/graphics/items/icon_palettes/sail_fossil.pal new file mode 100755 index 000000000..f845f7dd2 --- /dev/null +++ b/graphics/items/icon_palettes/sail_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +57 49 49 +49 49 49 +132 206 181 +90 156 132 +115 173 156 +57 90 74 +66 107 90 +90 140 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/shiny_stone.pal b/graphics/items/icon_palettes/shiny_stone.pal new file mode 100755 index 000000000..f29748189 --- /dev/null +++ b/graphics/items/icon_palettes/shiny_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +192 224 160 +248 248 136 +224 240 208 +248 248 248 +168 192 152 +152 176 120 +248 224 112 +248 216 8 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/shuca_berry.pal b/graphics/items/icon_palettes/shuca_berry.pal new file mode 100755 index 000000000..61b071e34 --- /dev/null +++ b/graphics/items/icon_palettes/shuca_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +168 232 96 +216 240 176 +96 184 32 +40 96 40 +80 136 32 +216 192 24 +248 232 96 +160 136 32 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/skull_fossil.pal b/graphics/items/icon_palettes/skull_fossil.pal new file mode 100755 index 000000000..5a8f9d170 --- /dev/null +++ b/graphics/items/icon_palettes/skull_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +192 112 80 +224 160 112 +208 136 104 +248 192 160 +216 136 96 +136 88 56 +80 56 40 +168 96 64 +112 80 56 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/snowball.pal b/graphics/items/icon_palettes/snowball.pal new file mode 100755 index 000000000..900d872d7 --- /dev/null +++ b/graphics/items/icon_palettes/snowball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 123 165 +74 90 99 +247 255 255 +198 239 255 +132 173 206 +165 206 231 +8 0 0 +0 0 0 +8 8 0 +41 115 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/steel_memory.pal b/graphics/items/icon_palettes/steel_memory.pal new file mode 100755 index 000000000..6dc939e71 --- /dev/null +++ b/graphics/items/icon_palettes/steel_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +148 172 180 +222 222 222 +238 246 246 +197 197 197 +213 213 213 +255 255 255 +115 164 172 +189 189 189 +82 156 164 +123 123 148 +98 98 123 +139 156 172 +115 131 131 +189 197 205 diff --git a/graphics/items/icon_palettes/sweet_heart.pal b/graphics/items/icon_palettes/sweet_heart.pal new file mode 100755 index 000000000..d57265698 --- /dev/null +++ b/graphics/items/icon_palettes/sweet_heart.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +82 82 82 +49 49 49 +165 123 41 +181 140 58 +197 148 74 +132 99 33 +90 66 25 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tanga_berry.pal b/graphics/items/icon_palettes/tanga_berry.pal new file mode 100755 index 000000000..8950724c2 --- /dev/null +++ b/graphics/items/icon_palettes/tanga_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +240 232 56 +48 136 48 +56 168 56 +72 120 64 +192 176 40 +56 80 48 +64 200 64 +136 232 136 +168 160 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wacan_berry.pal b/graphics/items/icon_palettes/wacan_berry.pal new file mode 100755 index 000000000..8569be727 --- /dev/null +++ b/graphics/items/icon_palettes/wacan_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +248 240 48 +208 200 16 +144 240 136 +56 112 72 +80 216 120 +64 168 96 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/water_memory.pal b/graphics/items/icon_palettes/water_memory.pal new file mode 100755 index 000000000..17979fd4c --- /dev/null +++ b/graphics/items/icon_palettes/water_memory.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +115 180 238 +180 213 246 +238 246 246 +205 230 246 +139 197 238 +164 205 246 +255 255 255 +90 172 238 +74 164 238 +123 123 148 +98 98 123 +131 172 180 +106 139 139 +164 189 197 diff --git a/graphics/items/icon_palettes/wave_incense.pal b/graphics/items/icon_palettes/wave_incense.pal new file mode 100755 index 000000000..86abf6076 --- /dev/null +++ b/graphics/items/icon_palettes/wave_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +48 88 152 +40 200 240 +64 144 192 +72 240 248 +128 224 240 +176 240 248 +112 96 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/weakness_policy.pal b/graphics/items/icon_palettes/weakness_policy.pal new file mode 100755 index 000000000..46a59e35f --- /dev/null +++ b/graphics/items/icon_palettes/weakness_policy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +214 247 198 +132 140 247 +165 198 214 +189 214 206 +231 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/whipped_dream.pal b/graphics/items/icon_palettes/whipped_dream.pal new file mode 100755 index 000000000..3b6440bbb --- /dev/null +++ b/graphics/items/icon_palettes/whipped_dream.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +214 90 132 +198 49 90 +140 41 74 +255 148 189 +239 206 198 +255 255 255 +189 132 132 +222 181 181 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/white_apricorn.pal b/graphics/items/icon_palettes/white_apricorn.pal new file mode 100755 index 000000000..53472131b --- /dev/null +++ b/graphics/items/icon_palettes/white_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +255 255 255 +181 198 214 +206 148 99 +214 222 231 +115 123 132 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_special_defense.pal b/graphics/items/icon_palettes/x_special_defense.pal new file mode 100755 index 000000000..548816d06 --- /dev/null +++ b/graphics/items/icon_palettes/x_special_defense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +64 134 134 +42 42 42 +127 134 134 +184 198 198 +219 219 219 +191 219 219 +92 176 176 +78 141 141 +28 92 92 +148 198 198 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yache_berry.pal b/graphics/items/icon_palettes/yache_berry.pal new file mode 100755 index 000000000..2b15404f4 --- /dev/null +++ b/graphics/items/icon_palettes/yache_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +48 48 48 +32 216 80 +56 168 88 +40 88 48 +24 128 168 +32 160 192 +120 216 224 +64 192 216 +192 240 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yellow_apricorn.pal b/graphics/items/icon_palettes/yellow_apricorn.pal new file mode 100755 index 000000000..b6004717b --- /dev/null +++ b/graphics/items/icon_palettes/yellow_apricorn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +231 181 140 +115 82 66 +165 99 41 +239 206 49 +198 132 8 +206 148 99 +255 231 132 +255 255 255 +222 173 24 +123 90 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yellow_nectar.pal b/graphics/items/icon_palettes/yellow_nectar.pal new file mode 100755 index 000000000..bebf85a5f --- /dev/null +++ b/graphics/items/icon_palettes/yellow_nectar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +230 172 0 +255 222 82 +197 139 0 +255 246 213 +90 65 65 +123 90 82 +148 98 82 +189 148 156 +115 74 65 +123 74 74 +255 197 189 +255 123 115 +189 90 90 +0 0 0 diff --git a/graphics/items/icons/ability_capsule.png b/graphics/items/icons/ability_capsule.png new file mode 100755 index 0000000000000000000000000000000000000000..4cb366137fb5c1c6e016792d615d891835589d6c GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOpLmkvD9 kb1WbI4`euOd4+}H=zFzC_ACpw0PSb+boFyt=akR{00lRI+yDRo literal 0 HcmV?d00001 diff --git a/graphics/items/icons/absorb_bulb.png b/graphics/items/icons/absorb_bulb.png new file mode 100755 index 0000000000000000000000000000000000000000..d958ab368400806acaa18f633728fb51d7cb556b GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuX`}-K=j-fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0uLNGk@=KHnJ& z6l6^Dc6a%|l>O6D5T_)_FPOpM*^M+Hr^VC7F{ENna>4-a0+K%z(?cE(P7aWVB$L*AhlYq3W4h8@+1&IshR zDX6OOWovAbXS!gquz)elpk=mP!%DHl6ip-cqcsW)46Fje>;mDfAAvSAc)I$ztaD0e F0sz57WJ3S| literal 0 HcmV?d00001 diff --git a/graphics/items/icons/armor_fossil.png b/graphics/items/icons/armor_fossil.png new file mode 100755 index 0000000000000000000000000000000000000000..a24d2ec4da2ea92769d904e4094a51fdb2bb7184 GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuTaH?san~0ENU$ zTq8f&dGR6$uVN3S^A-&>@^qBLXe>kaRUjGT{%a5-fx6N~I#Be29mZBJ-= zqMv~J7Gc&~;*lJmFFmSG-qO#xXO&n+N!R>Y1$`>VCeCDUS)!h}Bw>cWZr@!2xA!|w zUH>-cTt%qU*4w{%6(>&qdrp2$znIQmJ-a8T*IEY5S^g{S_3F&a8~timuKp!Br?C6* e`}Q66^Gn!;SUl#f?-CLP1&XJupUXO@geCywzpE+$ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/babiri_berry.png b/graphics/items/icons/babiri_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..aeca14e70a9135d4f590e21024aa2b54b3596b78 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuTYZ@?sYofkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0Ye2D%J-h)vXq&5-k&G_NlX9nW$dqPwryzQ(se1w)L!%b zU)k9kR>|yD^NJHw@>_T4Dr}#=FhTspLJoQDh-k~ylJ^r$^(r!#Z`@*9IIqXJKW^&6 zjyHjycAZsBy4A?4$fmUX^y);u#&=(DUr^OGUn;dGFZQYZW9G7HD!vvoS$ROd@^tlc JS?83{1OTcBfX)B_ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/big_malasada.png b/graphics/items/icons/big_malasada.png new file mode 100755 index 0000000000000000000000000000000000000000..d24cd9e00d3121ae551fc82c594a5391e3d29981 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuTZubB>0%0fod% zTq8q1{=C`9s_ttoQJDTl{=LuD5qpG289L% zafCcg$&rzHvS`g3zL4WDmdNC+O4^zAG(}uN-P2R^WY+g5#$l5i=DbizeSOs|{oI`x zt|uYy?(NJvH*nPM;9(! zn8=jSSG`knf-u*!89OA}4_Tf(<}Em9%a#z9^ysKCjWY~v8%+fCxsv)zq$F}$cCa66 p+!ZaQ$T)@Rli4AgBMnb1lYrhV(u!MrCVvme;hwI3F6*2UngB7LcA@|P literal 0 HcmV?d00001 diff --git a/graphics/items/icons/blue_apricorn.png b/graphics/items/icons/blue_apricorn.png new file mode 100755 index 0000000000000000000000000000000000000000..35d0ed23b24bd46ac022e2fa3b8e65abc9c2ad5b GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuVv2jD1==fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT03Sxn=8rAkfS{r|Fap zG6M$cS+|}9vKf=S-Ch1KW&d;(#3>2#3ubV5b|VeQY4>z-45^rtoS-0Pz-7S2#pPh> z)a9nNuv0*8anR0+iPQCQlB1OxNu=2 zQ$k<$PR$9zT+e3gkZ3<-dGeUI;G8X6LRiwHqrx=KFtBYj5zyyK>MxO!$Z6TZeyDL* ow3H&_6sAvRhir~CJh4mydb3C?ZtmdK II;Vst0J5#57ytkO literal 0 HcmV?d00001 diff --git a/graphics/items/icons/cell_battery.png b/graphics/items/icons/cell_battery.png new file mode 100755 index 0000000000000000000000000000000000000000..6183bdb085b331e37b8df0e501c0a7f616f4d2fe GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRB?@;~lB01Anh zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28REJhK4;oQ_h{c_W%F?InV!V9{Uf{gafck?9c>CF(!Gt zyZm3u{^=-)QxfDC%;50sMjDV~;pyTSQZXkv;Q&7it6+{>sxqU6dxYmnfrEvG3;Bvs&j{D{?9}O&Y zPCp#gcu7@CBIDJKmX8H3d%Lyd=e<95s@S+bVPeCYMJM|!-Bn!My8`}vI+g#Gsr0tk U_GkVLk3i1%boFyt=akR{05QIKBme*a literal 0 HcmV?d00001 diff --git a/graphics/items/icons/chilan_berry.png b/graphics/items/icons/chilan_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..d1516f7323dc1f2d41d6b928dfeec32d3e960690 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRB8r)JD!0Sbwi zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28RCz1_lcrc&zAfcyXcP!U~6s6$TL%7C&BW0BOYl;nQyY z1qw1IdAqy(U&{XJD2P)M&Q^S3F()T-G@yGywq3o`Pop literal 0 HcmV?d00001 diff --git a/graphics/items/icons/chople_berry.png b/graphics/items/icons/chople_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..3fa84f379a6d0e372553e247a3caf54f78b8aad8 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuWhr9di;~fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0%UR(kO5DR*@1-$x_$3g zY~0fLl-I_Y&132olg4RkAGZbO$nRhb{r~H_ch;=`tg8;K{kv(}99z*fJ^U5AYQD|~ zstqIU4aDwC))vfAJ|M7pf(oN#+7UV9m;8*uavs4fMecGDy-EdY+cQNPFRMjt3sv4} zW1PP}a9Pn8q51qLPnE|f)kKG`d-p7~{$69=D*3e^`foAXoRoXARZp}HB9zs-Zg;CWK8mQ zclp1R{nJqprzFTPn8D%MjWi&q)6>N2*tUFNW!`0!!K27?B zgVl!H{LdZ-7j^jUR^B^t$rbyhYqvJPWm&WAGf$ey#o~@nuO4x|pSdcd;Ng`Nt={j7 zzB0%E+C0h3nv-ldS;tgpM$xof4mr;g+ie&Nr7IN-)^9hseCb>8!@`-n+a839tNp0^ g|Fz3Be%_x*d7-azTB=JwTZ6pe>FVdQ&MBb@0CS>z8UO$Q literal 0 HcmV?d00001 diff --git a/graphics/items/icons/colbur_berry.png b/graphics/items/icons/colbur_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..56d46a52a22f561828126c00267dedfa52b81e6c GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuS0!CcRJcfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0w`{lmz(&GdMiEkp|@Sd%8G=RLrUEzbM&kz|nG;?bs~FHKh!#d~|jCS-haQ;P8vMyR4I^pEVCyR+^*Gmbud4#u1HF?h|PuC&hj^3MCaj_&8Qf!gFI6%a_!lvI6-A0X`wF4GjMc4GpWSm-h5*EiPUf6x5TPJZI_BV@^)R$BtbC=|%<0 zQC9pw5ym8McbET5**_fxaY};xf*Bm1-ADs+c6z!vhE&XH?cd1PWFX@DQof<>M(9WG z7sf9#qSo}d99YN3RzAz5hsXC9qeOi;mxqMUp3AnC-}ml$ZBhSZC-?r_Rh#)W8ao3R zwe-Fx7l~ew(tB7b@j|OBzr{vpjpUxq+%5jIKc8Nrrn91No$u6>3l&({Ryd^g6tAkj zA>h`yvM=I*)}$EIkY#`E#2(!%ycy$u!D?a*SGDBpJ1NVj8;DJKF0I>=x7>ZBnbLnV mr+tPmWB6v4MV3CSf62T?M(g>XRd2mO9`2FmF za`Iz0y0^S=nR-Bf#ngnWwu{)VY|^h_na}onqQNGK#~IUqin?ivCfxtwlX2l3W51~* z-{z|euKkhpxN_n7$z`fdiwqN;E}RPPyVy2q&-vRD=`uTI=kZ9IKl?hnqxAi;*B|P> f@YJ3=xBtAjTaN@~>7hgX7`151InG*?1R+N-XNJyv% zn6qFSavwc6a%|l>O6D5T_)_FPOpM*^M+HXP2joV@SoE z(JUzjR2P&TH%uv2~G4aHKif8Y3b|y4Wm61$2H>Yy9 zz!}YQQJdmtcYG&YeDqXJ^zopr05#8mqW}N^ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/dragon_memory.png b/graphics/items/icons/dragon_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..d073dace311d1b6d64b92c6985d07dc34d537c6a GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmGz`Nqj#fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0i=7s*K}7mXC)n7GUw=VqYj{6#w2fdm;X!IKOF^eN`m}?862M7NCR?qd%8G=RLn_E zIKVH#%F6m6M=?3sRii&p<%Eu|robUVea0f4kb^-zmmB9i;ZrqmFG}0FdSmOQRlN#* zXHLEpT8afO=I-wQ z4s0DeTFkib?XCVVdLrXuKySyjt>53RXDe=+6&!o*9&2`@z*UA_uCL$eZgsdB+$TtT#Caarzwc1$u+Q)78&qol`;+ E05yK3wg3PC literal 0 HcmV?d00001 diff --git a/graphics/items/icons/dubious_disc.png b/graphics/items/icons/dubious_disc.png new file mode 100755 index 0000000000000000000000000000000000000000..bf2ab2fc0fa65b9074f76608b6d9f2d6ee2fc78d GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuUNn=8O1^fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT067YLq#7^4KvquP9Z& zE`@VG3#^ipwN*LNzo#W9e=g!kzx2*nJ$%09W{xvEOP1}a`99BB+d<~$?pF@y-Z{%E zT$V`9*VVtj*K@I8(&{&BL%jmbI?A^%7JL|V(=EkbVIwCq!2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_L|z+lIO9V;qUyjby|BVxjYj0FV&6$u^*0S*Bm-Kb#U zw5`!V5ym8McbET5**_fxaY};xf*Bm1-ADs+`aNA7Ln`JZCnzv-aB*=RxasBP)fOPP zcv5$F_eRAQ;c+rT;F+o00((wYR)&z(8s2k!d~bog;pyt{`@cAo$M literal 0 HcmV?d00001 diff --git a/graphics/items/icons/eject_button.png b/graphics/items/icons/eject_button.png new file mode 100755 index 0000000000000000000000000000000000000000..a0492ed6e0b90c8452ddee7b90aa8e85950c412c GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuUL5TME0r0)@m& zTq8N1BP5;CP>j*|L@DK3+{(jtGQ zbTkUdYWW$bJMm6=kx>-HCMm)3tVDy6*JN81$3v5y8q(2gn~JP}nsO#E_9$rTa!8+f o-L%nh&$?C)enT#$%02@IhMYf2*H>oF&}%WQZXkv;Q&9&#G77COdQ)LOuc-U2fgOL08ukZi78^{`bzGFiaibdSs_!!k}@{q_Q#G&AYlQ=BcQ8K+Cl zo-%#9gT+ka*}H{+;}!E%nITW4lE_zB)%aGOx5<|=Tx!6tb^W~)Fs nbET$%Sw}ikI&&q*{3LdUZ$Gu~XH~5G3G#ubtDnm{r-UW|YiD)n literal 0 HcmV?d00001 diff --git a/graphics/items/icons/electric_memory.png b/graphics/items/icons/electric_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..ce9a8f362472756d183dc3b583780ae0966271b4 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmI3V()JU0)@m& zTq8CGcWsQ|A;DJ+MR&Rn1occd@wppx%K4zo$(def_1-O9ZPsLA zq^>?weEPawzXg`OIy3X6@Y3+Rt%W+Q68G;h7ptV7<4H-_^ZVUDrwIqWq*{44mB0VT zEU9oYF-EE4`@6s43X5BN51;M6esA}FsWXPUp6?>6#n-et9+P=7ZN={W2g;0QEm^uV z+%d$^K#%Rzly|o{3b%ae+Rzayop^6z9BcaGDk*jbhBtqm&Y90Fodfg-gQu&X%Q~lo FCIAtqs67Ax literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fairy_memory.png b/graphics/items/icons/fairy_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..fba869128077e8ac8b054eaa796298b882915926 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmHobGn4~0)@m& zTq8gC?f?J(&(6NPy5`%rd;j+~|G(G$uDW_k zQd0G|DOa}?Pw7soK00R$lf;2nK)sAf-tI2{m$H943gVOm`2{mLJiCzw-zaN!51?k0taSIm5U0)1?QY z(vC7SCmRPHZVJC!%Mo<7IPI3p%g}PgImYQmtP=O{F&C?(oij;E*z^0{KPQ3Zi!~=W zetUPfUV*t~%B4fB@9*vX&y}(zVpe9>ja${zopr0NfR(HUIzs literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fighting_memory.png b/graphics/items/icons/fighting_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..ad21a2d078c4e665c575d9cb0dd5d7c5f7702240 GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmGdr7yR40ENU$ zTq8Aup4+;W>svr{04yD`(1P>8(4qo4?6Y zJAFwT>-&Ab1(sx8U6m=ET6Vv+(1=yy{ypYmmGpBaDG7Uizx(Gl;h?Nys>?(cPl#YZps1Rwr(Z})!oGoE~!!MCc#*R(pCh`ca(y?g(`GNZOB(|5Z$ zhZq{%ePoWrET{9@UGe5{fRein*(iofkD2?*~NeQ(g<##FBm*s{an^LB{Ts5 D0s@~l literal 0 HcmV?d00001 diff --git a/graphics/items/icons/fire_memory.png b/graphics/items/icons/fire_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..33116aed1223ea6b9bd195ec18e47bc5fa1bf0cb GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmH&Jf{3QKq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_MD(D46W$N%r{{Re_)d;cFzdbdX5|Ghc?w`l%9+gx2e zB`K+TOLKE~R`Jm#OB(*{=?3a$O!9Vj`M;F?(@_woB*-tA!Qt7BG$3cMr;B4q#hm1X z1N;)KtgH`m6os$5X!Hlh96oZiRH;RI-L^wVj+zMR9F1UkV$ojKVEM>+>ZTrF>oR$k zVl8#u-mV+9-xWPVD}S!(G}`_CkcBp@#Ql5B#YfW5<)kF+`Tg#nn}WNCr|tyDZ}0Bb zD=;6q6voPZZ*TQ~(-RphL)UsQ{&sKoe)cnwf^Vj7`>q$k-CUt@LHBNXee>HCp0Yy2 z-nJD<33nK$bXwF3Jj$3UtF~-6|Dip~o2AdWeKp}@UNS%G|m0G|-o28REJhK76J{lEI{|F>`dx17DV=H9zC@BRb9oOl0^9z9xJ zJtZlrx_a;4tSQ}d&Yt}}SvwS{modrP-R1vM_D@GaoRT2FU~P*cr+Mv#{`G$mor?|1*)CLGM1*~YV}{QW;> zNd?QzcU(TayZd{+qg(fMZSmRf_m8qD57#JQpI=xGdzUuNS%G|m0G|-o28RCz1_l)g8b5aIxZ&aP<44Aa7YaXqtSCq@xN(7DMhC+N z0|Ss5FtB{i6+IxEG0EHA<^NLlPe(zVk|4ie28U-i(tw-|o-U3d6?2jk6c`P-6mIw& z>fDsoBl(`IivGqca3?~924giV_Bq#b3% z#TBxbb#r$t-db%w!L<1MJ6DCp;qRliR)1f0b@u^3flExA!gPaLD%=7%Ian0)l0$@8 hm{eEDvpi(+V_?vlZLBmaW_CHqhn}u}F6*2UngG%igWdoD literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ghost_memory.png b/graphics/items/icons/ghost_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..3041643aaae310df75027b50b583157979b80f50 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhv5`~EYV0ENU$ zTq8DzfoC7}T@Y!S7^BvVr?5<&d*SFIRkb zG)Q;NezxW0?)P>qE2FlqS{s=5Jyt^9x#8nmTLbq+iw{p|{P=G7Z|O#vix(Dj@@y)9 z|BqQxVaXIT*AMUR{$B6s*1a?`&F^;g`+sr*?k1I9GcVoSouJDjG}B>w#Qnd#+a?<> z-E*hd%te&>vDt#2i!Yl6+)uyxVsfii;F;{qy9H*emKQQGa51mdK II;Vst0CZod-v9sr literal 0 HcmV?d00001 diff --git a/graphics/items/icons/gracidea.png b/graphics/items/icons/gracidea.png new file mode 100755 index 0000000000000000000000000000000000000000..31bac3846cde562c1b5467f1b810c03f27d4dc78 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuX`f6YpDk0ENU$ zTq8x5IB2B z!E^N^BhC&zYwm-!)eHyY7O<|}(Ix$zYvH4HPKJ9O`yagZ2@*XRdG^fgJ^ma&_1*6C z?uhF;KaD}ltD(|CpwC0`++9rt+4Dj|&$HVLmOh`_VDee!qECq128*xE`sJ&?X|&e+ z|Jd|yR&Fd?(TwQmXyw!kbH8m*k5}fl>Tch8kK0y2=k3FSYlW{$7uDwHUF*nsth3U! zc+0JRDYjF&le5KSkB&+3dzS`QRmWreMv_eJvud2!U;LK0|H>rf WrakTdrd4}E!QkoY=d#Wzp$Pzr45e)V literal 0 HcmV?d00001 diff --git a/graphics/items/icons/grass_memory.png b/graphics/items/icons/grass_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..646568c412748023460c2d11430a035cb28fad9a GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhuAaaymmfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0efxIx+q3F-YqoqlTU|XR zDXBW^-IC@lTe7;lmmEDB$X#9s)XSLU?e6k_Df_3RAWlh;UoeBivm0qZ&K^$}$B>FS z$q5JeC0JQmALJ+sr@LzO2ZmT4RgD!qB*@ED*mEGLXRSkD^iIPW$`=J!&779ECri0Q zxp+}&RqDr8yZIegotyJAXG&bD__3La2Y!5$11h_ic;Z0C_q%^v6`Gx=a!IDVzxS8j z$iX8sZRUf!yT8Xb_Dq|TX}7oN?cU$356(H6I?pTnebZJ04%Y^%}hQSl_fc(6$#C=z<5G>kDiXt^xhQ;OXk;vd$@? F2>=dYr+EMX literal 0 HcmV?d00001 diff --git a/graphics/items/icons/green_apricorn.png b/graphics/items/icons/green_apricorn.png new file mode 100755 index 0000000000000000000000000000000000000000..dc821541bc81faf4287b45d7b1aa2307f0ad6ef0 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQOwP24iOfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT06(-l;i3nCsb$9TM$_EKeTu7M!zXO9)GPbX1te83wkECIb3gN&O{K5;-k9*bg=C oik4DjoWk_U?2yfoh9{OuKyMal#VtOQzX#-SPgg&ebxsLQ0D?z#ApigX literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ground_memory.png b/graphics/items/icons/ground_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..0f9f31734df68fa62e50018d8e213aca67c17b7b GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhw8FMN)R1BJv( zTq8@ zOAF3qPAP!knRmMl{8lkMzFnQrmyxkTk@@l6^6%zNJYkn+oKUF#{?2{^ zqmXRoW!Cri_WqYj+2S%Q_1Tua-`~AwEbdvpyY$Uo?rVn>5;;q{zuvu{U@dtyHbyJm zImFN)Z`PwA%b#ByI~J#!oi({tEAUKq=G_9bRm%$*78i@$%`-b#!8@e*bnPwmN6SQBZ0w%8^>6PDcMtn}-(!Of zbJpMM&wrj*^VQYi-b*(7ZR>i=Rz0jP+j>K>s%>Xi!Y=l`Dl^R#=UB`(*8g)-e!q?K UwC{J;+yQye)78&qol`;+0D5AH;Q#;t literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ice_memory.png b/graphics/items/icons/ice_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..c0f7cd76e8527420ce18cb2f1b452f3f3b174cca GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhu26`yal0fod% zTq8gFw5vbwvMoIMKE^g>Sf0FYu#@^*Lmzm)wGNQ|*0$S;_|;n|HeAZMGWi(^Q|oaBT9 z{1U9JtPgS&lZ9P1`U6dl-nbDXcu3GYl(DGmKu}Mvg5OT=8Ok>&ilyYd+mxj|!+5dp z-W4fVXLc)u8mF6?dabu&ew@K!aL0%7IQ?D|j{t9| zmY7ZPvpc#IE;@O=d*zyaZeBF+vlSxJt?MkAuN_i&!dKFLeP(!qwd7PsnGP+sW3CQ; wm)G?QxO?jt6-I3pd?x!cw7_iD@FVdQ&MBb@0Alr-lmGw# literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ice_stone.png b/graphics/items/icons/ice_stone.png new file mode 100755 index 0000000000000000000000000000000000000000..ee5309544ed31e32cbcd876a2315cdf9b6589041 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRZ~2ll-b1`3In zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28REJhK76JeVcOi-o0=C-~Ipp?f?Izy=N`wY`OaGn?%+W zkO9a*dM-PV%b4Wt?(%;r`=_HIPDzkoFoVOh8)-n!UQZXtkcv6U2?`7>tgM1LsmkIK z{TEG6-q_>Ja7d8L+feVlL5qivuXm{7`v8{WBZn_d>AkBcbF6EFig@z(G6VNL%08-B zBKIB=IK)}RTr`W@aaEUgQ>^nGC7lB@$%_-h#jifo6L61-G`(>|b4MlXiJ*lGE+i!T zc0WDsC=+<~Lc-FMv8SaS+d5}Wx1JfjCW`UWA%)DiH!(3=xz=!FVdQ&MBb@01m5<`2YX_ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/jaboca_berry.png b/graphics/items/icons/jaboca_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..da6d029b081f3ad50e05180ac7dc4d263f776036 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRZews!#M1Hm+DVV|DaxP^M3t-|BVWE3@3uZx&BYFQ=>#rl(Ce$AHK>sS!zk1Zp*GWCDrrI8kW@W%LuEwEudms9DE|HncFNaOd~T! z@lkZ>qG!jd)Rswgx>tWbvt`yae;I?63X$q_8J*MK&sR9`wf_rSu&vUY-OB9UAkTTa L`njxgN@xNAtjCB; literal 0 HcmV?d00001 diff --git a/graphics/items/icons/jaw_fossil.png b/graphics/items/icons/jaw_fossil.png new file mode 100755 index 0000000000000000000000000000000000000000..a52a7579fd7cef5cb59f6cbcec192ae3f1521c10 GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRaZ&bc{PfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0?an+uh~=Qua?rL7b8xzhDN3XE)M-oXegrjv*CuOfMMb9X8-$4fw@2>Gi_wB_`Fb zmLFt{tQrzC%M(5_**Y0Lxv}t3o3OmS0~1R|>e^QSQaiS6yM#jpH>z(h4$BElUw@@4 zYvSHN8=5|>34HG_6FFDPDMBMFi2uUGa_+x@J)c&aJFRFDxx9vR(P^vxt7{Du`g%&9 zy$XL}sK2Yi=Mhg$f1LicInNd+1r|&+n$J_CD}H>dM_Il>eD{^v;>^v9ymtP)VX!Hs zFmIA*!UCOLk1BIsRP4IH{JC@3c)y9+>_3=eD>96dInc KelF{r5}E)l6{9Ht literal 0 HcmV?d00001 diff --git a/graphics/items/icons/kasib_berry.png b/graphics/items/icons/kasib_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..c09fa20dec70f94d3dbbd8cb4645678a3c5539a0 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuRZ`zb~A;4HObD zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF4GjMc3=Dq!*s-F*;DN)A9~mb$7)ve7nkgKvF6#?-^LR-KJNdrcDjFPTU4hzqwS?Nzpsl*gd6SK z?_$il`G&vXL90#9g4Y5L6mTBeBxLd4qiJSS>*)&(k4tz88e06L#nhMFm5NS%G|m0G|-o28RCz1_l~4Gz<<{1iVPl$k1q5VKCu<#fA?v8VV9JA_6Y_ zH~>@&2emp=V}KmSByV?@|4Z3F9R+bpg8YIR9G=}s19BF4x;TbZ%$eH1k@t{+fa_!4 zq-dUoJ3Ef13+Vnh!nCI05EIAul|F7Cm{cMgpKdtc7Zg}X*2Y|9zkzWaNH7Gs9It(Dgj&cbiQ^A literal 0 HcmV?d00001 diff --git a/graphics/items/icons/kee_berry.png b/graphics/items/icons/kee_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..83749d1b834290f251a24847a7328cef4a855f3e GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhwIUw>aO1`3In zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28REJhK6(Q6&LRf3YueRSgiQ0C+h#&>b))5=aQYKR44zx zxA)oJr9kC-=d=LHD@q(cfD~hrx4X;#rR<-Mf;c5Xe!&b5&u*jvIoCX0978JRq)zbV zV{{Z~-JO5Iv~E(OsjZ(ujKhwG`Nk5>TMxa-y%8~?<4BNNEyG-mY-zK;hhn>`RfMv> z?%NacYH!k;a)u+}-jW>06t5@7vYp}Xd1lm;vRHS|vf`-H2D_F=o8`|hxL!Exw?(wt z(mNjtHy(L;ZS4ohM z8CmRWYR-Brw_@ZLoqCryXP(%PADfPy%>7)lQhiBT|6UC?y>kgGL=60&IQHvb7W#Bc f=D~Yi`_F8;mG&;ieoa4tK4kE8^>bP0l+XkKiH)kO literal 0 HcmV?d00001 diff --git a/graphics/items/icons/luck_incense.png b/graphics/items/icons/luck_incense.png new file mode 100755 index 0000000000000000000000000000000000000000..396ab2f613214054432e0b2c30cd9a8cc6643679 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuX7UMRVKM0fod% zTq8MHUV4D~uDxxjoFEWSYnFrf4POfF1dMwhjO-y|P z42qXYdB_I;ST)mO!zz)KU0D%7SGh*5J{8>DAaikL;?t|QPX{YAJIlX7~K z<>m$(g=*D~#g^HsCmJHP)f;>IVp!RN5Bdqr7?wim#qA0LTO9r> daHtnBF^F$5nZf2L)BtoggQu&X%Q~loCIE&}gwp^3 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/luminous_moss.png b/graphics/items/icons/luminous_moss.png new file mode 100755 index 0000000000000000000000000000000000000000..6ee31c5e1b2e25f0bee21f6fcc51c3edf680537d GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOoE2OiLbb0fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0q1Yq5WZ9}$98W`9R5f>+ zi91+K%JN(}OHRP|jhLgN)2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_L|z~DtjMn^|ShJnF{1q%`q5;hnZR3s#Pm|^haM*zqG zBoMl!F9yhEO!9Vj`M;F?(@_woB*-tA!Qt7BG$5zn)5S5QVoq|x0e+T=H@%veIJQli zw1}aJ_p#%RfO#9d1!gRk;&{>_*<88mVXJ~mdKI;Vst04BY9p8x;= literal 0 HcmV?d00001 diff --git a/graphics/items/icons/maranga_berry.png b/graphics/items/icons/maranga_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..2551c0167b24e40e13af93973161ad854d86142b GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnhw2zZK#gfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0dZUv(1>TJX0Ak8T)$sny5Ao|nXy+A?6 zByV?@|4Z3F9R+bpg8YIR9G=}s19Db)x;TbZ%*mawk+0c+$K|6ui$;kWckxpVYp=Qn zuPN&SSry_0LoCe88t70z%V@`}!Wk?&e+Qi>_p+sEDMs zndO!`wePIiyegTg|bh;K#Dc zUqw5=9G_vYl)e3A-_IF53K>r(a8Hu3DxP_4;S}jTo(-oCABl3G#F!hxyDsjg^=Y|J x8#jjS&|c%VZlP+x;`B-RHgW~r`{jNwVb?q*Hm&bK#b1zfJzf1=);T3K0RUxsYGD8X literal 0 HcmV?d00001 diff --git a/graphics/items/icons/occa_berry.png b/graphics/items/icons/occa_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..05d9860fb5b613027d791f346d8f7cab50aa1d04 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuSl_Y|+6iKq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_L|z@Xy741)}h7X=1CCM4XbaM+QcV6hQdxqfmZI3ohNW3O@$Tfeps^nd+e^=}OoLA?3$bWI!ObO@h<@2A2mGd{psXbhK zb;T3cbDOvGeRo~g>}VA?@8^*)Z`YI(1(B0XrU`qR^$iZ(abVnPddc*_n*|A9Q&+9% ldSU)u^v<7O2af+=BL41x>>cBcx=J9&d%F6$taD0e0sw7Qek%X~ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/odd_incense.png b/graphics/items/icons/odd_incense.png new file mode 100755 index 0000000000000000000000000000000000000000..11c7d24f7da536d51a355be4965734b221ecb150 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuSl#91XY4fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0sPH%dRD}k( zw;1jQ3Na>mySw~f%Kqsnh*J{e7tG-B>_!@pv(nSWF{ENna)JV*0hhuJpF?e21=~6{ zEL8UKyJDep)j~i^P$MTNM}uo(khqAc2%m@!ORgTe~DWM4f^qPJA literal 0 HcmV?d00001 diff --git a/graphics/items/icons/odd_keystone.png b/graphics/items/icons/odd_keystone.png new file mode 100755 index 0000000000000000000000000000000000000000..8ef2d3cdb53688d349b5bfd6ec041ef49cac5b7b GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuSlZ-NA7mfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0>J2CAm31cSu2i?LiUqtp(NWi*tBA z`7c~KJ}pdYd#;mhgRjlOFL(NQa(XvE;{G#Pvg^@%p`{|JZmhe#PM2)Vzq{F1RVO`W zowBoR{^8%EKjt!RZklUsA{5hO!jbW-(#PQ5mr|ZiwhtFG*`B@^zf#Jhd4SF5_=*Hp zrtP;6xy;D<;dDWgFJb5H1W&6U7KhT7eY*GY%901MaVwTgvbTTC>^(sxmF1L+J;-;S Lu6{1-oD!M?FJ=F96vQbB@(X5gcy=QV$Vv2caSW-Llbo=CD?x;XNm0Z7h6D%CLZNjF7cM;5 zDbU9;K{jhzhss1CW_;+Nsvxt1Wyax*M?f%V+B7wWM=jHVz$x^g1(S!&3SEId1|jxW lVjS#B2M@3m?NiW{V`Dfkt6UP_Ew%;ZJWp3Ymvv4FO#s0VTpR!Z literal 0 HcmV?d00001 diff --git a/graphics/items/icons/oval_stone.png b/graphics/items/icons/oval_stone.png new file mode 100755 index 0000000000000000000000000000000000000000..27e0a7ccf2e8a1c8acbf7f2e199e779e3553c0a4 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuSk`tDdiN0Sbwi zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28RCz1_lWU2`4Vxxbfn{gas>3+<5Wh$BzXoHh{EZfI5$t zHb6nfByV?@|4Z3F9R+bpg8YIR9G=}s19F-@T^vIy<|HR5h#PQmDc(4xw~Wc4Z$o!? zx1!IXqq;|rN@}UTiJLa*8Ph|9Z9As#SYpZEXz8QopsOd>o6x7>(cSH;FhiN~+I_~S z4O1dZ9Hw}h?A~Fq-Ob@^iG+0d7B`0}hNTUSOh@K%EU0kTzQVdl!B62#?kZVX$AWNU eF0Mm2fgx1pfllT-G@yGywn@MRe`} literal 0 HcmV?d00001 diff --git a/graphics/items/icons/passho_berry.png b/graphics/items/icons/passho_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..cdf3756078f0db0a2e375c617b5dd6f2cd6b4934 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuSm03Qfr?fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0no&6`u!9lDV0d^&yi#RnRGnoX8*$+4R<=}O8p@qhKv6V2zXly{t3v~oJgN1m>JF6*2UngH}}f)M}! literal 0 HcmV?d00001 diff --git a/graphics/items/icons/payapa_berry.png b/graphics/items/icons/payapa_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..fe021c473ec4a2cd04b29db04798f2ec2b5038a5 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuU*_Tj~RAfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0i!+tFlxFyybe9X*p&rm*kTN4>^T)4Z3Qsodtr1IXiS|78 zph(9h*Jd`C*1XdWF9aM}*Dt-bDAQwA^sO&^X?KGTZvAX~=Y7Vacg(Z)#d=yyTQ=w1 QMUZzqUHx3vIVCg!0E&{05dZ)H literal 0 HcmV?d00001 diff --git a/graphics/items/icons/pink_apricorn.png b/graphics/items/icons/pink_apricorn.png new file mode 100755 index 0000000000000000000000000000000000000000..abcedcba49d70b5045f309260ee632dbd94e059a GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuU+g%4<8m0)@m& zTq8+_V;U3dk)E+F3C%+eNwMaZp~|yIYpbN~(|I_#UY=S++fUs=82cZDT;{)1wO) zE=*)f=&RnTIYF4~*^C_$?T0K+9`hEQvt>&NOL}xvn8q0fwv8qN`dmrRM^vUdy&5?#DmPtTw7HP#TK9j!(O|mw5Yk?GFlDE6d|E27oj)FKPL4Lsu4$p3+0XdUAT^vIy<|HR5 z2y-wo_MBajlar&u@RUPZTT@f}kV;QX%#?*eJ*(WjypA~r^c8Q|Sh#|7%H$L&sVtV~ z5|%Sp&2Y3x@>F}eE-R~3z;BnE`{pRA7Ujr$7cahD<5gttzP9< zvafm8w(sX|T7QmnmQ}BP{%&ujbmF>cb>H)p&s^o{X=*Ak6J%h}`KfwLFspG5&~*%+ Lu6{1-oD!M<>~)6^ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/plume_fossil.png b/graphics/items/icons/plume_fossil.png new file mode 100755 index 0000000000000000000000000000000000000000..cf98166b31c59481e7fc6b0eab96ad809faab63e GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuU*hX+>8WfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0h;8El*6 zol&LSa&|_d)H6F}iA4cRbPq3%kvx=G;`uUTeTJzQOW_e)BP%Vdrr3iro!k1j_@5?( zcKAf6ySuLrl;}8oV~XM4MM^hpcv2V^2QS$bw0dHc)Qrn9Qc_Y^^~6PJNj(Ood0{L{NGZ2wtDZDq}%WQZXkv z;Q+q`D=X`R97W;h4jTP|YfcN9w;Aw^;ALRo?srdZXmKo;DSNL3Im4;3KI?hRiOdT zqv4%EA;u(ccbET5**_fxaY};xf*Bm1-ADs+wt2cZhE&X{ov@Lw$v~hjTFqUE{W_b^ zja=ojeT(-o*f1{HePzkMgNCOcysi@EEc`hCpZ@>)w_Bb5OxNkE`5Jk1%krA9=Ztmd zZh9Hjzd$JD9{&rTdqF2l=1L0~eEoLfmF2Eag6=a;EI4S)?^)bA(c)ELr_XVVckc`i za4A`AW?aY^@nGVD>)bA`D{|*@OUB(%p7D0FzHWA($9c20#T#ryzSt}?PdVtf2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0WcH*l}=ca3Yv$ai? zm?V@IDpmMDVA{^`nO&!R$ulk1G`V}lT+es!H(CE@lJifV$8VP0PYLLI$lEz_va`&6 lXXnNrZx3{B{r~U4Eb(l9)00^-0rNl}_H^}gS?83{1OQ`0l0X0e literal 0 HcmV?d00001 diff --git a/graphics/items/icons/power_belt.png b/graphics/items/icons/power_belt.png new file mode 100755 index 0000000000000000000000000000000000000000..e4273f85c649f5718c320ca4e86ef05514036ee4 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQP}$FDe?0}6?k zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28RC$2?+)U1}8ckUTjGCaAC%a1sNR~1_cfh8wxByx={ho z9-&)65ym8McbET5**_fxaY};xf*Bm1-ADs+Hha1_hE&X{ov@#;$w1&(w3@pRdpMKY zn>gjNcMA*K)emg&_I)KSlb`Tw+r37X*gwnOPyhYSfAy96mp1<5^F>OFJ;d*SH3x-C|bmFM{LEBd%Y<;Qg(RG4(4d#a6c2mq{uUyy=+6n zr~3{z2hV;G*gnp|vd$@?2>`=klN0~| literal 0 HcmV?d00001 diff --git a/graphics/items/icons/power_bracer.png b/graphics/items/icons/power_bracer.png new file mode 100755 index 0000000000000000000000000000000000000000..54aa34844bd5283d773bcac0014076c6814cfe82 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQQM&l0v&1BJv( zTq8gaiWvgBuYM9|{V7Oqj63!=u2$Vn;v#NGk^Lw!5JL z6l6^Dc6a%|l>O6D5T_)_FPOpM*^M+HXN9MWV@SoE+6jhy%?3QKveVXiOto?k*eD)7 z#r7GKsLX;TUikuf2X_8u?hTk;RTW>iZH~ZS{ov5lXN$sePoHUib>p3%ZI6}jxn&nJ zlCDNiaw%o-=Wp4Z$I7q0F0XS_<+PqV&K+FG+M1ka`0IE4;eB#&k~7O|xqBk6pL{ml zc)n{=Py9pI!a04bt+yx{+Y9R1w%L51b1&dWon!L7zGZA)X+~!c?zbzopr0NoLYQ2+n{ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/power_lens.png b/graphics/items/icons/power_lens.png new file mode 100755 index 0000000000000000000000000000000000000000..b18d9118603721027c2f2de4dec3010d3d6f5e47 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuR-S2j@@M01Anh zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o{|ycX1_mDjKKw}d@nOS{42yyZ4l@oo+*shSL*c;>iwQq~ z0AvOXh{rVX0NIR5-tI2{m$H943gVOm`2{mLJiCzwNaSW-LlX_t<*C7J|h6g1@ zzFJ!zsByjX%}T%hYK@1_^`MM&LEHNW_Bic+{Xn`y|M}d%jvto&-to9d{MbJyj*H9t zW}I9w`SCJ|LTz*2($G~if)nM^%o~DyIX%6)1DZQt(rOTptmQwGQYg&;Car~arDvgSFR9zWbW(8y!aF{vj-0wAHpOt1Mlet}Z zk=v6mbJSBK?0G-DFWfgJ%K6^>SjH!Ro;$bg>F3XlH%oFeI0_0#22WQ%mvv4FO#s<= BoMZq1 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/power_weight.png b/graphics/items/icons/power_weight.png new file mode 100755 index 0000000000000000000000000000000000000000..149679c387039ebf447780311c16a6602f172bca GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuR;1))Q8F1BJv( zTq8gaiWv1BVj<2`?&Ud|2TzBf?`xghhq}Pzfe5Wznew ziZUj7ySw~f%Kqsnh*J{e7tG-B>_!@pv)a?eF{ENn?F2)?=d* z6a!&reFuI9$Hu)Jc?n-{+?Wy+@!`w7PqKem9{iuN>5Te0twn0{Egm$^GE}}J*y^NLjCYHhYxIX-Lfg=jhd?378ll(8J98(uf2&@sN?2-tPw6M z?(WGtdG{B~85PrI*uP&WnmSq8tv@RLX{x5uyf3_wUzoY~dpY<1NHq9*X1~3`dEqq& V4K7~qt6T~4rl+f)%Q~loCIIvPigf@0 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/prism_scale.png b/graphics/items/icons/prism_scale.png new file mode 100755 index 0000000000000000000000000000000000000000..335816ddbcc430a99e947268e3d57f34c46ed87c GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuR-+rrt`GKq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0J+T2f%hT1*Wt~$(696$pVweB` literal 0 HcmV?d00001 diff --git a/graphics/items/icons/protector.png b/graphics/items/icons/protector.png new file mode 100755 index 0000000000000000000000000000000000000000..fa88ae155606283f48afcb04e98c276f1dbf0dda GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuU9>_Lo}ufkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0jVp@HV(PPlZ2Yo zm$W=Ev|_Ye)hW=ofpbE*9M?o4Gqb`V{d|3v)syDr?^_GvC)nd~6r x$-#aiSf6DV^Pxlm9rjB-O#%KKO4ZWZ3=HXNYKvcaclCk%;_2$=vd$@?2>^#baW((| literal 0 HcmV?d00001 diff --git a/graphics/items/icons/psychic_memory.png b/graphics/items/icons/psychic_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..beda2c22df19697b1682d33e6ebb667f3f0edfc6 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOne;tIihw?fI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0%p zPf1Fu-qPLNU0i&0&5}2h(jce2M4`Yx>6a^e%$NS%G|m0G|-o28REJhK5(W|Gzu?|7g_z|KI*cIXYHH1x-l`+B;=Vv6o}D zm)HNJd;eD#?~RHAYP$3z@Dq??O!9Vj`M;F?(@_woB*-tA!Qt7BG$3b^r;B4q#hl~> z1z`>*#-6h)a&mH17@l%SYinw1A5!UwiJ7u6sArX%m)9}JfWG1l8w*!(PMMq{C6&eU zT*7kZsu_+JNuFv?*JWjO3i$1EbKe{#)uJ4E@8ZQbQ_Td=Otiav@!}=ZV&x+ZyVa}w zO7=C++V=h2P3zBb&a&#Y&)@B>luleXt?qlC@|mkVJxxsoW`Yb1IzLs931&5}0lJRC M)78&qol`;+0M!qQG5`Po literal 0 HcmV?d00001 diff --git a/graphics/items/icons/rare_bone.png b/graphics/items/icons/rare_bone.png new file mode 100755 index 0000000000000000000000000000000000000000..80b4af9d58c1da065daf944ab4f7c186a4593288 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuXhw#X;Y`0ENU$ zTq8dfNqags$*bxBrE(}R|_ zLst#iRFy3jojP@}uYfaD*l|Zo&;|ylcCABVF+xoqLOloFmKAU+E;VT3Tc~hVpe1mb p$1@|V)k@VzEd)T$&UawUjP3u8!^mO%eS?83{1OOzsV6*@L literal 0 HcmV?d00001 diff --git a/graphics/items/icons/razor_claw.png b/graphics/items/icons/razor_claw.png new file mode 100755 index 0000000000000000000000000000000000000000..59c27fc809c3c4b96527f828df4ac8a685ffb529 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuXh&(E)y0Kq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_L|z~IM^9}OK7F5I{=W5J4yf{G0XP6Px5fV5(O>cbsj zKtaYNZ+DmfOW8ji1#wD({DK)Ap4~_Ta_T)@978JRBqt~cb8vBS9k|is<#nvhVBUo8 zqKp-aAx=j%O-)Q97_=6ONpVeOdgZ}d$fPKfDj>b6@8VJ3Gn}l&r%pSay_7KL!={9T zA3`|V9rsvlaNNUlN>GPUnXhl#4Gz@w%D1NK*Pg$nMPlCOe}IZV)h@K5pV ZZ-x*5W&G#PFqsWh2%Q~loCIC?WZ;1c^ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/razor_fang.png b/graphics/items/icons/razor_fang.png new file mode 100755 index 0000000000000000000000000000000000000000..dd54b98e794fe4e8cd935874ad5178068b272de9 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuXhoq20$KfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0FS$q5Q_99#+;r;0wzaT85f z-7#fCcd)=5NS%G|m0G|-o28RCu9uWox1``@qG-PzFn6V=xq5`A|2VnUccCU+*2_lSD-luN=y1d&&Fc>}T%TPSZE1ZXm)jC zzl({y=>s#B2FuNtSydS7=M->G=z9F=p!PxmOTHHy8J5mHe%xgSM_g&D&kiAhc32lJ4m1 z$iT3%pZiZDE0Avx;1lB7!0_MD(D3=zp5h>H1o;IsI6S+N2IRDRx;TbZ%t=mA5HsL1;Ns$P zuypEj(^}XmAh$SZXT`*97v+}6L3wfSZdo!bsXmJ1d!*82+4k(I>O#S_jRC1ok1kxe zFp(*tuX?BE1YxdcGj>R{AF@1o%v*5ImMtMH>CsVP8fO^THkt_Nb0zhcNJ-?h>|j6C qxGP#pk#P#sC$mE~M;e}3CIP)!q!qXLO#U8_!#!R7T-G@yGywpmNOeR2 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/red_card.png b/graphics/items/icons/red_card.png new file mode 100755 index 0000000000000000000000000000000000000000..1d07d827fa80c2cf0d01dbc995375355ff3609ad GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuS~s3_qW{1BJv( zTq8EaktF()}eLEL~#p|C|{Vuh0zhuq>xlO}CqY+C&25l{HiM@7NKB~kkYP(ss^Mj3xM3p@?CqVn8sscb LS3j3^P6NS%G|m0G|-o28REJhKB#6qW({r0%ZNacQ(q=@&Dev)lorHl7jY5nN#fL zSncKY|LETT)x~?GqV(SR$^rEXr%X*t+(eW-g@T$fA++6X$c}CEt@+T7=$Nj$VN&?nggB3 N;OXk;vd$@?2>^|~h^_zt literal 0 HcmV?d00001 diff --git a/graphics/items/icons/rindo_berry.png b/graphics/items/icons/rindo_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..4729e188c0176fb5c005d1f8af633e9454a69051 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuS~QUvz`SfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0oDireFi==wu;a%9pb|{5>Z`(K zpeSRKx4X;#rR<-Mf;c5Xe!&b5&u*jvITfBRjv*Cuk`oj-Bv>a{ICXIpI;ytxZ0OW# zI;^oQqvL|otcacoLZSjK#S*a-e8kN3S~!|ExNf$L@QPuW8LYu@gfJ}O_M*GGa5+^j^zCY8(In literal 0 HcmV?d00001 diff --git a/graphics/items/icons/ring_target.png b/graphics/items/icons/ring_target.png new file mode 100755 index 0000000000000000000000000000000000000000..fae2b944bee351a510f90ce982908f1f5741e460 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuS~Ycl2L%0ENU$ zTq8uF_yY~P8|LSBzkX8)v&)fJK zP>?an+uh~=Qua?rL7b8xzhDN3XE)M-oJ3C-$B>FS$q5R=988QoXICs)lA^@$l%sVj ztERP+<)Wugm!4`12+dl$D%GI0=b@w5L&swQe!GGuRSES3uZvn0=Q4x&+T*4isUGHS t$DJ7-GKtP8cE}6PbSX0R5nWXe^nXj5qNS%G|m0G|-o28RCz1_lWp3O6n+IItk&#Eyc31cMbF4jmZ=Agvfc+oLoZ zD9D)P?e6k_Df_3RAWlh;UoeBivm0qZ&N@#Q$B>FSQ~Q1SnhXS58-*=Gn!GbjHsl`T zo{*5x%~{06_aOe(THa;FIk%g36g}KN^Z{k+a)FK{*tYBs(<=}$^&I) zQEeKNPTq1z!gm%>2?X8z0a$xGPq);loe%h*SRe XHl?d86sTSZ2YJ-f)z4*}Q$iB}m>`Sq literal 0 HcmV?d00001 diff --git a/graphics/items/icons/rock_memory.png b/graphics/items/icons/rock_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..32d46fea49a32782aa641c6f953fcc9060b90efb GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOne+1p9)vI1BJv( zTq8q+(8T z!U28>R#w&rIf}y19T+97?;bsBA#h0W5<}4(?}I@-jtYH+mNS$kS6zAbC}v-l@(g2B zjhkm`uFmXM2sKV`WA$2Z#r${)m%%+t?q?jWZDK|S^LAF}DRwMgl6XR)_}Q8035-Ir znQBex=jQBYHHy+%YjHE@?9JlU2j`RsZ|^frKM*BxWKv_^N~_OYIqHi!JD3BH9@wG8 y`eH_`v|``1xQR&{vy{(RUt0YjC&d3T14DzH?PgEiFkhet7(8A5T-G@yGywn$MwxE_ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/rocky_helmet.png b/graphics/items/icons/rocky_helmet.png new file mode 100755 index 0000000000000000000000000000000000000000..006a9f8aa4a1236a4117423c53524aece23dd9a5 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuS~S=bel00fod% zTq8_!@pGsDxxF{EP7+lu9vQR^D|l?Re_VxL;;>EMumheWhn}bAiCx$_Hnf1Pjd*5*p)A{ubt~ z#m-zZFJy`4GBwGN85*W*nq%kAsMO?m_U9tMo#aN28YKgzU zD|~Q{tnBXc@{(rDS?N{|bNY-YJGh;nWBK`vqyl4E(}ZVdEY;Kff?6uv0ysHX6!Vfp kgjkqVSIDzGWbtEQShmAdV7bnlIFR=|UHx3vIVCg!0D)PF5C8xG literal 0 HcmV?d00001 diff --git a/graphics/items/icons/roseli_berry.png b/graphics/items/icons/roseli_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..7487cb2a4c6eb837c0fbbd48dbcf19a074e3d51a GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuVMz;@1O0fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0x|$B>FSQzsbm9Wvl?ojgyWacQ!q$J~RR zR*R=`3$${FoMN@w5xINHOw}LTE-YE$<55xNKW%@G@wfQgF8#2lr!K5odel2(;a)Yn z2Bu<9qtCuCA4_jey5Iax%KH3=jk6r2Wm}&rGMH`ao)ox3{cX>Tok~(oWrjVI)n6T) zm$XS`NyCJe&=)W7&7Yi;{bhyAlQY*m`tNR9Hu=f%^ZzD2eOkP?ms_*$-$PbsdDT?e S%_lNJ-t%H1o;IsI6S+N2IQRgba4!+m{U7pBVUt&K-){{fRq4p z&gLDG_YWLdu~_YTgEeoT6wl^kj}AUtV78~>Q1C4=x5vDD>&pLcEl-cE@0m3@Almx) zvR9X8`AmZVN-3>1t~w7Nz24rwRNb*l z;OqJ)w)`$F5i`VM>%=zKYSvNQNH;1@#w4!Ubv;Impjdv5YUhwK*?jlei Nc)I$ztaD0e0su_GqIm!S literal 0 HcmV?d00001 diff --git a/graphics/items/icons/sachet.png b/graphics/items/icons/sachet.png new file mode 100755 index 0000000000000000000000000000000000000000..32c566a91da29c1cc4e8dbb233428baef9659504 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuVM-TnP?_Kq2uG z*NBqf{Irtt#G+INcOMs^F$!g=MGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1 z$iT3%pZiZDE0Avx;1lBdzrn%K(9p}vYj5$fwaHtPovNoqE&YD2_}W@akX8)PHF?an+uh~=Qua?rL7b8xzhDN3XE)M-oDNSH$B>FSxf2}u4k-w@O8P%I-nO-Z+4x4S z^CfPHo93eH9*Ej(J8E=bQT@@!hVvVO*cD3_Td0R<6izDH^F4hnG0OUB1Cphb&pRdm^XKR*~e#dey-O@oprhH+>$v#?upUv kJ2@1Oe#=_$zj5&&hGGkme`{WC*#z=}r>mdKI;Vst0EXavx&QzG literal 0 HcmV?d00001 diff --git a/graphics/items/icons/sail_fossil.png b/graphics/items/icons/sail_fossil.png new file mode 100755 index 0000000000000000000000000000000000000000..4c6514820e4ced0dd23e7513258217c26851b386 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOhRm0Yu3%R1PY0l zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o28REZh9J;#Zfn$>mg2Q@ETg=fvZJDUszF*YfNxx+IZ%)> z$=luK|5El(M?svDAirP+hi5m^fSj|QE{-7;b6h7J%xgB_X^Wk=U{0B9iO?R0Ex)h0 z-idZTx4_CaU+G+B(!qY)B{l7fW3 z=f%feelFzAwn<<3d=`7p?dM#rAM@D*rak?5@efmCtxs<00_nY=aPV~Xb6Mw<&;$S| CJ)njF literal 0 HcmV?d00001 diff --git a/graphics/items/icons/shiny_stone.png b/graphics/items/icons/shiny_stone.png new file mode 100755 index 0000000000000000000000000000000000000000..d48db4d86a2787f0b2971dc8a85abbdcf4b65ec4 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQyWt|ztz1BJv( zTq8{r zk9fYf0!0{;yxm>?FJ=F96vQbB@(X5gcy=QV$eHWu;uumfCpkfZm4k~*;l`ishk!*2;*I z787SnKP_2ZOilAwaOXTC$jNIs)AF#AY|hGpj1}(g#lb>zl5-f1Ep=@@ zJvGk?Jd)V@<|urA0`p00i_ I>zopr03d&VivR!s literal 0 HcmV?d00001 diff --git a/graphics/items/icons/shuca_berry.png b/graphics/items/icons/shuca_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..cc99671876d928848bea243aef7f464857717cd4 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQyqVM}ybfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0+=6D^#MF>&;D zOj4estMTX&)8wQOuHxn*30Bv+Ax5vw$5WbBv=n7d771vy?BYH%lcRL0 nMF(&BrxF(F7m|)D@k#6qJ9V^NUX+}20Xg2&)z4*}Q$iB}hU2W0JSK%m1b9pN@h!B|(0{3=Yq3qyafMJzX3_D(2K)*xz-?L4fVU8|jp% zdz`J!8-3^A6xd)aY4CT|_2n18Et<5&ZQ|8)P6eOYo(JEP_#e_9e3swt#?Nbo_xK*) zsa-Rt+=2I9lJQGlMcFMco|U?A{N$aVB%0|F>gy;rEt+9zh=Zfqb#De1d+nI^wO9ER zSnFkk)lM>Mv_GDb;Pdoi-z5PjMZS(1F)R;roFm0FvilRZt|&?CTID+NeTmMJdzV+s z7e=~o+x?yW{13D2 X<#w9hDp{FT0SXOIS3j3^P6`jF*AdfN0+uh~=Qua?rL7b8xzhDN3XE)M-oD@$N$B>FS$q5VW1Vls{HjDPol@(o( zvn(Mw`LTjV`$fqUhAl-`8gi12SL{k!(6c$3xh0rsih*HkQCIK8lx0%Z*0Y!RHAu}( zN}9xGJgYb}D{Ga?8CK)zZC-v2yVIZfu*?<$I;~LTk&v87706wlu6{1-oD!M?FJ=F96vQbB@(X5gcy=QV$l2xT;uumf zCpqB&zXU5Q>w_Fc;b2!r3F|X^_qYfins|YwXwKvVK|Q_>ew~Fv4V zyxm>?FJ=F96vQbB@(X5gcy=QV$cguKaSW-Llbo=?EI~vhAt0!!s3msJjGkW6137BK z;^L{v$;uMPZ%T9~_dJ+krCb=)Lae474oOSO31ca4s+t+O old0$Mk~qF%-j4Po%UBo~Hk=TMX?wp@0caJ2r>mdKI;Vst0E7)*Q~&?~ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/tanga_berry.png b/graphics/items/icons/tanga_berry.png new file mode 100755 index 0000000000000000000000000000000000000000..37f8e2465647f01a9a0419795c50ebef6ef45551 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuQyc$%3u_fkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0e#Kc;qZxd;<>`_ycn`>+>bM%1B zbfNyfKE80x37Lo9={fjySBrKiKYI7*(#405^7yXBzhPo}*Cx=%*&)pHjAJ_U(mB1| z+z0t0rsU=1?FJ=F96vQbB@(X5gcy=QV$eHQs;uumfr*(oYU$X&E>tyL8OYEy7b~PPk zoG^)5!NoXyQAyvGW7Yom9xT}+J@4M~=jk`alD0ei-C}aqK4IgMAf{JL?F+@7p4(+U zmrG#2ec33@B5=#~r}G~EnKdu3>IvgzF|5ZoxGvDF2XVX9?zXn!wbES zry6QHPn4Z&@{8e3hD(mdl&O=$1ooM)b3gP?f7>sHb3xLjmM<);L4NXd^>bP0l+XkK D?5Bs! literal 0 HcmV?d00001 diff --git a/graphics/items/icons/water_memory.png b/graphics/items/icons/water_memory.png new file mode 100755 index 0000000000000000000000000000000000000000..d7096f57cc1b3a5e23ca67229f934183d5a0bbc5 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOnmI7x{beQ0)@m& zTq8FS z$q5JeC0JQmALJ+sUw6^y4_tF&@nKWJLxMrfg@+CV^-OMT6nis;F;{qy9H*emKQQGT)plxQ{v}TO`snbJYD@<);T3K F0RS&2s*L~u literal 0 HcmV?d00001 diff --git a/graphics/items/icons/wave_incense.png b/graphics/items/icons/wave_incense.png new file mode 100755 index 0000000000000000000000000000000000000000..aec3fd05efd0cb8fd4a25429af26f80b1100e4f2 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuWVlKMjKJ0ENU$ zTq8GQRtyk#Mc_P8 zkTJ>I-R1vM_D@GaoRT2FU>wJ&)n?eo?Q)b`1md zB0d4tSNFnP)`&LeAK2-6DM*cN-@z*X^HrNBKjFW0HavajjkUXUTK=Vo+QwbccZ?VI zy(%NSaMmlia~Gf7V%!mP;B z=bW7vPI=fCE$!32V$G%wqmai=Hi@^{G{1i~zEF{{PdE3#WgYtiR&}4)YRnWWuQ=CD P2Kms_)z4*}Q$iB}Yb%Xq literal 0 HcmV?d00001 diff --git a/graphics/items/icons/weakness_policy.png b/graphics/items/icons/weakness_policy.png new file mode 100755 index 0000000000000000000000000000000000000000..d8f0b45531de71a01ce8ead3c4921103ed38dbda GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuWY8j=kS61BJv( zTq8mMHS^BH+j1HxvX2#3ubV5b|VeQneXZ17*a7OIpF|950i(CqH9W@qL90U z=gb9NN^_29ELp-5uD(cW$r7f?LQF+d7Rb1%t11+<6dak;n3HPWF{Pq=uAVnk@_uI`PUx3?HE8Z5WDeAL)h_|Qq6^*-#6Oa$5ujrVTavuRI`(vcT0 zXTE%T`Lcprx3Bl?I5XZ;iD!IfPn$NA<8xy~+AM`b{7p?W9yT#CNS%G|m0G|-o28REJhKA3#_7n#>Elt+^|NsBiW7p12NxpXPd2w|MNH;1_ zk}YroiZCX5ySw~f%Kqsnh*J{e7tG-B>_!@p)8^^o7*a7OIYB|pfXjf3i_5{%smo1k zVW)uH;-H-s6SFfES{?`G#l4e~;+iN_sLx&~bWq0m^QTD{0y?Y~Z2FX>pzgzPrcmFU zwdlYs3E!9==ZAAr9*420>*|UgoH=cpAeV82qYm$p?uHx6GuhaL72h=$EOjnz literal 0 HcmV?d00001 diff --git a/graphics/items/icons/x_special_defense.png b/graphics/items/icons/x_special_defense.png new file mode 100755 index 0000000000000000000000000000000000000000..54a3e00fdfc4a7552ac0baeed26766786478932d GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuR;BBLANS%G|m0G|-o28RC*ZEadwTJ>#hJB}T@ef#$Q+qYvjZ1C&tm5GU&a_kt$ z03?tmeA*w#WlZvRclp1R{nJqprzFTPn8D%MjWi%Bdc6y4A^f4@(NeQUQycIC8pw zZQAnmvb46EgJtB?N1{Rj=T<#!og`|^azLi@Q<3AsKF@$~E-o%Fr%*!!4K6Ofpq9$E eV9&_`D-3`E&82T6a9kl2NS%G|m0G|-o28RCz1_lZ@0xVWUXhaxDG^|iqaG>JG1BU}Q4t)3l(v1ov zs<^KJMHrL3-Ch1KW&d;(#3>2#3ubV5b|VeQS>);B7*a8(^}=c1Lk2u-57L_1Tpn`y z1Z?FFP+Jl5{G6hFWP?@gg0E~Bau<5GR5={l?q7GJY}#MWsp~gre&zaV`JZ*|cHh#@ zOKh>h^ZODf&A(B0eO1hc@5c5kw5J;#z5Hj(v1co@DjWp@EFRwL%yj1NKESD3!NAG> z?qE;Hq2BUm^B$QTVpkU8NjR&!Zl|%5OJ=5PUe8-a*4uUd!BOkuCp_Xkvsza-B)_p2 O>ai z6v#<%@Z0zQS0INm$=luK|5El(M?svDAirP+hi5m^fSh(u7srr_ImrnMVg_6WTwGiZ zmQG!6S_?Y`h2%Q~loCIIoLc@O{q literal 0 HcmV?d00001 diff --git a/graphics/items/icons/yellow_nectar.png b/graphics/items/icons/yellow_nectar.png new file mode 100755 index 0000000000000000000000000000000000000000..fff8ae6977c5533c2c9cce09d1d608990bf6a6f6 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xOOuR-i=UwEbfI{LW zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0^Zw4CnraR;VFl-wx*``A(ft(m?;Z`dRDo4c^z{M=qui^v2X?Fl*uVlQdum| zB`jyIn&D`XBM!@>b~bGpSjA@)6`U8Cdj~`^HcShU{>QApz9bs MUHx3vIVCg!08gle*Z=?k literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 3966952f3..5da1aaebd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4171,7 +4171,215 @@ extern const u32 gItemIcon_PsychicSeed[]; extern const u32 gItemIconPalette_PsychicSeed[]; extern const u32 gItemIcon_AdrenalineOrb[]; extern const u32 gItemIconPalette_AdrenalineOrb[]; - +// Unordered +extern const u32 gItemIcon_SweetHeart[]; +extern const u32 gItemIconPalette_SweetHeart[]; +extern const u32 gItemIcon_BigMalasada[]; +extern const u32 gItemIconPalette_BigMalasada[]; +extern const u32 gItemIcon_OldGateau[]; +extern const u32 gItemIconPalette_OldGateau[]; +extern const u32 gItemIcon_XSpecialDefense[]; +extern const u32 gItemIconPalette_XSpecialDefense[]; +extern const u32 gItemIcon_AbilityCapsule[]; +extern const u32 gItemIconPalette_AbilityCapsule[]; +extern const u32 gItemIcon_DawnStone[]; +extern const u32 gItemIconPalette_DawnStone[]; +extern const u32 gItemIcon_DuskStone[]; +extern const u32 gItemIconPalette_DuskStone[]; +extern const u32 gItemIcon_ShinyStone[]; +extern const u32 gItemIconPalette_ShinyStone[]; +extern const u32 gItemIcon_IceStone[]; +extern const u32 gItemIconPalette_IceStone[]; +extern const u32 gItemIcon_RedApricorn[]; +extern const u32 gItemIconPalette_RedApricorn[]; +extern const u32 gItemIcon_BlueApricorn[]; +extern const u32 gItemIconPalette_BlueApricorn[]; +extern const u32 gItemIcon_YellowApricorn[]; +extern const u32 gItemIconPalette_YellowApricorn[]; +extern const u32 gItemIcon_GreenApricorn[]; +extern const u32 gItemIconPalette_GreenApricorn[]; +extern const u32 gItemIcon_PinkApricorn[]; +extern const u32 gItemIconPalette_PinkApricorn[]; +extern const u32 gItemIcon_WhiteApricorn[]; +extern const u32 gItemIconPalette_WhiteApricorn[]; +extern const u32 gItemIcon_BlackApricorn[]; +extern const u32 gItemIconPalette_BlackApricorn[]; +extern const u32 gItemIcon_RedNectar[]; +extern const u32 gItemIconPalette_RedNectar[]; +extern const u32 gItemIcon_YellowNectar[]; +extern const u32 gItemIconPalette_YellowNectar[]; +extern const u32 gItemIcon_PinkNectar[]; +extern const u32 gItemIconPalette_PinkNectar[]; +extern const u32 gItemIcon_PurpleNectar[]; +extern const u32 gItemIconPalette_PurpleNectar[]; +extern const u32 gItemIcon_RareBone[]; +extern const u32 gItemIconPalette_RareBone[]; +extern const u32 gItemIcon_OccaBerry[]; +extern const u32 gItemIconPalette_OccaBerry[]; +extern const u32 gItemIcon_PasshoBerry[]; +extern const u32 gItemIconPalette_PasshoBerry[]; +extern const u32 gItemIcon_WacanBerry[]; +extern const u32 gItemIconPalette_WacanBerry[]; +extern const u32 gItemIcon_RindoBerry[]; +extern const u32 gItemIconPalette_RindoBerry[]; +extern const u32 gItemIcon_YacheBerry[]; +extern const u32 gItemIconPalette_YacheBerry[]; +extern const u32 gItemIcon_ChopleBerry[]; +extern const u32 gItemIconPalette_ChopleBerry[]; +extern const u32 gItemIcon_KebiaBerry[]; +extern const u32 gItemIconPalette_KebiaBerry[]; +extern const u32 gItemIcon_ShucaBerry[]; +extern const u32 gItemIconPalette_ShucaBerry[]; +extern const u32 gItemIcon_CobaBerry[]; +extern const u32 gItemIconPalette_CobaBerry[]; +extern const u32 gItemIcon_PayapaBerry[]; +extern const u32 gItemIconPalette_PayapaBerry[]; +extern const u32 gItemIcon_TangaBerry[]; +extern const u32 gItemIconPalette_TangaBerry[]; +extern const u32 gItemIcon_ChartiBerry[]; +extern const u32 gItemIconPalette_ChartiBerry[]; +extern const u32 gItemIcon_KasibBerry[]; +extern const u32 gItemIconPalette_KasibBerry[]; +extern const u32 gItemIcon_HabanBerry[]; +extern const u32 gItemIconPalette_HabanBerry[]; +extern const u32 gItemIcon_ColburBerry[]; +extern const u32 gItemIconPalette_ColburBerry[]; +extern const u32 gItemIcon_BabiriBerry[]; +extern const u32 gItemIconPalette_BabiriBerry[]; +extern const u32 gItemIcon_ChilanBerry[]; +extern const u32 gItemIconPalette_ChilanBerry[]; +extern const u32 gItemIcon_MicleBerry[]; +extern const u32 gItemIconPalette_MicleBerry[]; +extern const u32 gItemIcon_CustapBerry[]; +extern const u32 gItemIconPalette_CustapBerry[]; +extern const u32 gItemIcon_JabocaBerry[]; +extern const u32 gItemIconPalette_JabocaBerry[]; +extern const u32 gItemIcon_RowapBerry[]; +extern const u32 gItemIconPalette_RowapBerry[]; +extern const u32 gItemIcon_RoseliBerry[]; +extern const u32 gItemIconPalette_RoseliBerry[]; +extern const u32 gItemIcon_KeeBerry[]; +extern const u32 gItemIconPalette_KeeBerry[]; +extern const u32 gItemIcon_MarangaBerry[]; +extern const u32 gItemIconPalette_MarangaBerry[]; +extern const u32 gItemIcon_OvalStone[]; +extern const u32 gItemIconPalette_OvalStone[]; +extern const u32 gItemIcon_Protector[]; +extern const u32 gItemIconPalette_Protector[]; +extern const u32 gItemIcon_Electirizer[]; +extern const u32 gItemIconPalette_Electirizer[]; +extern const u32 gItemIcon_Magmarizer[]; +extern const u32 gItemIconPalette_Magmarizer[]; +extern const u32 gItemIcon_DubiousDisc[]; +extern const u32 gItemIconPalette_DubiousDisc[]; +extern const u32 gItemIcon_ReaperCloth[]; +extern const u32 gItemIconPalette_ReaperCloth[]; +extern const u32 gItemIcon_RazorClaw[]; +extern const u32 gItemIconPalette_RazorClaw[]; +extern const u32 gItemIcon_RazorFang[]; +extern const u32 gItemIconPalette_RazorFang[]; +extern const u32 gItemIcon_PrismScale[]; +extern const u32 gItemIconPalette_PrismScale[]; +extern const u32 gItemIcon_WhippedDream[]; +extern const u32 gItemIconPalette_WhippedDream[]; +extern const u32 gItemIcon_Sachet[]; +extern const u32 gItemIconPalette_Sachet[]; +extern const u32 gItemIcon_PowerBracer[]; +extern const u32 gItemIconPalette_PowerBracer[]; +extern const u32 gItemIcon_PowerBelt[]; +extern const u32 gItemIconPalette_PowerBelt[]; +extern const u32 gItemIcon_PowerLens[]; +extern const u32 gItemIconPalette_PowerLens[]; +extern const u32 gItemIcon_PowerBand[]; +extern const u32 gItemIconPalette_PowerBand[]; +extern const u32 gItemIcon_PowerAnklet[]; +extern const u32 gItemIconPalette_PowerAnklet[]; +extern const u32 gItemIcon_PowerWeight[]; +extern const u32 gItemIconPalette_PowerWeight[]; +extern const u32 gItemIcon_RockyHelmet[]; +extern const u32 gItemIconPalette_RockyHelmet[]; +extern const u32 gItemIcon_AirBalloon[]; +extern const u32 gItemIconPalette_AirBalloon[]; +extern const u32 gItemIcon_RedCard[]; +extern const u32 gItemIconPalette_RedCard[]; +extern const u32 gItemIcon_RingTarget[]; +extern const u32 gItemIconPalette_RingTarget[]; +extern const u32 gItemIcon_EjectButton[]; +extern const u32 gItemIconPalette_EjectButton[]; +extern const u32 gItemIcon_AbsorbBulb[]; +extern const u32 gItemIconPalette_AbsorbBulb[]; +extern const u32 gItemIcon_CellBattery[]; +extern const u32 gItemIconPalette_CellBattery[]; +extern const u32 gItemIcon_LuminousMoss[]; +extern const u32 gItemIconPalette_LuminousMoss[]; +extern const u32 gItemIcon_Snowball[]; +extern const u32 gItemIconPalette_Snowball[]; +extern const u32 gItemIcon_WeaknessPolicy[]; +extern const u32 gItemIconPalette_WeaknessPolicy[]; +extern const u32 gItemIcon_OddIncense[]; +extern const u32 gItemIconPalette_OddIncense[]; +extern const u32 gItemIcon_RockIncense[]; +extern const u32 gItemIconPalette_RockIncense[]; +extern const u32 gItemIcon_FullIncense[]; +extern const u32 gItemIconPalette_FullIncense[]; +extern const u32 gItemIcon_WaveIncense[]; +extern const u32 gItemIconPalette_WaveIncense[]; +extern const u32 gItemIcon_RoseIncense[]; +extern const u32 gItemIconPalette_RoseIncense[]; +extern const u32 gItemIcon_LuckIncense[]; +extern const u32 gItemIconPalette_LuckIncense[]; +extern const u32 gItemIcon_PureIncense[]; +extern const u32 gItemIconPalette_PureIncense[]; +extern const u32 gItemIcon_OddKeystone[]; +extern const u32 gItemIconPalette_OddKeystone[]; +extern const u32 gItemIcon_Gracidea[]; +extern const u32 gItemIconPalette_Gracidea[]; +extern const u32 gItemIcon_BugMemory[]; +extern const u32 gItemIconPalette_BugMemory[]; +extern const u32 gItemIcon_DarkMemory[]; +extern const u32 gItemIconPalette_DarkMemory[]; +extern const u32 gItemIcon_DragonMemory[]; +extern const u32 gItemIconPalette_DragonMemory[]; +extern const u32 gItemIcon_ElectricMemory[]; +extern const u32 gItemIconPalette_ElectricMemory[]; +extern const u32 gItemIcon_FairyMemory[]; +extern const u32 gItemIconPalette_FairyMemory[]; +extern const u32 gItemIcon_FightingMemory[]; +extern const u32 gItemIconPalette_FightingMemory[]; +extern const u32 gItemIcon_FireMemory[]; +extern const u32 gItemIconPalette_FireMemory[]; +extern const u32 gItemIcon_FlyingMemory[]; +extern const u32 gItemIconPalette_FlyingMemory[]; +extern const u32 gItemIcon_GhostMemory[]; +extern const u32 gItemIconPalette_GhostMemory[]; +extern const u32 gItemIcon_GrassMemory[]; +extern const u32 gItemIconPalette_GrassMemory[]; +extern const u32 gItemIcon_GroundMemory[]; +extern const u32 gItemIconPalette_GroundMemory[]; +extern const u32 gItemIcon_IceMemory[]; +extern const u32 gItemIconPalette_IceMemory[]; +extern const u32 gItemIcon_PoisonMemory[]; +extern const u32 gItemIconPalette_PoisonMemory[]; +extern const u32 gItemIcon_PsychicMemory[]; +extern const u32 gItemIconPalette_PsychicMemory[]; +extern const u32 gItemIcon_RockMemory[]; +extern const u32 gItemIconPalette_RockMemory[]; +extern const u32 gItemIcon_SteelMemory[]; +extern const u32 gItemIconPalette_SteelMemory[]; +extern const u32 gItemIcon_WaterMemory[]; +extern const u32 gItemIconPalette_WaterMemory[]; +extern const u32 gItemIcon_ArmorFossil[]; +extern const u32 gItemIconPalette_ArmorFossil[]; +extern const u32 gItemIcon_SkullFossil[]; +extern const u32 gItemIconPalette_SkullFossil[]; +extern const u32 gItemIcon_CoverFossil[]; +extern const u32 gItemIconPalette_CoverFossil[]; +extern const u32 gItemIcon_PlumeFossil[]; +extern const u32 gItemIconPalette_PlumeFossil[]; +extern const u32 gItemIcon_JawFossil[]; +extern const u32 gItemIconPalette_JawFossil[]; +extern const u32 gItemIcon_SailFossil[]; +extern const u32 gItemIconPalette_SailFossil[]; extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 4285fcf36..61c9a4e7d 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -1179,3 +1179,317 @@ const u32 gItemIconPalette_PsychicSeed[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_AdrenalineOrb[] = INCBIN_U32("graphics/items/icons/adrenaline_orb.4bpp.lz"); const u32 gItemIconPalette_AdrenalineOrb[] = INCBIN_U32("graphics/items/icon_palettes/adrenaline_orb.gbapal.lz"); + +// Unordered + +const u32 gItemIcon_SweetHeart[] = INCBIN_U32("graphics/items/icons/sweet_heart.4bpp.lz"); +const u32 gItemIconPalette_SweetHeart[] = INCBIN_U32("graphics/items/icon_palettes/sweet_heart.gbapal.lz"); + +const u32 gItemIcon_BigMalasada[] = INCBIN_U32("graphics/items/icons/big_malasada.4bpp.lz"); +const u32 gItemIconPalette_BigMalasada[] = INCBIN_U32("graphics/items/icon_palettes/big_malasada.gbapal.lz"); + +const u32 gItemIcon_OldGateau[] = INCBIN_U32("graphics/items/icons/old_gateau.4bpp.lz"); +const u32 gItemIconPalette_OldGateau[] = INCBIN_U32("graphics/items/icon_palettes/old_gateau.gbapal.lz"); + +const u32 gItemIcon_XSpecialDefense[] = INCBIN_U32("graphics/items/icons/x_special_defense.4bpp.lz"); +const u32 gItemIconPalette_XSpecialDefense[] = INCBIN_U32("graphics/items/icon_palettes/x_special_defense.gbapal.lz"); + +const u32 gItemIcon_AbilityCapsule[] = INCBIN_U32("graphics/items/icons/ability_capsule.4bpp.lz"); +const u32 gItemIconPalette_AbilityCapsule[] = INCBIN_U32("graphics/items/icon_palettes/ability_capsule.gbapal.lz"); + +const u32 gItemIcon_DawnStone[] = INCBIN_U32("graphics/items/icons/dawn_stone.4bpp.lz"); +const u32 gItemIconPalette_DawnStone[] = INCBIN_U32("graphics/items/icon_palettes/dawn_stone.gbapal.lz"); + +const u32 gItemIcon_DuskStone[] = INCBIN_U32("graphics/items/icons/dusk_stone.4bpp.lz"); +const u32 gItemIconPalette_DuskStone[] = INCBIN_U32("graphics/items/icon_palettes/dusk_stone.gbapal.lz"); + +const u32 gItemIcon_ShinyStone[] = INCBIN_U32("graphics/items/icons/shiny_stone.4bpp.lz"); +const u32 gItemIconPalette_ShinyStone[] = INCBIN_U32("graphics/items/icon_palettes/shiny_stone.gbapal.lz"); + +const u32 gItemIcon_IceStone[] = INCBIN_U32("graphics/items/icons/ice_stone.4bpp.lz"); +const u32 gItemIconPalette_IceStone[] = INCBIN_U32("graphics/items/icon_palettes/ice_stone.gbapal.lz"); + +const u32 gItemIcon_RedApricorn[] = INCBIN_U32("graphics/items/icons/red_apricorn.4bpp.lz"); +const u32 gItemIconPalette_RedApricorn[] = INCBIN_U32("graphics/items/icon_palettes/red_apricorn.gbapal.lz"); + +const u32 gItemIcon_BlueApricorn[] = INCBIN_U32("graphics/items/icons/blue_apricorn.4bpp.lz"); +const u32 gItemIconPalette_BlueApricorn[] = INCBIN_U32("graphics/items/icon_palettes/blue_apricorn.gbapal.lz"); + +const u32 gItemIcon_YellowApricorn[] = INCBIN_U32("graphics/items/icons/yellow_apricorn.4bpp.lz"); +const u32 gItemIconPalette_YellowApricorn[] = INCBIN_U32("graphics/items/icon_palettes/yellow_apricorn.gbapal.lz"); + +const u32 gItemIcon_GreenApricorn[] = INCBIN_U32("graphics/items/icons/green_apricorn.4bpp.lz"); +const u32 gItemIconPalette_GreenApricorn[] = INCBIN_U32("graphics/items/icon_palettes/green_apricorn.gbapal.lz"); + +const u32 gItemIcon_PinkApricorn[] = INCBIN_U32("graphics/items/icons/pink_apricorn.4bpp.lz"); +const u32 gItemIconPalette_PinkApricorn[] = INCBIN_U32("graphics/items/icon_palettes/pink_apricorn.gbapal.lz"); + +const u32 gItemIcon_WhiteApricorn[] = INCBIN_U32("graphics/items/icons/white_apricorn.4bpp.lz"); +const u32 gItemIconPalette_WhiteApricorn[] = INCBIN_U32("graphics/items/icon_palettes/white_apricorn.gbapal.lz"); + +const u32 gItemIcon_BlackApricorn[] = INCBIN_U32("graphics/items/icons/black_apricorn.4bpp.lz"); +const u32 gItemIconPalette_BlackApricorn[] = INCBIN_U32("graphics/items/icon_palettes/black_apricorn.gbapal.lz"); + +const u32 gItemIcon_RedNectar[] = INCBIN_U32("graphics/items/icons/red_nectar.4bpp.lz"); +const u32 gItemIconPalette_RedNectar[] = INCBIN_U32("graphics/items/icon_palettes/red_nectar.gbapal.lz"); + +const u32 gItemIcon_YellowNectar[] = INCBIN_U32("graphics/items/icons/yellow_nectar.4bpp.lz"); +const u32 gItemIconPalette_YellowNectar[] = INCBIN_U32("graphics/items/icon_palettes/yellow_nectar.gbapal.lz"); + +const u32 gItemIcon_PinkNectar[] = INCBIN_U32("graphics/items/icons/pink_nectar.4bpp.lz"); +const u32 gItemIconPalette_PinkNectar[] = INCBIN_U32("graphics/items/icon_palettes/pink_nectar.gbapal.lz"); + +const u32 gItemIcon_PurpleNectar[] = INCBIN_U32("graphics/items/icons/purple_nectar.4bpp.lz"); +const u32 gItemIconPalette_PurpleNectar[] = INCBIN_U32("graphics/items/icon_palettes/purple_nectar.gbapal.lz"); + +const u32 gItemIcon_RareBone[] = INCBIN_U32("graphics/items/icons/rare_bone.4bpp.lz"); +const u32 gItemIconPalette_RareBone[] = INCBIN_U32("graphics/items/icon_palettes/rare_bone.gbapal.lz"); + +const u32 gItemIcon_OccaBerry[] = INCBIN_U32("graphics/items/icons/occa_berry.4bpp.lz"); +const u32 gItemIconPalette_OccaBerry[] = INCBIN_U32("graphics/items/icon_palettes/occa_berry.gbapal.lz"); + +const u32 gItemIcon_PasshoBerry[] = INCBIN_U32("graphics/items/icons/passho_berry.4bpp.lz"); +const u32 gItemIconPalette_PasshoBerry[] = INCBIN_U32("graphics/items/icon_palettes/passho_berry.gbapal.lz"); + +const u32 gItemIcon_WacanBerry[] = INCBIN_U32("graphics/items/icons/wacan_berry.4bpp.lz"); +const u32 gItemIconPalette_WacanBerry[] = INCBIN_U32("graphics/items/icon_palettes/wacan_berry.gbapal.lz"); + +const u32 gItemIcon_RindoBerry[] = INCBIN_U32("graphics/items/icons/rindo_berry.4bpp.lz"); +const u32 gItemIconPalette_RindoBerry[] = INCBIN_U32("graphics/items/icon_palettes/rindo_berry.gbapal.lz"); + +const u32 gItemIcon_YacheBerry[] = INCBIN_U32("graphics/items/icons/yache_berry.4bpp.lz"); +const u32 gItemIconPalette_YacheBerry[] = INCBIN_U32("graphics/items/icon_palettes/yache_berry.gbapal.lz"); + +const u32 gItemIcon_ChopleBerry[] = INCBIN_U32("graphics/items/icons/chople_berry.4bpp.lz"); +const u32 gItemIconPalette_ChopleBerry[] = INCBIN_U32("graphics/items/icon_palettes/chople_berry.gbapal.lz"); + +const u32 gItemIcon_KebiaBerry[] = INCBIN_U32("graphics/items/icons/kebia_berry.4bpp.lz"); +const u32 gItemIconPalette_KebiaBerry[] = INCBIN_U32("graphics/items/icon_palettes/kebia_berry.gbapal.lz"); + +const u32 gItemIcon_ShucaBerry[] = INCBIN_U32("graphics/items/icons/shuca_berry.4bpp.lz"); +const u32 gItemIconPalette_ShucaBerry[] = INCBIN_U32("graphics/items/icon_palettes/shuca_berry.gbapal.lz"); + +const u32 gItemIcon_CobaBerry[] = INCBIN_U32("graphics/items/icons/coba_berry.4bpp.lz"); +const u32 gItemIconPalette_CobaBerry[] = INCBIN_U32("graphics/items/icon_palettes/coba_berry.gbapal.lz"); + +const u32 gItemIcon_PayapaBerry[] = INCBIN_U32("graphics/items/icons/payapa_berry.4bpp.lz"); +const u32 gItemIconPalette_PayapaBerry[] = INCBIN_U32("graphics/items/icon_palettes/payapa_berry.gbapal.lz"); + +const u32 gItemIcon_TangaBerry[] = INCBIN_U32("graphics/items/icons/tanga_berry.4bpp.lz"); +const u32 gItemIconPalette_TangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/tanga_berry.gbapal.lz"); + +const u32 gItemIcon_ChartiBerry[] = INCBIN_U32("graphics/items/icons/charti_berry.4bpp.lz"); +const u32 gItemIconPalette_ChartiBerry[] = INCBIN_U32("graphics/items/icon_palettes/charti_berry.gbapal.lz"); + +const u32 gItemIcon_KasibBerry[] = INCBIN_U32("graphics/items/icons/kasib_berry.4bpp.lz"); +const u32 gItemIconPalette_KasibBerry[] = INCBIN_U32("graphics/items/icon_palettes/kasib_berry.gbapal.lz"); + +const u32 gItemIcon_HabanBerry[] = INCBIN_U32("graphics/items/icons/haban_berry.4bpp.lz"); +const u32 gItemIconPalette_HabanBerry[] = INCBIN_U32("graphics/items/icon_palettes/haban_berry.gbapal.lz"); + +const u32 gItemIcon_ColburBerry[] = INCBIN_U32("graphics/items/icons/colbur_berry.4bpp.lz"); +const u32 gItemIconPalette_ColburBerry[] = INCBIN_U32("graphics/items/icon_palettes/colbur_berry.gbapal.lz"); + +const u32 gItemIcon_BabiriBerry[] = INCBIN_U32("graphics/items/icons/babiri_berry.4bpp.lz"); +const u32 gItemIconPalette_BabiriBerry[] = INCBIN_U32("graphics/items/icon_palettes/babiri_berry.gbapal.lz"); + +const u32 gItemIcon_ChilanBerry[] = INCBIN_U32("graphics/items/icons/chilan_berry.4bpp.lz"); +const u32 gItemIconPalette_ChilanBerry[] = INCBIN_U32("graphics/items/icon_palettes/chilan_berry.gbapal.lz"); + +const u32 gItemIcon_MicleBerry[] = INCBIN_U32("graphics/items/icons/micle_berry.4bpp.lz"); +const u32 gItemIconPalette_MicleBerry[] = INCBIN_U32("graphics/items/icon_palettes/micle_berry.gbapal.lz"); + +const u32 gItemIcon_CustapBerry[] = INCBIN_U32("graphics/items/icons/custap_berry.4bpp.lz"); +const u32 gItemIconPalette_CustapBerry[] = INCBIN_U32("graphics/items/icon_palettes/custap_berry.gbapal.lz"); + +const u32 gItemIcon_JabocaBerry[] = INCBIN_U32("graphics/items/icons/jaboca_berry.4bpp.lz"); +const u32 gItemIconPalette_JabocaBerry[] = INCBIN_U32("graphics/items/icon_palettes/jaboca_berry.gbapal.lz"); + +const u32 gItemIcon_RowapBerry[] = INCBIN_U32("graphics/items/icons/rowap_berry.4bpp.lz"); +const u32 gItemIconPalette_RowapBerry[] = INCBIN_U32("graphics/items/icon_palettes/rowap_berry.gbapal.lz"); + +const u32 gItemIcon_RoseliBerry[] = INCBIN_U32("graphics/items/icons/roseli_berry.4bpp.lz"); +const u32 gItemIconPalette_RoseliBerry[] = INCBIN_U32("graphics/items/icon_palettes/roseli_berry.gbapal.lz"); + +const u32 gItemIcon_KeeBerry[] = INCBIN_U32("graphics/items/icons/kee_berry.4bpp.lz"); +const u32 gItemIconPalette_KeeBerry[] = INCBIN_U32("graphics/items/icon_palettes/kee_berry.gbapal.lz"); + +const u32 gItemIcon_MarangaBerry[] = INCBIN_U32("graphics/items/icons/maranga_berry.4bpp.lz"); +const u32 gItemIconPalette_MarangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/maranga_berry.gbapal.lz"); + +const u32 gItemIcon_OvalStone[] = INCBIN_U32("graphics/items/icons/oval_stone.4bpp.lz"); +const u32 gItemIconPalette_OvalStone[] = INCBIN_U32("graphics/items/icon_palettes/oval_stone.gbapal.lz"); + +const u32 gItemIcon_Protector[] = INCBIN_U32("graphics/items/icons/protector.4bpp.lz"); +const u32 gItemIconPalette_Protector[] = INCBIN_U32("graphics/items/icon_palettes/protector.gbapal.lz"); + +const u32 gItemIcon_Electirizer[] = INCBIN_U32("graphics/items/icons/electirizer.4bpp.lz"); +const u32 gItemIconPalette_Electirizer[] = INCBIN_U32("graphics/items/icon_palettes/electirizer.gbapal.lz"); + +const u32 gItemIcon_Magmarizer[] = INCBIN_U32("graphics/items/icons/magmarizer.4bpp.lz"); +const u32 gItemIconPalette_Magmarizer[] = INCBIN_U32("graphics/items/icon_palettes/magmarizer.gbapal.lz"); + +const u32 gItemIcon_DubiousDisc[] = INCBIN_U32("graphics/items/icons/dubious_disc.4bpp.lz"); +const u32 gItemIconPalette_DubiousDisc[] = INCBIN_U32("graphics/items/icon_palettes/dubious_disc.gbapal.lz"); + +const u32 gItemIcon_ReaperCloth[] = INCBIN_U32("graphics/items/icons/reaper_cloth.4bpp.lz"); +const u32 gItemIconPalette_ReaperCloth[] = INCBIN_U32("graphics/items/icon_palettes/reaper_cloth.gbapal.lz"); + +const u32 gItemIcon_RazorClaw[] = INCBIN_U32("graphics/items/icons/razor_claw.4bpp.lz"); +const u32 gItemIconPalette_RazorClaw[] = INCBIN_U32("graphics/items/icon_palettes/razor_claw.gbapal.lz"); + +const u32 gItemIcon_RazorFang[] = INCBIN_U32("graphics/items/icons/razor_fang.4bpp.lz"); +const u32 gItemIconPalette_RazorFang[] = INCBIN_U32("graphics/items/icon_palettes/razor_fang.gbapal.lz"); + +const u32 gItemIcon_PrismScale[] = INCBIN_U32("graphics/items/icons/prism_scale.4bpp.lz"); +const u32 gItemIconPalette_PrismScale[] = INCBIN_U32("graphics/items/icon_palettes/prism_scale.gbapal.lz"); + +const u32 gItemIcon_WhippedDream[] = INCBIN_U32("graphics/items/icons/whipped_dream.4bpp.lz"); +const u32 gItemIconPalette_WhippedDream[] = INCBIN_U32("graphics/items/icon_palettes/whipped_dream.gbapal.lz"); + +const u32 gItemIcon_Sachet[] = INCBIN_U32("graphics/items/icons/sachet.4bpp.lz"); +const u32 gItemIconPalette_Sachet[] = INCBIN_U32("graphics/items/icon_palettes/sachet.gbapal.lz"); + +const u32 gItemIcon_PowerBracer[] = INCBIN_U32("graphics/items/icons/power_bracer.4bpp.lz"); +const u32 gItemIconPalette_PowerBracer[] = INCBIN_U32("graphics/items/icon_palettes/power_bracer.gbapal.lz"); + +const u32 gItemIcon_PowerBelt[] = INCBIN_U32("graphics/items/icons/power_belt.4bpp.lz"); +const u32 gItemIconPalette_PowerBelt[] = INCBIN_U32("graphics/items/icon_palettes/power_belt.gbapal.lz"); + +const u32 gItemIcon_PowerLens[] = INCBIN_U32("graphics/items/icons/power_lens.4bpp.lz"); +const u32 gItemIconPalette_PowerLens[] = INCBIN_U32("graphics/items/icon_palettes/power_lens.gbapal.lz"); + +const u32 gItemIcon_PowerBand[] = INCBIN_U32("graphics/items/icons/power_band.4bpp.lz"); +const u32 gItemIconPalette_PowerBand[] = INCBIN_U32("graphics/items/icon_palettes/power_band.gbapal.lz"); + +const u32 gItemIcon_PowerAnklet[] = INCBIN_U32("graphics/items/icons/power_anklet.4bpp.lz"); +const u32 gItemIconPalette_PowerAnklet[] = INCBIN_U32("graphics/items/icon_palettes/power_anklet.gbapal.lz"); + +const u32 gItemIcon_PowerWeight[] = INCBIN_U32("graphics/items/icons/power_weight.4bpp.lz"); +const u32 gItemIconPalette_PowerWeight[] = INCBIN_U32("graphics/items/icon_palettes/power_weight.gbapal.lz"); + +const u32 gItemIcon_RockyHelmet[] = INCBIN_U32("graphics/items/icons/rocky_helmet.4bpp.lz"); +const u32 gItemIconPalette_RockyHelmet[] = INCBIN_U32("graphics/items/icon_palettes/rocky_helmet.gbapal.lz"); + +const u32 gItemIcon_AirBalloon[] = INCBIN_U32("graphics/items/icons/air_balloon.4bpp.lz"); +const u32 gItemIconPalette_AirBalloon[] = INCBIN_U32("graphics/items/icon_palettes/air_balloon.gbapal.lz"); + +const u32 gItemIcon_RedCard[] = INCBIN_U32("graphics/items/icons/red_card.4bpp.lz"); +const u32 gItemIconPalette_RedCard[] = INCBIN_U32("graphics/items/icon_palettes/red_card.gbapal.lz"); + +const u32 gItemIcon_RingTarget[] = INCBIN_U32("graphics/items/icons/ring_target.4bpp.lz"); +const u32 gItemIconPalette_RingTarget[] = INCBIN_U32("graphics/items/icon_palettes/ring_target.gbapal.lz"); + +const u32 gItemIcon_EjectButton[] = INCBIN_U32("graphics/items/icons/eject_button.4bpp.lz"); +const u32 gItemIconPalette_EjectButton[] = INCBIN_U32("graphics/items/icon_palettes/eject_button.gbapal.lz"); + +const u32 gItemIcon_AbsorbBulb[] = INCBIN_U32("graphics/items/icons/absorb_bulb.4bpp.lz"); +const u32 gItemIconPalette_AbsorbBulb[] = INCBIN_U32("graphics/items/icon_palettes/absorb_bulb.gbapal.lz"); + +const u32 gItemIcon_CellBattery[] = INCBIN_U32("graphics/items/icons/cell_battery.4bpp.lz"); +const u32 gItemIconPalette_CellBattery[] = INCBIN_U32("graphics/items/icon_palettes/cell_battery.gbapal.lz"); + +const u32 gItemIcon_LuminousMoss[] = INCBIN_U32("graphics/items/icons/luminous_moss.4bpp.lz"); +const u32 gItemIconPalette_LuminousMoss[] = INCBIN_U32("graphics/items/icon_palettes/luminous_moss.gbapal.lz"); + +const u32 gItemIcon_Snowball[] = INCBIN_U32("graphics/items/icons/snowball.4bpp.lz"); +const u32 gItemIconPalette_Snowball[] = INCBIN_U32("graphics/items/icon_palettes/snowball.gbapal.lz"); + +const u32 gItemIcon_WeaknessPolicy[] = INCBIN_U32("graphics/items/icons/weakness_policy.4bpp.lz"); +const u32 gItemIconPalette_WeaknessPolicy[] = INCBIN_U32("graphics/items/icon_palettes/weakness_policy.gbapal.lz"); + +const u32 gItemIcon_OddIncense[] = INCBIN_U32("graphics/items/icons/odd_incense.4bpp.lz"); +const u32 gItemIconPalette_OddIncense[] = INCBIN_U32("graphics/items/icon_palettes/odd_incense.gbapal.lz"); + +const u32 gItemIcon_RockIncense[] = INCBIN_U32("graphics/items/icons/rock_incense.4bpp.lz"); +const u32 gItemIconPalette_RockIncense[] = INCBIN_U32("graphics/items/icon_palettes/rock_incense.gbapal.lz"); + +const u32 gItemIcon_FullIncense[] = INCBIN_U32("graphics/items/icons/full_incense.4bpp.lz"); +const u32 gItemIconPalette_FullIncense[] = INCBIN_U32("graphics/items/icon_palettes/full_incense.gbapal.lz"); + +const u32 gItemIcon_WaveIncense[] = INCBIN_U32("graphics/items/icons/wave_incense.4bpp.lz"); +const u32 gItemIconPalette_WaveIncense[] = INCBIN_U32("graphics/items/icon_palettes/wave_incense.gbapal.lz"); + +const u32 gItemIcon_RoseIncense[] = INCBIN_U32("graphics/items/icons/rose_incense.4bpp.lz"); +const u32 gItemIconPalette_RoseIncense[] = INCBIN_U32("graphics/items/icon_palettes/rose_incense.gbapal.lz"); + +const u32 gItemIcon_LuckIncense[] = INCBIN_U32("graphics/items/icons/luck_incense.4bpp.lz"); +const u32 gItemIconPalette_LuckIncense[] = INCBIN_U32("graphics/items/icon_palettes/luck_incense.gbapal.lz"); + +const u32 gItemIcon_PureIncense[] = INCBIN_U32("graphics/items/icons/pure_incense.4bpp.lz"); +const u32 gItemIconPalette_PureIncense[] = INCBIN_U32("graphics/items/icon_palettes/pure_incense.gbapal.lz"); + +const u32 gItemIcon_OddKeystone[] = INCBIN_U32("graphics/items/icons/odd_keystone.4bpp.lz"); +const u32 gItemIconPalette_OddKeystone[] = INCBIN_U32("graphics/items/icon_palettes/odd_keystone.gbapal.lz"); + +const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); +const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); + +const u32 gItemIcon_BugMemory[] = INCBIN_U32("graphics/items/icons/bug_memory.4bpp.lz"); +const u32 gItemIconPalette_BugMemory[] = INCBIN_U32("graphics/items/icon_palettes/bug_memory.gbapal.lz"); + +const u32 gItemIcon_DarkMemory[] = INCBIN_U32("graphics/items/icons/dark_memory.4bpp.lz"); +const u32 gItemIconPalette_DarkMemory[] = INCBIN_U32("graphics/items/icon_palettes/dark_memory.gbapal.lz"); + +const u32 gItemIcon_DragonMemory[] = INCBIN_U32("graphics/items/icons/dragon_memory.4bpp.lz"); +const u32 gItemIconPalette_DragonMemory[] = INCBIN_U32("graphics/items/icon_palettes/dragon_memory.gbapal.lz"); + +const u32 gItemIcon_ElectricMemory[] = INCBIN_U32("graphics/items/icons/electric_memory.4bpp.lz"); +const u32 gItemIconPalette_ElectricMemory[] = INCBIN_U32("graphics/items/icon_palettes/electric_memory.gbapal.lz"); + +const u32 gItemIcon_FairyMemory[] = INCBIN_U32("graphics/items/icons/fairy_memory.4bpp.lz"); +const u32 gItemIconPalette_FairyMemory[] = INCBIN_U32("graphics/items/icon_palettes/fairy_memory.gbapal.lz"); + +const u32 gItemIcon_FightingMemory[] = INCBIN_U32("graphics/items/icons/fighting_memory.4bpp.lz"); +const u32 gItemIconPalette_FightingMemory[] = INCBIN_U32("graphics/items/icon_palettes/fighting_memory.gbapal.lz"); + +const u32 gItemIcon_FireMemory[] = INCBIN_U32("graphics/items/icons/fire_memory.4bpp.lz"); +const u32 gItemIconPalette_FireMemory[] = INCBIN_U32("graphics/items/icon_palettes/fire_memory.gbapal.lz"); + +const u32 gItemIcon_FlyingMemory[] = INCBIN_U32("graphics/items/icons/flying_memory.4bpp.lz"); +const u32 gItemIconPalette_FlyingMemory[] = INCBIN_U32("graphics/items/icon_palettes/flying_memory.gbapal.lz"); + +const u32 gItemIcon_GhostMemory[] = INCBIN_U32("graphics/items/icons/ghost_memory.4bpp.lz"); +const u32 gItemIconPalette_GhostMemory[] = INCBIN_U32("graphics/items/icon_palettes/ghost_memory.gbapal.lz"); + +const u32 gItemIcon_GrassMemory[] = INCBIN_U32("graphics/items/icons/grass_memory.4bpp.lz"); +const u32 gItemIconPalette_GrassMemory[] = INCBIN_U32("graphics/items/icon_palettes/grass_memory.gbapal.lz"); + +const u32 gItemIcon_GroundMemory[] = INCBIN_U32("graphics/items/icons/ground_memory.4bpp.lz"); +const u32 gItemIconPalette_GroundMemory[] = INCBIN_U32("graphics/items/icon_palettes/ground_memory.gbapal.lz"); + +const u32 gItemIcon_IceMemory[] = INCBIN_U32("graphics/items/icons/ice_memory.4bpp.lz"); +const u32 gItemIconPalette_IceMemory[] = INCBIN_U32("graphics/items/icon_palettes/ice_memory.gbapal.lz"); + +const u32 gItemIcon_PoisonMemory[] = INCBIN_U32("graphics/items/icons/poison_memory.4bpp.lz"); +const u32 gItemIconPalette_PoisonMemory[] = INCBIN_U32("graphics/items/icon_palettes/poison_memory.gbapal.lz"); + +const u32 gItemIcon_PsychicMemory[] = INCBIN_U32("graphics/items/icons/psychic_memory.4bpp.lz"); +const u32 gItemIconPalette_PsychicMemory[] = INCBIN_U32("graphics/items/icon_palettes/psychic_memory.gbapal.lz"); + +const u32 gItemIcon_RockMemory[] = INCBIN_U32("graphics/items/icons/rock_memory.4bpp.lz"); +const u32 gItemIconPalette_RockMemory[] = INCBIN_U32("graphics/items/icon_palettes/rock_memory.gbapal.lz"); + +const u32 gItemIcon_SteelMemory[] = INCBIN_U32("graphics/items/icons/steel_memory.4bpp.lz"); +const u32 gItemIconPalette_SteelMemory[] = INCBIN_U32("graphics/items/icon_palettes/steel_memory.gbapal.lz"); + +const u32 gItemIcon_WaterMemory[] = INCBIN_U32("graphics/items/icons/water_memory.4bpp.lz"); +const u32 gItemIconPalette_WaterMemory[] = INCBIN_U32("graphics/items/icon_palettes/water_memory.gbapal.lz"); + +const u32 gItemIcon_ArmorFossil[] = INCBIN_U32("graphics/items/icons/armor_fossil.4bpp.lz"); +const u32 gItemIconPalette_ArmorFossil[] = INCBIN_U32("graphics/items/icon_palettes/armor_fossil.gbapal.lz"); + +const u32 gItemIcon_SkullFossil[] = INCBIN_U32("graphics/items/icons/skull_fossil.4bpp.lz"); +const u32 gItemIconPalette_SkullFossil[] = INCBIN_U32("graphics/items/icon_palettes/skull_fossil.gbapal.lz"); + +const u32 gItemIcon_CoverFossil[] = INCBIN_U32("graphics/items/icons/cover_fossil.4bpp.lz"); +const u32 gItemIconPalette_CoverFossil[] = INCBIN_U32("graphics/items/icon_palettes/cover_fossil.gbapal.lz"); + +const u32 gItemIcon_PlumeFossil[] = INCBIN_U32("graphics/items/icons/plume_fossil.4bpp.lz"); +const u32 gItemIconPalette_PlumeFossil[] = INCBIN_U32("graphics/items/icon_palettes/plume_fossil.gbapal.lz"); + +const u32 gItemIcon_JawFossil[] = INCBIN_U32("graphics/items/icons/jaw_fossil.4bpp.lz"); +const u32 gItemIconPalette_JawFossil[] = INCBIN_U32("graphics/items/icon_palettes/jaw_fossil.gbapal.lz"); + +const u32 gItemIcon_SailFossil[] = INCBIN_U32("graphics/items/icons/sail_fossil.4bpp.lz"); +const u32 gItemIconPalette_SailFossil[] = INCBIN_U32("graphics/items/icon_palettes/sail_fossil.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 18e94518e..7e7b44b16 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -477,4 +477,109 @@ const u32 *const gItemIconTable[][2] = [ITEM_MISTY_SEED] = {gItemIcon_MistySeed, gItemIconPalette_MistySeed}, [ITEM_PSYCHIC_SEED] = {gItemIcon_PsychicSeed, gItemIconPalette_PsychicSeed}, [ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb}, + // Unordered + [ITEM_SWEET_HEART] = {gItemIcon_SweetHeart, gItemIconPalette_SweetHeart}, + [ITEM_BIG_MALASADA] = {gItemIcon_BigMalasada, gItemIconPalette_BigMalasada}, + [ITEM_OLD_GATEAU] = {gItemIcon_OldGateau, gItemIconPalette_OldGateau}, + [ITEM_X_SP_DEF] = {gItemIcon_XSpecialDefense, gItemIconPalette_XSpecialDefense}, + [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, + [ITEM_DAWN_STONE] = {gItemIcon_DawnStone, gItemIconPalette_DawnStone}, + [ITEM_DUSK_STONE] = {gItemIcon_DuskStone, gItemIconPalette_DuskStone}, + [ITEM_SHINY_STONE] = {gItemIcon_ShinyStone, gItemIconPalette_ShinyStone}, + [ITEM_ICE_STONE] = {gItemIcon_IceStone, gItemIconPalette_IceStone}, + [ITEM_RED_APRICORN] = {gItemIcon_RedApricorn, gItemIconPalette_RedApricorn}, + [ITEM_BLUE_APRICORN] = {gItemIcon_BlueApricorn, gItemIconPalette_BlueApricorn}, + [ITEM_YELLOW_APRICORN] = {gItemIcon_YellowApricorn, gItemIconPalette_YellowApricorn}, + [ITEM_GREEN_APRICORN] = {gItemIcon_GreenApricorn, gItemIconPalette_GreenApricorn}, + [ITEM_PINK_APRICORN] = {gItemIcon_PinkApricorn, gItemIconPalette_PinkApricorn}, + [ITEM_WHITE_APRICORN] = {gItemIcon_WhiteApricorn, gItemIconPalette_WhiteApricorn}, + [ITEM_BLACK_APRICORN] = {gItemIcon_BlackApricorn, gItemIconPalette_BlackApricorn}, + [ITEM_RED_NECTAR] = {gItemIcon_RedNectar, gItemIconPalette_RedNectar}, + [ITEM_YELLOW_NECTAR] = {gItemIcon_YellowNectar, gItemIconPalette_YellowNectar}, + [ITEM_PINK_NECTAR] = {gItemIcon_PinkNectar, gItemIconPalette_PinkNectar}, + [ITEM_PURPLE_NECTAR] = {gItemIcon_PurpleNectar, gItemIconPalette_PurpleNectar}, + [ITEM_RARE_BONE] = {gItemIcon_RareBone, gItemIconPalette_RareBone}, + [ITEM_OCCA_BERRY] = {gItemIcon_OccaBerry, gItemIconPalette_OccaBerry}, + [ITEM_PASSHO_BERRY] = {gItemIcon_PasshoBerry, gItemIconPalette_PasshoBerry}, + [ITEM_WACAN_BERRY] = {gItemIcon_WacanBerry, gItemIconPalette_WacanBerry}, + [ITEM_RINDO_BERRY] = {gItemIcon_RindoBerry, gItemIconPalette_RindoBerry}, + [ITEM_YACHE_BERRY] = {gItemIcon_YacheBerry, gItemIconPalette_YacheBerry}, + [ITEM_CHOPLE_BERRY] = {gItemIcon_ChopleBerry, gItemIconPalette_ChopleBerry}, + [ITEM_KEBIA_BERRY] = {gItemIcon_KebiaBerry, gItemIconPalette_KebiaBerry}, + [ITEM_SHUCA_BERRY] = {gItemIcon_ShucaBerry, gItemIconPalette_ShucaBerry}, + [ITEM_COBA_BERRY] = {gItemIcon_CobaBerry, gItemIconPalette_CobaBerry}, + [ITEM_PAYAPA_BERRY] = {gItemIcon_PayapaBerry, gItemIconPalette_PayapaBerry}, + [ITEM_TANGA_BERRY] = {gItemIcon_TangaBerry, gItemIconPalette_TangaBerry}, + [ITEM_CHARTI_BERRY] = {gItemIcon_ChartiBerry, gItemIconPalette_ChartiBerry}, + [ITEM_KASIB_BERRY] = {gItemIcon_KasibBerry, gItemIconPalette_KasibBerry}, + [ITEM_HABAN_BERRY] = {gItemIcon_HabanBerry, gItemIconPalette_HabanBerry}, + [ITEM_COLBUR_BERRY] = {gItemIcon_ColburBerry, gItemIconPalette_ColburBerry}, + [ITEM_BABIRI_BERRY] = {gItemIcon_BabiriBerry, gItemIconPalette_BabiriBerry}, + [ITEM_CHILAN_BERRY] = {gItemIcon_ChilanBerry, gItemIconPalette_ChilanBerry}, + [ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry}, + [ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry}, + [ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry}, + [ITEM_ROWAP_BERRY] = {gItemIcon_RowapBerry, gItemIconPalette_RowapBerry}, + [ITEM_ROSELI_BERRY] = {gItemIcon_RoseliBerry, gItemIconPalette_RoseliBerry}, + [ITEM_KEE_BERRY] = {gItemIcon_KeeBerry, gItemIconPalette_KeeBerry}, + [ITEM_MARANGA_BERRY] = {gItemIcon_MarangaBerry, gItemIconPalette_MarangaBerry}, + [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, + [ITEM_PROTECTOR] = {gItemIcon_Protector, gItemIconPalette_Protector}, + [ITEM_ELECTIRIZER] = {gItemIcon_Electirizer, gItemIconPalette_Electirizer}, + [ITEM_MAGMARIZER] = {gItemIcon_Magmarizer, gItemIconPalette_Magmarizer}, + [ITEM_DUBIOUS_DISC] = {gItemIcon_DubiousDisc, gItemIconPalette_DubiousDisc}, + [ITEM_REAPER_CLOTH] = {gItemIcon_ReaperCloth, gItemIconPalette_ReaperCloth}, + [ITEM_RAZOR_CLAW] = {gItemIcon_RazorClaw, gItemIconPalette_RazorClaw}, + [ITEM_RAZOR_FANG] = {gItemIcon_RazorFang, gItemIconPalette_RazorFang}, + [ITEM_PRISM_SCALE] = {gItemIcon_PrismScale, gItemIconPalette_PrismScale}, + [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, + [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, + [ITEM_POWER_BRACER] = {gItemIcon_PowerBracer, gItemIconPalette_PowerBracer}, + [ITEM_POWER_BELT] = {gItemIcon_PowerBelt, gItemIconPalette_PowerBelt}, + [ITEM_POWER_LENS] = {gItemIcon_PowerLens, gItemIconPalette_PowerLens}, + [ITEM_POWER_BAND] = {gItemIcon_PowerBand, gItemIconPalette_PowerBand}, + [ITEM_POWER_ANKLET] = {gItemIcon_PowerAnklet, gItemIconPalette_PowerAnklet}, + [ITEM_POWER_WEIGHT] = {gItemIcon_PowerWeight, gItemIconPalette_PowerWeight}, + [ITEM_ROCKY_HELMET] = {gItemIcon_RockyHelmet, gItemIconPalette_RockyHelmet}, + [ITEM_AIR_BALLOON] = {gItemIcon_AirBalloon, gItemIconPalette_AirBalloon}, + [ITEM_RED_CARD] = {gItemIcon_RedCard, gItemIconPalette_RedCard}, + [ITEM_RING_TARGET] = {gItemIcon_RingTarget, gItemIconPalette_RingTarget}, + [ITEM_EJECT_BUTTON] = {gItemIcon_EjectButton, gItemIconPalette_EjectButton}, + [ITEM_ABSORB_BULB] = {gItemIcon_AbsorbBulb, gItemIconPalette_AbsorbBulb}, + [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery}, + [ITEM_LUMINOUS_MOSS] = {gItemIcon_LuminousMoss, gItemIconPalette_LuminousMoss}, + [ITEM_SNOWBALL] = {gItemIcon_Snowball, gItemIconPalette_Snowball}, + [ITEM_WEAKNESS_POLICY] = {gItemIcon_WeaknessPolicy, gItemIconPalette_WeaknessPolicy}, + [ITEM_ODD_INCENSE] = {gItemIcon_OddIncense, gItemIconPalette_OddIncense}, + [ITEM_ROCK_INCENSE] = {gItemIcon_RockIncense, gItemIconPalette_RockIncense}, + [ITEM_FULL_INCENSE] = {gItemIcon_FullIncense, gItemIconPalette_FullIncense}, + [ITEM_WAVE_INCENSE] = {gItemIcon_WaveIncense, gItemIconPalette_WaveIncense}, + [ITEM_ROSE_INCENSE] = {gItemIcon_RoseIncense, gItemIconPalette_RoseIncense}, + [ITEM_LUCK_INCENSE] = {gItemIcon_LuckIncense, gItemIconPalette_LuckIncense}, + [ITEM_PURE_INCENSE] = {gItemIcon_PureIncense, gItemIconPalette_PureIncense}, + [ITEM_ODD_KEYSTONE] = {gItemIcon_OddKeystone, gItemIconPalette_OddKeystone}, + [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, + [ITEM_BUG_MEMORY] = {gItemIcon_BugMemory, gItemIconPalette_BugMemory}, + [ITEM_DARK_MEMORY] = {gItemIcon_DarkMemory, gItemIconPalette_DarkMemory}, + [ITEM_DRAGON_MEMORY] = {gItemIcon_DragonMemory, gItemIconPalette_DragonMemory}, + [ITEM_ELECTRIC_MEMORY] = {gItemIcon_ElectricMemory, gItemIconPalette_ElectricMemory}, + [ITEM_FAIRY_MEMORY] = {gItemIcon_FairyMemory, gItemIconPalette_FairyMemory}, + [ITEM_FIGHTING_MEMORY] = {gItemIcon_FightingMemory, gItemIconPalette_FightingMemory}, + [ITEM_FIRE_MEMORY] = {gItemIcon_FireMemory, gItemIconPalette_FireMemory}, + [ITEM_FLYING_MEMORY] = {gItemIcon_FlyingMemory, gItemIconPalette_FlyingMemory}, + [ITEM_GHOST_MEMORY] = {gItemIcon_GhostMemory, gItemIconPalette_GhostMemory}, + [ITEM_GRASS_MEMORY] = {gItemIcon_GrassMemory, gItemIconPalette_GrassMemory}, + [ITEM_GROUND_MEMORY] = {gItemIcon_GroundMemory, gItemIconPalette_GroundMemory}, + [ITEM_ICE_MEMORY] = {gItemIcon_IceMemory, gItemIconPalette_IceMemory}, + [ITEM_POISON_MEMORY] = {gItemIcon_PoisonMemory, gItemIconPalette_PoisonMemory}, + [ITEM_PSYCHIC_MEMORY] = {gItemIcon_PsychicMemory, gItemIconPalette_PsychicMemory}, + [ITEM_ROCK_MEMORY] = {gItemIcon_RockMemory, gItemIconPalette_RockMemory}, + [ITEM_STEEL_MEMORY] = {gItemIcon_SteelMemory, gItemIconPalette_SteelMemory}, + [ITEM_WATER_MEMORY] = {gItemIcon_WaterMemory, gItemIconPalette_WaterMemory}, + [ITEM_ARMOR_FOSSIL] = {gItemIcon_ArmorFossil, gItemIconPalette_ArmorFossil}, + [ITEM_SKULL_FOSSIL] = {gItemIcon_SkullFossil, gItemIconPalette_SkullFossil}, + [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil}, + [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, + [ITEM_JAW_FOSSIL] = {gItemIcon_JawFossil, gItemIconPalette_JawFossil}, + [ITEM_SAIL_FOSSIL] = {gItemIcon_SailFossil, gItemIconPalette_SailFossil}, }; From 4e3516e2d801e0beeacf9dd3d558e9c9b135dc98 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 2 May 2019 15:12:00 -0300 Subject: [PATCH 23/52] Removed the copy of the Safety Goggle's sprite that I somehow left in by accident. --- graphics/items/icon_palettes/safety_goggles.png | Bin 386 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 graphics/items/icon_palettes/safety_goggles.png diff --git a/graphics/items/icon_palettes/safety_goggles.png b/graphics/items/icon_palettes/safety_goggles.png deleted file mode 100644 index 7a1efab67adffd72893d7ab8383ab500014ac898..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xu?EJb+&fI^cfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0=j-CMiXDcR}&wQFMZL`gH zTyQQ}$I+*H{O!E5BC8#H8k}CONhoK1x%tPGW3T3J{^$L#-{D8nnfs1MvR?I_5NC3E zF1WV7boW!a(n;%bd_*EvuH)IFdD5~VH7j3X+3DDo@{XHKdS){z9j|#2CTx?}eemVh zNTt@-eb%j(iQ1L&6|pP{nnhV`|HC#5oxFHlL}%rl4Bq?fb!UYg?Ui`$+~0f> KKbLh*2~7ZYQHg>8 From 713e6606666e1eda78d1559cbd697272b36802d3 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 2 May 2019 15:19:30 -0300 Subject: [PATCH 24/52] Updated the price tags of the X Items to their USUM standard. --- src/data/items.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 6de0fc741..a6e502612 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1072,7 +1072,7 @@ const struct Item gItems[] = { .name = _("X Attack"), .itemId = ITEM_X_ATTACK, - .price = 500, + .price = 1000, .description = sXAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1086,7 +1086,7 @@ const struct Item gItems[] = { .name = _("X Defend"), .itemId = ITEM_X_DEFENSE, - .price = 550, + .price = 2000, .description = sXDefendDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1100,7 +1100,7 @@ const struct Item gItems[] = { .name = _("X Speed"), .itemId = ITEM_X_SPEED, - .price = 350, + .price = 1000, .description = sXSpeedDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1114,7 +1114,7 @@ const struct Item gItems[] = { .name = _("X Accuracy"), .itemId = ITEM_X_ACCURACY, - .price = 950, + .price = 1000, .description = sXAccuracyDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1128,7 +1128,7 @@ const struct Item gItems[] = { .name = _("X Sp. Atk."), .itemId = ITEM_X_SP_ATK, - .price = 350, + .price = 1000, .description = sXSpecialAttackDesc, .pocket = POCKET_ITEMS, .type = 4, From fbdcbfd33d786ec49949109cc0e8cfc40ccb4858 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 2 May 2019 15:39:47 -0300 Subject: [PATCH 25/52] Fixed Silvally's Memory items' hold effects. --- include/constants/hold_effects.h | 18 +-------- src/data/items.h | 68 ++++++++++++++++---------------- 2 files changed, 35 insertions(+), 51 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 759931cd1..f96e7df4d 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -137,23 +137,7 @@ #define HOLD_EFFECT_TERRAIN_EXTENDER 150 #define HOLD_EFFECT_SEEDS 151 #define HOLD_EFFECT_ADRENALINE_ORB 152 -#define HOLD_EFFECT_BUG_MEMORY 153 -#define HOLD_EFFECT_DARK_MEMORY 154 -#define HOLD_EFFECT_DRAGON_MEMORY 155 -#define HOLD_EFFECT_ELECTRIC_MEMORY 156 -#define HOLD_EFFECT_FAIRY_MEMORY 157 -#define HOLD_EFFECT_FIGHTING_MEMORY 158 -#define HOLD_EFFECT_FIRE_MEMORY 159 -#define HOLD_EFFECT_FLYING_MEMORY 160 -#define HOLD_EFFECT_GHOST_MEMORY 161 -#define HOLD_EFFECT_GRASS_MEMORY 162 -#define HOLD_EFFECT_GROUND_MEMORY 163 -#define HOLD_EFFECT_ICE_MEMORY 164 -#define HOLD_EFFECT_POISON_MEMORY 165 -#define HOLD_EFFECT_PSYCHIC_MEMORY 166 -#define HOLD_EFFECT_ROCK_MEMORY 167 -#define HOLD_EFFECT_STEEL_MEMORY 168 -#define HOLD_EFFECT_WATER_MEMORY 169 +#define HOLD_EFFECT_MEMORY 153 #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) diff --git a/src/data/items.h b/src/data/items.h index a6e502612..1722b329f 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -5570,13 +5570,13 @@ const struct Item gItems[] = .name = _("Bug Memory"), .itemId = ITEM_BUG_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_BUG_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sBugMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_BUG, }, [ITEM_DARK_MEMORY] = @@ -5584,13 +5584,13 @@ const struct Item gItems[] = .name = _("Dark Memory"), .itemId = ITEM_DARK_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_DARK_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sDarkMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DARK, }, [ITEM_DRAGON_MEMORY] = @@ -5598,13 +5598,13 @@ const struct Item gItems[] = .name = _("Dragon Memory"), .itemId = ITEM_DRAGON_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_DRAGON_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sDragonMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DRAGON, }, [ITEM_ELECTRIC_MEMORY] = @@ -5612,13 +5612,13 @@ const struct Item gItems[] = .name = _("Elec. Memory"), .itemId = ITEM_ELECTRIC_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ELECTRIC_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sElectricMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ELECTRIC, }, [ITEM_FAIRY_MEMORY] = @@ -5626,13 +5626,13 @@ const struct Item gItems[] = .name = _("Fairy Memory"), .itemId = ITEM_FAIRY_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FAIRY_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFairyMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FAIRY, }, [ITEM_FIGHTING_MEMORY] = @@ -5640,13 +5640,13 @@ const struct Item gItems[] = .name = _("Fight Memory"), .itemId = ITEM_FIGHTING_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FIGHTING_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFightingMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIGHTING, }, [ITEM_FIRE_MEMORY] = @@ -5654,13 +5654,13 @@ const struct Item gItems[] = .name = _("Fire Memory"), .itemId = ITEM_FIRE_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FIRE_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFireMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIRE, }, [ITEM_FLYING_MEMORY] = @@ -5668,13 +5668,13 @@ const struct Item gItems[] = .name = _("Flying Memory"), .itemId = ITEM_FLYING_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FLYING_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFlyingMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FLYING, }, [ITEM_GHOST_MEMORY] = @@ -5682,13 +5682,13 @@ const struct Item gItems[] = .name = _("Ghost Memory"), .itemId = ITEM_GHOST_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GHOST_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGhostMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GHOST, }, [ITEM_GRASS_MEMORY] = @@ -5696,13 +5696,13 @@ const struct Item gItems[] = .name = _("Grass Memory"), .itemId = ITEM_GRASS_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GRASS_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGrassMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GRASS, }, [ITEM_GROUND_MEMORY] = @@ -5710,13 +5710,13 @@ const struct Item gItems[] = .name = _("Ground Memory"), .itemId = ITEM_GROUND_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GROUND_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGroundMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GROUND, }, [ITEM_ICE_MEMORY] = @@ -5724,13 +5724,13 @@ const struct Item gItems[] = .name = _("Ice Memory"), .itemId = ITEM_ICE_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ICE_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sIceMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ICE, }, [ITEM_POISON_MEMORY] = @@ -5738,13 +5738,13 @@ const struct Item gItems[] = .name = _("Poison Memory"), .itemId = ITEM_POISON_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_POISON_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sPoisonMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_POISON, }, [ITEM_PSYCHIC_MEMORY] = @@ -5752,13 +5752,13 @@ const struct Item gItems[] = .name = _("PsychicMemory"), .itemId = ITEM_PSYCHIC_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_PSYCHIC_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sPsychicMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_PSYCHIC, }, [ITEM_ROCK_MEMORY] = @@ -5766,13 +5766,13 @@ const struct Item gItems[] = .name = _("Rock Memory"), .itemId = ITEM_ROCK_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ROCK_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sRockMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ROCK, }, [ITEM_STEEL_MEMORY] = @@ -5780,13 +5780,13 @@ const struct Item gItems[] = .name = _("Steel Memory"), .itemId = ITEM_STEEL_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_STEEL_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sSteelMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_STEEL, }, [ITEM_WATER_MEMORY] = @@ -5794,13 +5794,13 @@ const struct Item gItems[] = .name = _("Water Memory"), .itemId = ITEM_WATER_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_WATER_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sWaterMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_WATER, }, [ITEM_FLAME_PLATE] = From eaafcd539d43b343ad8f58900c6cd25e7549e5e4 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 2 May 2019 15:47:43 -0300 Subject: [PATCH 26/52] Fixed the Power Items' hold effects. --- include/constants/hold_effects.h | 7 +------ src/data/items.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index f96e7df4d..9d4089101 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -102,12 +102,7 @@ #define HOLD_EFFECT_GRISEOUS_ORB 96 #define HOLD_EFFECT_GRACIDEA 97 #define HOLD_EFFECT_RESIST_BERRY 98 -#define HOLD_EFFECT_POWER_BRACER 99 -#define HOLD_EFFECT_POWER_BELT 100 -#define HOLD_EFFECT_POWER_LENS 101 -#define HOLD_EFFECT_POWER_BAND 102 -#define HOLD_EFFECT_POWER_ANKLET 103 -#define HOLD_EFFECT_POWER_WEIGHT 104 +#define HOLD_EFFECT_EV_BOOST 99 // Gen5 hold effects #define HOLD_EFFECT_FLOAT_STONE 115 diff --git a/src/data/items.h b/src/data/items.h index 1722b329f..3bd128811 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3288,12 +3288,12 @@ const struct Item gItems[] = .name = _("Power Bracer"), .itemId = ITEM_POWER_BRACER, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_BRACER, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerBracerDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_ATK, }, [ITEM_POWER_BELT] = @@ -3301,12 +3301,12 @@ const struct Item gItems[] = .name = _("Power Belt"), .itemId = ITEM_POWER_BELT, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_BELT, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerBeltDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_DEF, }, [ITEM_POWER_LENS] = @@ -3314,12 +3314,12 @@ const struct Item gItems[] = .name = _("Power Lens"), .itemId = ITEM_POWER_LENS, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_LENS, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerLensDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_SPATK, }, [ITEM_POWER_BAND] = @@ -3327,12 +3327,12 @@ const struct Item gItems[] = .name = _("Power Band"), .itemId = ITEM_POWER_BAND, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_BAND, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerBandDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_SPDEF, }, [ITEM_POWER_ANKLET] = @@ -3340,12 +3340,12 @@ const struct Item gItems[] = .name = _("Power Anklet"), .itemId = ITEM_POWER_ANKLET, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_ANKLET, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerAnkletDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_SPEED, }, [ITEM_POWER_WEIGHT] = @@ -3353,12 +3353,12 @@ const struct Item gItems[] = .name = _("Power Weight"), .itemId = ITEM_POWER_WEIGHT, .price = 3000, - .holdEffect = HOLD_EFFECT_POWER_WEIGHT, + .holdEffect = HOLD_EFFECT_EV_BOOST, .description = sPowerWeightDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = STAT_HP, }, [ITEM_SEA_INCENSE] = From 5b23f3787ecdaeb7fa641bed0b8e86eedc2ade8a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 4 May 2019 09:15:10 +0200 Subject: [PATCH 27/52] Tweak up batle item's secondary ids --- include/constants/pokemon.h | 3 +- src/data/items.h | 100 ++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index f63d755ad..03b1a7ba1 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -21,7 +21,8 @@ #define TYPE_ICE 0x0f #define TYPE_DRAGON 0x10 #define TYPE_DARK 0x11 -#define NUMBER_OF_MON_TYPES 0x12 +#define TYPE_FAIRY 0x12 +#define NUMBER_OF_MON_TYPES 0x13 // Pokemon egg groups diff --git a/src/data/items.h b/src/data/items.h index 3bd128811..08e10c5ca 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2342,7 +2342,7 @@ const struct Item gItems[] = .itemId = ITEM_OCCA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_FIRE, .description = sOccaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2356,7 +2356,7 @@ const struct Item gItems[] = .itemId = ITEM_PASSHO_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_WATER, .description = sPasshoBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2370,7 +2370,7 @@ const struct Item gItems[] = .itemId = ITEM_WACAN_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_ELECTRIC, .description = sWacanBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2384,7 +2384,7 @@ const struct Item gItems[] = .itemId = ITEM_RINDO_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_GRASS, .description = sRindoBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2398,7 +2398,7 @@ const struct Item gItems[] = .itemId = ITEM_YACHE_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_ICE, .description = sYacheBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2412,7 +2412,7 @@ const struct Item gItems[] = .itemId = ITEM_CHOPLE_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_FIGHTING, .description = sChopleBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2426,7 +2426,7 @@ const struct Item gItems[] = .itemId = ITEM_KEBIA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_POISON, .description = sKebiaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2440,7 +2440,7 @@ const struct Item gItems[] = .itemId = ITEM_SHUCA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_GROUND, .description = sShucaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2454,7 +2454,7 @@ const struct Item gItems[] = .itemId = ITEM_COBA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_FIGHTING, .description = sCobaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2468,7 +2468,7 @@ const struct Item gItems[] = .itemId = ITEM_PAYAPA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_PSYCHIC, .description = sPayapaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2482,7 +2482,7 @@ const struct Item gItems[] = .itemId = ITEM_TANGA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_BUG, .description = sTangaBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2496,7 +2496,7 @@ const struct Item gItems[] = .itemId = ITEM_CHARTI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_ROCK, .description = sChartiBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2510,7 +2510,7 @@ const struct Item gItems[] = .itemId = ITEM_KASIB_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_GHOST, .description = sKasibBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2524,7 +2524,7 @@ const struct Item gItems[] = .itemId = ITEM_HABAN_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_DRAGON, .description = sHabanBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2538,7 +2538,7 @@ const struct Item gItems[] = .itemId = ITEM_COLBUR_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_DARK, .description = sColburBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2552,7 +2552,7 @@ const struct Item gItems[] = .itemId = ITEM_BABIRI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_STEEL, .description = sBabiriBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2566,7 +2566,7 @@ const struct Item gItems[] = .itemId = ITEM_CHILAN_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_NORMAL, .description = sChilanBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -2580,7 +2580,7 @@ const struct Item gItems[] = .itemId = ITEM_ROSELI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = 0, + .holdEffectParam = TYPE_FAIRY, .description = sRoseliBerryDesc, .pocket = POCKET_BERRIES, .type = 4, @@ -3289,6 +3289,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BRACER, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerBracerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3302,6 +3303,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BELT, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerBeltDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3315,6 +3317,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_LENS, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerLensDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3328,6 +3331,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BAND, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerBandDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3341,6 +3345,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_ANKLET, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerAnkletDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3354,6 +3359,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_WEIGHT, .price = 3000, .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, .description = sPowerWeightDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -6217,7 +6223,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_WATER, }, [ITEM_SHOCK_DRIVE] = @@ -6230,7 +6236,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ELECTRIC, }, [ITEM_BURN_DRIVE] = @@ -6243,7 +6249,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIRE, }, [ITEM_CHILL_DRIVE] = @@ -6256,7 +6262,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ICE, }, [ITEM_FIRE_GEM] = @@ -6265,11 +6271,12 @@ const struct Item gItems[] = .itemId = ITEM_FIRE_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sFireGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIRE, }, [ITEM_WATER_GEM] = @@ -6278,11 +6285,12 @@ const struct Item gItems[] = .itemId = ITEM_WATER_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sWaterGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_WATER, }, [ITEM_ELECTRIC_GEM] = @@ -6291,11 +6299,12 @@ const struct Item gItems[] = .itemId = ITEM_ELECTRIC_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sElectricGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ELECTRIC, }, [ITEM_GRASS_GEM] = @@ -6304,11 +6313,12 @@ const struct Item gItems[] = .itemId = ITEM_GRASS_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sGrassGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GRASS, }, [ITEM_ICE_GEM] = @@ -6317,6 +6327,7 @@ const struct Item gItems[] = .itemId = ITEM_ICE_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sIceGemDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -6330,6 +6341,7 @@ const struct Item gItems[] = .itemId = ITEM_FIGHTING_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sFightingGemDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -6343,11 +6355,12 @@ const struct Item gItems[] = .itemId = ITEM_POISON_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sPoisonGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_POISON, }, [ITEM_GROUND_GEM] = @@ -6356,11 +6369,12 @@ const struct Item gItems[] = .itemId = ITEM_GROUND_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sGroundGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GROUND, }, [ITEM_FLYING_GEM] = @@ -6369,11 +6383,12 @@ const struct Item gItems[] = .itemId = ITEM_FLYING_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sFlyingGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FLYING, }, [ITEM_PSYCHIC_GEM] = @@ -6382,11 +6397,12 @@ const struct Item gItems[] = .itemId = ITEM_PSYCHIC_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sPsychicGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_PSYCHIC, }, [ITEM_BUG_GEM] = @@ -6395,11 +6411,12 @@ const struct Item gItems[] = .itemId = ITEM_BUG_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sBugGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_BUG, }, [ITEM_ROCK_GEM] = @@ -6408,11 +6425,12 @@ const struct Item gItems[] = .itemId = ITEM_ROCK_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sRockGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ROCK, }, [ITEM_GHOST_GEM] = @@ -6421,11 +6439,12 @@ const struct Item gItems[] = .itemId = ITEM_GHOST_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sGhostGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GHOST, }, [ITEM_DRAGON_GEM] = @@ -6434,11 +6453,12 @@ const struct Item gItems[] = .itemId = ITEM_DRAGON_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sDragonGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DRAGON, }, [ITEM_DARK_GEM] = @@ -6447,11 +6467,12 @@ const struct Item gItems[] = .itemId = ITEM_DARK_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sDarkGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DARK, }, [ITEM_STEEL_GEM] = @@ -6460,11 +6481,12 @@ const struct Item gItems[] = .itemId = ITEM_STEEL_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sSteelGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_STEEL, }, [ITEM_NORMAL_GEM] = @@ -6473,11 +6495,12 @@ const struct Item gItems[] = .itemId = ITEM_NORMAL_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sNormalGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_NORMAL, }, [ITEM_FAIRY_GEM] = @@ -6486,11 +6509,12 @@ const struct Item gItems[] = .itemId = ITEM_FAIRY_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, .description = sFairyGemDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FAIRY, }, [ITEM_ASSAULT_VEST] = From bf15bb097a596a9da39b6e9f77c54d2c85df0680 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 12 May 2019 11:31:34 -0300 Subject: [PATCH 28/52] Added the Safety Goggles' palette because I'm a very dumb person. --- .../items/icon_palettes/safety_goggles.pal | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 graphics/items/icon_palettes/safety_goggles.pal diff --git a/graphics/items/icon_palettes/safety_goggles.pal b/graphics/items/icon_palettes/safety_goggles.pal new file mode 100755 index 000000000..a6fbaea02 --- /dev/null +++ b/graphics/items/icon_palettes/safety_goggles.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 255 +49 49 49 +74 74 74 +82 132 82 +90 165 90 +115 189 90 +206 107 115 +181 57 66 +222 173 173 +66 99 66 +255 214 214 +156 222 132 +0 0 0 +0 0 0 +0 0 0 +0 0 0 From 473f84f31b6639b679ba53b6079c2c8fed62ea75 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 17 May 2019 10:42:14 +0200 Subject: [PATCH 29/52] Formatting --- include/constants/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 03b1a7ba1..234e6400e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -22,7 +22,7 @@ #define TYPE_DRAGON 0x10 #define TYPE_DARK 0x11 #define TYPE_FAIRY 0x12 -#define NUMBER_OF_MON_TYPES 0x13 +#define NUMBER_OF_MON_TYPES 0x13 // Pokemon egg groups From 2592d3830323f0a2423686a64128136e9fb2de03 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 17 May 2019 07:52:41 -0300 Subject: [PATCH 30/52] Added the data, sprites and sprites data of the Wings. --- graphics/items/icon_palettes/clever_wing.pal | 19 ++++ graphics/items/icon_palettes/genius_wing.pal | 19 ++++ graphics/items/icon_palettes/health_wing.pal | 19 ++++ graphics/items/icon_palettes/muscle_wing.pal | 19 ++++ graphics/items/icon_palettes/pretty_wing.pal | 19 ++++ graphics/items/icon_palettes/resist_wing.pal | 19 ++++ graphics/items/icon_palettes/swift_wing.pal | 19 ++++ graphics/items/icons/clever_wing.png | Bin 0 -> 230 bytes graphics/items/icons/genius_wing.png | Bin 0 -> 230 bytes graphics/items/icons/health_wing.png | Bin 0 -> 230 bytes graphics/items/icons/muscle_wing.png | Bin 0 -> 230 bytes graphics/items/icons/pretty_wing.png | Bin 0 -> 203 bytes graphics/items/icons/resist_wing.png | Bin 0 -> 230 bytes graphics/items/icons/swift_wing.png | Bin 0 -> 230 bytes include/constants/hold_effects.h | 3 + include/constants/items.h | 10 +- include/graphics.h | 14 +++ src/data/graphics/items.h | 21 ++++ src/data/item_icon_table.h | 7 ++ src/data/items.h | 97 +++++++++++++++++++ src/data/text/item_descriptions.h | 35 +++++++ 21 files changed, 319 insertions(+), 1 deletion(-) create mode 100755 graphics/items/icon_palettes/clever_wing.pal create mode 100755 graphics/items/icon_palettes/genius_wing.pal create mode 100755 graphics/items/icon_palettes/health_wing.pal create mode 100755 graphics/items/icon_palettes/muscle_wing.pal create mode 100755 graphics/items/icon_palettes/pretty_wing.pal create mode 100755 graphics/items/icon_palettes/resist_wing.pal create mode 100755 graphics/items/icon_palettes/swift_wing.pal create mode 100755 graphics/items/icons/clever_wing.png create mode 100755 graphics/items/icons/genius_wing.png create mode 100755 graphics/items/icons/health_wing.png create mode 100755 graphics/items/icons/muscle_wing.png create mode 100755 graphics/items/icons/pretty_wing.png create mode 100755 graphics/items/icons/resist_wing.png create mode 100755 graphics/items/icons/swift_wing.png diff --git a/graphics/items/icon_palettes/clever_wing.pal b/graphics/items/icon_palettes/clever_wing.pal new file mode 100755 index 000000000..1ddaa990e --- /dev/null +++ b/graphics/items/icon_palettes/clever_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +156 99 156 +231 148 239 +214 99 214 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/genius_wing.pal b/graphics/items/icon_palettes/genius_wing.pal new file mode 100755 index 000000000..dbfdb5e88 --- /dev/null +++ b/graphics/items/icon_palettes/genius_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +148 189 198 +140 247 255 +90 231 239 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/health_wing.pal b/graphics/items/icon_palettes/health_wing.pal new file mode 100755 index 000000000..357d6950b --- /dev/null +++ b/graphics/items/icon_palettes/health_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +181 165 132 +255 231 132 +255 206 24 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/muscle_wing.pal b/graphics/items/icon_palettes/muscle_wing.pal new file mode 100755 index 000000000..e5fd0123c --- /dev/null +++ b/graphics/items/icon_palettes/muscle_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +173 140 148 +255 123 132 +247 57 66 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pretty_wing.pal b/graphics/items/icon_palettes/pretty_wing.pal new file mode 100755 index 000000000..e2e1b3ed7 --- /dev/null +++ b/graphics/items/icon_palettes/pretty_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/resist_wing.pal b/graphics/items/icon_palettes/resist_wing.pal new file mode 100755 index 000000000..c29df3793 --- /dev/null +++ b/graphics/items/icon_palettes/resist_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +49 99 181 +123 165 247 +82 132 231 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/swift_wing.pal b/graphics/items/icon_palettes/swift_wing.pal new file mode 100755 index 000000000..359140d2c --- /dev/null +++ b/graphics/items/icon_palettes/swift_wing.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 128 +90 90 90 +206 239 255 +239 255 255 +49 49 49 +156 214 231 +82 156 66 +165 239 132 +82 198 66 +140 165 173 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icons/clever_wing.png b/graphics/items/icons/clever_wing.png new file mode 100755 index 0000000000000000000000000000000000000000..3cc0a3d5f4c628f6c9e9155ebe5be9868d24fb62 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLeLB+q$1<^8qfYduTXzWiC03RKBh666=m;PC858jzFb z>Eak7aXC3*fslZRh{J}dy)212VyUUht`f&XBO^JFC2|IZxjtILdeCxR;!{sAgUfS_ zPE8J3C^K!QY_6B0LFhEul?(X-I!_)m4vl?~CYibGz}-ij*BPeF6nfb(p};{SsX+1S aZie(jf*l_>dT#^T$l&Sf=d#Wzp$Py>j#RV& literal 0 HcmV?d00001 diff --git a/graphics/items/icons/genius_wing.png b/graphics/items/icons/genius_wing.png new file mode 100755 index 0000000000000000000000000000000000000000..5b27a029e0b8c7633c1d48df305abc14a19bc0d1 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLdg>^;`={eRT+_dQG3MhA9G0;*&z3GxeOaCmkj4aiCJ zba4!kxSX7@KuADD#9_nKUY5ihvD8#$SBc}Hk&&Fo5;=pyTpulAJ!rWu@u{bm!R0wd zrzVFil$kbDHrGqhAat7S%7uIZohOeOhsHiglg!+8;O-;N>kLz73cYNYP~f1ERG@fu aH$(a%!H$m`y|)2vWbkzLb6Mw<&;$S~090-O literal 0 HcmV?d00001 diff --git a/graphics/items/icons/health_wing.png b/graphics/items/icons/health_wing.png new file mode 100755 index 0000000000000000000000000000000000000000..584cc4f134f36cb24128f605679d1b260a446c73 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLdwE^Yb$yygEniJqlvCx3A{1yspc666=m;PC858jzFb z>Eak7aXC3*fslZRh{J}dy)212VyUUht`f&XBO^JFC2|IZxjtILdeCxR;!{sAgUfS_ zPE8J3C^K!QY_6B0LFhEul?(X-I!_)m4vl?~CYibGz}-ij*BPeF6nfb(p};{SsX+1S aZie(jf*l_>dT#^T$l&Sf=d#Wzp$Py(-Bh6f literal 0 HcmV?d00001 diff --git a/graphics/items/icons/muscle_wing.png b/graphics/items/icons/muscle_wing.png new file mode 100755 index 0000000000000000000000000000000000000000..5ebf263b25e7a1c8374c924c9d1fed839b56dcf8 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLe5_DuO--SXYisb}fhPWSa%K$VOoL4Lsu4$p3+0Xb=& zE{-7*my;6~2nmRYIBb~O%aWKQmYS;UDsenCGLrLHB4<#T>!T&C2QAknKK1l6xID+` z)Z~zbGSg+NS%G}f0G|-o z{|pULQBmjK|9}7gzoDVwoNLc}madhOPZ9+xU@Qsp3ubV5b|VeQ3GsAs43W5;oUp)D zKt#l0!_;1u#GGjfsmiVr$3r6{InNaag|!w(G)-v|kWmd)Rh^N!&Ve&j;y9;NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLbwlebnc{T|fvyl3g!Td}M!T&C2QAknKK1l6xID+` z)Z~zbGSg+NS%G}H0G|-o z{|pULQBmjK|9}7gzoDVwoNLd6<~S{V-x74psb}fho+X!e097)U1o;IsI6S+N2IQo9 zx;TbNTux3{AS56n;;>V8_Re-rImSGI+ZBxvX Date: Fri, 17 May 2019 07:56:54 -0300 Subject: [PATCH 31/52] Oops. I've put the .secondaryId field for the Muscle Wing twice. --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index b89f77fde..4eee9c130 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7309,7 +7309,6 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, .secondaryId = STAT_ATK, }, From ba27907f98851cf68b457c867c81ae0042c0ced1 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Fri, 17 May 2019 21:07:44 -0400 Subject: [PATCH 32/52] Fix some typos in item names --- src/data/items.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 08e10c5ca..cf5ffefa6 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -4687,7 +4687,7 @@ const struct Item gItems[] = [ITEM_POKE_FLUTE] = { - .name = _("Poké FLUTE"), + .name = _("Poké Flute"), .itemId = ITEM_POKE_FLUTE, .price = 0, .description = sPokeFluteDesc, @@ -4856,7 +4856,7 @@ const struct Item gItems[] = [ITEM_COVER_FOSSIL] = { - .name = _("Covet Fossil"), + .name = _("Cover Fossil"), .itemId = ITEM_COVER_FOSSIL, .price = 0, .description = sCoverFossilDesc, From c81d06b71262f5650f4003976ed4eaa0e9909a21 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Jun 2019 11:05:03 +0200 Subject: [PATCH 33/52] Fix EV wings --- include/constants/hold_effects.h | 3 - include/constants/items.h | 1206 +++++++++++++++--------------- src/data/items.h | 12 +- src/data/pokemon/item_effects.h | 94 ++- src/pokemon.c | 26 +- 5 files changed, 709 insertions(+), 632 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 0562bc469..9d4089101 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -134,9 +134,6 @@ #define HOLD_EFFECT_ADRENALINE_ORB 152 #define HOLD_EFFECT_MEMORY 153 -// Unordered -#define HOLD_EFFECT_RAISE_EV 154 - #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 diff --git a/include/constants/items.h b/include/constants/items.h index 71e7bf995..0b3e29b53 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -97,608 +97,608 @@ #define ITEM_SUPER_REPEL 91 #define ITEM_MAX_REPEL 92 #define ITEM_ABILITY_CAPSULE 93 -// Evolution stones -#define ITEM_SUN_STONE 94 -#define ITEM_MOON_STONE 95 -#define ITEM_FIRE_STONE 96 -#define ITEM_THUNDER_STONE 97 -#define ITEM_WATER_STONE 98 -#define ITEM_LEAF_STONE 99 -#define ITEM_DAWN_STONE 100 -#define ITEM_DUSK_STONE 101 -#define ITEM_SHINY_STONE 102 -#define ITEM_ICE_STONE 103 -// Unusable -#define ITEM_RED_APRICORN 104 -#define ITEM_BLUE_APRICORN 105 -#define ITEM_YELLOW_APRICORN 106 -#define ITEM_GREEN_APRICORN 107 -#define ITEM_PINK_APRICORN 108 -#define ITEM_WHITE_APRICORN 109 -#define ITEM_BLACK_APRICORN 110 -#define ITEM_TINY_MUSHROOM 111 -#define ITEM_BIG_MUSHROOM 112 -#define ITEM_PEARL 113 -#define ITEM_BIG_PEARL 114 -#define ITEM_STARDUST 115 -#define ITEM_STAR_PIECE 116 -#define ITEM_NUGGET 117 -#define ITEM_HEART_SCALE 118 -#define ITEM_RED_NECTAR 119 -#define ITEM_YELLOW_NECTAR 120 -#define ITEM_PINK_NECTAR 121 -#define ITEM_PURPLE_NECTAR 122 -#define ITEM_HONEY 123 -#define ITEM_RARE_BONE 124 -// Mails -#define ITEM_ORANGE_MAIL 125 -#define ITEM_HARBOR_MAIL 126 -#define ITEM_GLITTER_MAIL 127 -#define ITEM_MECH_MAIL 128 -#define ITEM_WOOD_MAIL 129 -#define ITEM_WAVE_MAIL 130 -#define ITEM_BEAD_MAIL 131 -#define ITEM_SHADOW_MAIL 132 -#define ITEM_TROPIC_MAIL 133 -#define ITEM_DREAM_MAIL 134 -#define ITEM_FAB_MAIL 135 -#define ITEM_RETRO_MAIL 136 -// Berries -#define ITEM_CHERI_BERRY 137 -#define ITEM_CHESTO_BERRY 138 -#define ITEM_PECHA_BERRY 139 -#define ITEM_RAWST_BERRY 140 -#define ITEM_ASPEAR_BERRY 141 -#define ITEM_LEPPA_BERRY 142 -#define ITEM_ORAN_BERRY 143 -#define ITEM_PERSIM_BERRY 144 -#define ITEM_LUM_BERRY 145 -#define ITEM_SITRUS_BERRY 146 -#define ITEM_FIGY_BERRY 147 -#define ITEM_WIKI_BERRY 148 -#define ITEM_MAGO_BERRY 149 -#define ITEM_AGUAV_BERRY 150 -#define ITEM_IAPAPA_BERRY 151 -#define ITEM_RAZZ_BERRY 152 -#define ITEM_BLUK_BERRY 153 -#define ITEM_NANAB_BERRY 154 -#define ITEM_WEPEAR_BERRY 155 -#define ITEM_PINAP_BERRY 156 -#define ITEM_POMEG_BERRY 157 -#define ITEM_KELPSY_BERRY 158 -#define ITEM_QUALOT_BERRY 159 -#define ITEM_HONDEW_BERRY 160 -#define ITEM_GREPA_BERRY 161 -#define ITEM_TAMATO_BERRY 162 -#define ITEM_CORNN_BERRY 163 -#define ITEM_MAGOST_BERRY 164 -#define ITEM_RABUTA_BERRY 165 -#define ITEM_NOMEL_BERRY 166 -#define ITEM_SPELON_BERRY 167 -#define ITEM_PAMTRE_BERRY 168 -#define ITEM_WATMEL_BERRY 169 -#define ITEM_DURIN_BERRY 170 -#define ITEM_BELUE_BERRY 171 -#define ITEM_OCCA_BERRY 172 -#define ITEM_PASSHO_BERRY 173 -#define ITEM_WACAN_BERRY 174 -#define ITEM_RINDO_BERRY 175 -#define ITEM_YACHE_BERRY 176 -#define ITEM_CHOPLE_BERRY 177 -#define ITEM_KEBIA_BERRY 178 -#define ITEM_SHUCA_BERRY 179 -#define ITEM_COBA_BERRY 180 -#define ITEM_PAYAPA_BERRY 181 -#define ITEM_TANGA_BERRY 182 -#define ITEM_CHARTI_BERRY 183 -#define ITEM_KASIB_BERRY 184 -#define ITEM_HABAN_BERRY 185 -#define ITEM_COLBUR_BERRY 186 -#define ITEM_BABIRI_BERRY 187 -#define ITEM_CHILAN_BERRY 188 -#define ITEM_ROSELI_BERRY 189 -#define ITEM_LIECHI_BERRY 190 -#define ITEM_GANLON_BERRY 191 -#define ITEM_SALAC_BERRY 192 -#define ITEM_PETAYA_BERRY 193 -#define ITEM_APICOT_BERRY 194 -#define ITEM_LANSAT_BERRY 195 -#define ITEM_STARF_BERRY 196 -#define ITEM_MICLE_BERRY 197 -#define ITEM_ENIGMA_BERRY 198 -#define ITEM_CUSTAP_BERRY 199 -#define ITEM_JABOCA_BERRY 200 -#define ITEM_ROWAP_BERRY 201 -#define ITEM_KEE_BERRY 202 -#define ITEM_MARANGA_BERRY 203 -// Battle Held items -#define ITEM_BRIGHT_POWDER 204 -#define ITEM_WHITE_HERB 205 -#define ITEM_MACHO_BRACE 206 -#define ITEM_EXP_SHARE 207 -#define ITEM_QUICK_CLAW 208 -#define ITEM_SOOTHE_BELL 209 -#define ITEM_MENTAL_HERB 210 -#define ITEM_CHOICE_BAND 211 -#define ITEM_KINGS_ROCK 212 -#define ITEM_SILVER_POWDER 213 -#define ITEM_AMULET_COIN 214 -#define ITEM_CLEANSE_TAG 215 -#define ITEM_SMOKE_BALL 216 -#define ITEM_EVERSTONE 217 -#define ITEM_FOCUS_BAND 218 -#define ITEM_LUCKY_EGG 219 -#define ITEM_SCOPE_LENS 220 -#define ITEM_METAL_COAT 221 -#define ITEM_LEFTOVERS 222 -#define ITEM_DRAGON_SCALE 223 -#define ITEM_OVAL_STONE 224 -#define ITEM_PROTECTOR 225 -#define ITEM_ELECTIRIZER 226 -#define ITEM_MAGMARIZER 227 -#define ITEM_DUBIOUS_DISC 228 -#define ITEM_REAPER_CLOTH 229 -#define ITEM_RAZOR_CLAW 230 -#define ITEM_RAZOR_FANG 231 -#define ITEM_PRISM_SCALE 232 -#define ITEM_WHIPPED_DREAM 233 -#define ITEM_SACHET 234 -#define ITEM_SOFT_SAND 235 -#define ITEM_HARD_STONE 236 -#define ITEM_MIRACLE_SEED 237 -#define ITEM_BLACK_GLASSES 238 -#define ITEM_BLACK_BELT 239 -#define ITEM_MAGNET 240 -#define ITEM_MYSTIC_WATER 241 -#define ITEM_SHARP_BEAK 242 -#define ITEM_POISON_BARB 243 -#define ITEM_NEVER_MELT_ICE 244 -#define ITEM_SPELL_TAG 245 -#define ITEM_TWISTED_SPOON 246 -#define ITEM_CHARCOAL 247 -#define ITEM_DRAGON_FANG 248 -#define ITEM_SILK_SCARF 249 -#define ITEM_UP_GRADE 250 -#define ITEM_SHELL_BELL 251 -#define ITEM_POWER_BRACER 252 -#define ITEM_POWER_BELT 253 -#define ITEM_POWER_LENS 254 -#define ITEM_POWER_BAND 255 -#define ITEM_POWER_ANKLET 256 -#define ITEM_POWER_WEIGHT 257 -#define ITEM_POWER_HERB 258 -#define ITEM_CHOICE_SCARF 259 -#define ITEM_CHOICE_SPECS 260 -#define ITEM_FOCUS_SASH 261 -#define ITEM_WIDE_LENS 262 -#define ITEM_ZOOM_LENS 263 -#define ITEM_METRONOME 264 -#define ITEM_MUSCLE_BAND 265 -#define ITEM_WISE_GLASSES 266 -#define ITEM_EXPERT_BELT 267 -#define ITEM_LIGHT_CLAY 268 -#define ITEM_ICY_ROCK 269 -#define ITEM_SMOOTH_ROCK 270 -#define ITEM_HEAT_ROCK 271 -#define ITEM_DAMP_ROCK 272 -#define ITEM_DESTINY_KNOT 273 -#define ITEM_GRIP_CLAW 274 -#define ITEM_LIFE_ORB 275 -#define ITEM_TOXIC_ORB 276 -#define ITEM_FLAME_ORB 277 -#define ITEM_STICKY_BARB 278 -#define ITEM_BLACK_SLUDGE 279 -#define ITEM_IRON_BALL 280 -#define ITEM_LAGGING_TAIL 281 -#define ITEM_SHED_SHELL 282 -#define ITEM_BIG_ROOT 283 -#define ITEM_EVIOLITE 284 -#define ITEM_FLOAT_STONE 285 -#define ITEM_ROCKY_HELMET 286 -#define ITEM_AIR_BALLOON 287 -#define ITEM_RED_CARD 288 -#define ITEM_RING_TARGET 289 -#define ITEM_BINDING_BAND 290 -#define ITEM_EJECT_BUTTON 291 -#define ITEM_ABSORB_BULB 292 -#define ITEM_CELL_BATTERY 293 -#define ITEM_LUMINOUS_MOSS 294 -#define ITEM_SNOWBALL 295 -#define ITEM_WEAKNESS_POLICY 296 -#define ITEM_ASSAULT_VEST 297 -#define ITEM_SAFETY_GOGGLES 298 -#define ITEM_ADRENALINE_ORB 299 -#define ITEM_TERRAIN_EXTENDER 300 -#define ITEM_PROTECTIVE_PADS 301 -#define ITEM_ELECTRIC_SEED 302 -#define ITEM_PSYCHIC_SEED 303 -#define ITEM_MISTY_SEED 304 -#define ITEM_GRASSY_SEED 305 -// Incenses -#define ITEM_SEA_INCENSE 306 -#define ITEM_LAX_INCENSE 307 -#define ITEM_ODD_INCENSE 308 -#define ITEM_ROCK_INCENSE 309 -#define ITEM_FULL_INCENSE 310 -#define ITEM_WAVE_INCENSE 311 -#define ITEM_ROSE_INCENSE 312 -#define ITEM_LUCK_INCENSE 313 -#define ITEM_PURE_INCENSE 314 -// Plates -#define ITEM_INSECT_PLATE 315 -#define ITEM_DREAD_PLATE 316 -#define ITEM_DRACO_PLATE 317 -#define ITEM_ZAP_PLATE 318 -#define ITEM_PIXIE_PLATE 319 -#define ITEM_FIST_PLATE 320 -#define ITEM_FLAME_PLATE 321 -#define ITEM_SKY_PLATE 322 -#define ITEM_SPOOKY_PLATE 323 -#define ITEM_MEADOW_PLATE 324 -#define ITEM_EARTH_PLATE 325 -#define ITEM_ICICLE_PLATE 326 -#define ITEM_TOXIC_PLATE 327 -#define ITEM_MIND_PLATE 328 -#define ITEM_STONE_PLATE 329 -#define ITEM_IRON_PLATE 330 -#define ITEM_SPLASH_PLATE 331 -// Gems -#define ITEM_BUG_GEM 332 -#define ITEM_DARK_GEM 333 -#define ITEM_DRAGON_GEM 334 -#define ITEM_ELECTRIC_GEM 335 -#define ITEM_FAIRY_GEM 336 -#define ITEM_FIGHTING_GEM 337 -#define ITEM_FIRE_GEM 338 -#define ITEM_FLYING_GEM 339 -#define ITEM_GHOST_GEM 340 -#define ITEM_GRASS_GEM 341 -#define ITEM_GROUND_GEM 342 -#define ITEM_ICE_GEM 343 -#define ITEM_NORMAL_GEM 344 -#define ITEM_POISON_GEM 345 -#define ITEM_PSYCHIC_GEM 346 -#define ITEM_ROCK_GEM 347 -#define ITEM_STEEL_GEM 348 -#define ITEM_WATER_GEM 349 -// Mon specific -#define ITEM_SOUL_DEW 350 -#define ITEM_DEEP_SEA_TOOTH 351 -#define ITEM_DEEP_SEA_SCALE 352 -#define ITEM_LUCKY_PUNCH 353 -#define ITEM_METAL_POWDER 354 -#define ITEM_THICK_CLUB 355 -#define ITEM_STICK 356 -#define ITEM_LIGHT_BALL 357 -#define ITEM_QUICK_POWDER 358 -#define ITEM_ODD_KEYSTONE 359 -#define ITEM_ADAMANT_ORB 360 -#define ITEM_LUSTROUS_ORB 361 -#define ITEM_GRISEOUS_ORB 362 -#define ITEM_GRACIDEA 363 -// Memories -#define ITEM_BUG_MEMORY 364 -#define ITEM_DARK_MEMORY 365 -#define ITEM_DRAGON_MEMORY 366 -#define ITEM_ELECTRIC_MEMORY 367 -#define ITEM_FAIRY_MEMORY 368 -#define ITEM_FIGHTING_MEMORY 369 -#define ITEM_FIRE_MEMORY 370 -#define ITEM_FLYING_MEMORY 371 -#define ITEM_GHOST_MEMORY 372 -#define ITEM_GRASS_MEMORY 373 -#define ITEM_GROUND_MEMORY 374 -#define ITEM_ICE_MEMORY 375 -#define ITEM_POISON_MEMORY 376 -#define ITEM_PSYCHIC_MEMORY 377 -#define ITEM_ROCK_MEMORY 378 -#define ITEM_STEEL_MEMORY 379 -#define ITEM_WATER_MEMORY 380 -// Drives -#define ITEM_DOUSE_DRIVE 381 -#define ITEM_SHOCK_DRIVE 382 -#define ITEM_BURN_DRIVE 383 -#define ITEM_CHILL_DRIVE 384 -// Contest held items -#define ITEM_RED_SCARF 385 -#define ITEM_BLUE_SCARF 386 -#define ITEM_PINK_SCARF 387 -#define ITEM_GREEN_SCARF 388 -#define ITEM_YELLOW_SCARF 389 -// Mega stones -#define ITEM_ABOMASITE 390 -#define ITEM_ABSOLITE 391 -#define ITEM_AERODACTYLITE 392 -#define ITEM_AGGRONITE 393 -#define ITEM_ALAKAZITE 394 -#define ITEM_ALTARIANITE 395 -#define ITEM_AMPHAROSITE 396 -#define ITEM_AUDINITE 397 -#define ITEM_BANETTITE 398 -#define ITEM_BEEDRILLITE 399 -#define ITEM_BLASTOISINITE 400 -#define ITEM_BLAZIKENITE 401 -#define ITEM_CAMERUPTITE 402 -#define ITEM_CHARIZARDITE_X 403 -#define ITEM_CHARIZARDITE_Y 404 -#define ITEM_DIANCITE 405 -#define ITEM_GALLADITE 406 -#define ITEM_GARCHOMPITE 407 -#define ITEM_GARDEVOIRITE 408 -#define ITEM_GENGARITE 409 -#define ITEM_GLALITITE 410 -#define ITEM_GYARADOSITE 411 -#define ITEM_HERACRONITE 412 -#define ITEM_HOUNDOOMINITE 413 -#define ITEM_KANGASKHANITE 414 -#define ITEM_LATIASITE 415 -#define ITEM_LATIOSITE 416 -#define ITEM_LOPUNNITE 417 -#define ITEM_LUCARIONITE 418 -#define ITEM_MANECTITE 419 -#define ITEM_MAWILITE 420 -#define ITEM_MEDICHAMITE 421 -#define ITEM_METAGROSSITE 422 -#define ITEM_MEWTWONITE_X 423 -#define ITEM_MEWTWONITE_Y 424 -#define ITEM_PIDGEOTITE 425 -#define ITEM_PINSIRITE 426 -#define ITEM_SABLENITE 427 -#define ITEM_SALAMENCITE 428 -#define ITEM_SCEPTILITE 429 -#define ITEM_SCIZORITE 430 -#define ITEM_SHARPEDONITE 431 -#define ITEM_SLOWBRONITE 432 -#define ITEM_STEELIXITE 433 -#define ITEM_SWAMPERTITE 434 -#define ITEM_TYRANITARITE 435 -#define ITEM_VENUSAURITE 436 -#define ITEM_MEGA_BRACELET 437 -// Fossils -#define ITEM_ARMOR_FOSSIL 438 -#define ITEM_SKULL_FOSSIL 439 -#define ITEM_HELIX_FOSSIL 440 -#define ITEM_DOME_FOSSIL 441 -#define ITEM_COVER_FOSSIL 442 -#define ITEM_PLUME_FOSSIL 443 -#define ITEM_JAW_FOSSIL 444 -#define ITEM_SAIL_FOSSIL 445 -#define ITEM_ROOT_FOSSIL 446 -#define ITEM_CLAW_FOSSIL 447 -// Key Items -#define ITEM_MACH_BIKE 448 -#define ITEM_COIN_CASE 449 -#define ITEM_ITEMFINDER 450 -#define ITEM_OLD_ROD 451 -#define ITEM_GOOD_ROD 452 -#define ITEM_SUPER_ROD 453 -#define ITEM_SS_TICKET 454 -#define ITEM_CONTEST_PASS 455 -#define ITEM_WAILMER_PAIL 456 -#define ITEM_DEVON_GOODS 457 -#define ITEM_SOOT_SACK 458 -#define ITEM_BASEMENT_KEY 459 -#define ITEM_ACRO_BIKE 460 -#define ITEM_POKEBLOCK_CASE 461 -#define ITEM_LETTER 462 -#define ITEM_EON_TICKET 463 -#define ITEM_RED_ORB 464 -#define ITEM_BLUE_ORB 465 -#define ITEM_SCANNER 466 -#define ITEM_GO_GOGGLES 467 -#define ITEM_METEORITE 468 -#define ITEM_ROOM_1_KEY 469 -#define ITEM_ROOM_2_KEY 470 -#define ITEM_ROOM_4_KEY 471 -#define ITEM_ROOM_6_KEY 472 -#define ITEM_STORAGE_KEY 473 -#define ITEM_DEVON_SCOPE 474 -// TMs/HMs -#define ITEM_TM01 475 -#define ITEM_TM02 476 -#define ITEM_TM03 477 -#define ITEM_TM04 478 -#define ITEM_TM05 479 -#define ITEM_TM06 480 -#define ITEM_TM07 481 -#define ITEM_TM08 482 -#define ITEM_TM09 483 -#define ITEM_TM10 484 -#define ITEM_TM11 485 -#define ITEM_TM12 486 -#define ITEM_TM13 487 -#define ITEM_TM14 488 -#define ITEM_TM15 489 -#define ITEM_TM16 490 -#define ITEM_TM17 491 -#define ITEM_TM18 492 -#define ITEM_TM19 493 -#define ITEM_TM20 494 -#define ITEM_TM21 495 -#define ITEM_TM22 496 -#define ITEM_TM23 497 -#define ITEM_TM24 498 -#define ITEM_TM25 499 -#define ITEM_TM26 500 -#define ITEM_TM27 501 -#define ITEM_TM28 502 -#define ITEM_TM29 503 -#define ITEM_TM30 504 -#define ITEM_TM31 505 -#define ITEM_TM32 506 -#define ITEM_TM33 507 -#define ITEM_TM34 508 -#define ITEM_TM35 509 -#define ITEM_TM36 510 -#define ITEM_TM37 511 -#define ITEM_TM38 512 -#define ITEM_TM39 513 -#define ITEM_TM40 514 -#define ITEM_TM41 515 -#define ITEM_TM42 516 -#define ITEM_TM43 517 -#define ITEM_TM44 518 -#define ITEM_TM45 519 -#define ITEM_TM46 520 -#define ITEM_TM47 521 -#define ITEM_TM48 522 -#define ITEM_TM49 523 -#define ITEM_TM50 524 -#define ITEM_TM51 525 -#define ITEM_TM52 526 -#define ITEM_TM53 527 -#define ITEM_TM54 528 -#define ITEM_TM55 529 -#define ITEM_TM56 530 -#define ITEM_TM57 531 -#define ITEM_TM58 532 -#define ITEM_TM59 533 -#define ITEM_TM60 534 -#define ITEM_TM61 535 -#define ITEM_TM62 536 -#define ITEM_TM63 537 -#define ITEM_TM64 538 -#define ITEM_TM65 539 -#define ITEM_TM66 540 -#define ITEM_TM67 541 -#define ITEM_TM68 542 -#define ITEM_TM69 543 -#define ITEM_TM70 544 -#define ITEM_TM71 545 -#define ITEM_TM72 546 -#define ITEM_TM73 547 -#define ITEM_TM74 548 -#define ITEM_TM75 549 -#define ITEM_TM76 550 -#define ITEM_TM77 551 -#define ITEM_TM78 552 -#define ITEM_TM79 553 -#define ITEM_TM80 554 -#define ITEM_TM81 555 -#define ITEM_TM82 556 -#define ITEM_TM83 557 -#define ITEM_TM84 558 -#define ITEM_TM85 559 -#define ITEM_TM86 560 -#define ITEM_TM87 561 -#define ITEM_TM88 562 -#define ITEM_TM89 563 -#define ITEM_TM90 564 -#define ITEM_TM91 565 -#define ITEM_TM92 566 -#define ITEM_TM93 567 -#define ITEM_TM94 568 -#define ITEM_TM95 569 -#define ITEM_TM96 570 -#define ITEM_TM97 571 -#define ITEM_TM98 572 -#define ITEM_TM99 573 -#define ITEM_TM100 574 - -#define ITEM_HM01 525 -#define ITEM_HM02 526 -#define ITEM_HM03 527 -#define ITEM_HM04 528 -#define ITEM_HM05 529 -#define ITEM_HM06 530 -#define ITEM_HM07 531 -#define ITEM_HM08 532 - -#define ITEM_TM01_FOCUS_PUNCH 475 -#define ITEM_TM02_DRAGON_CLAW 476 -#define ITEM_TM03_WATER_PULSE 477 -#define ITEM_TM04_CALM_MIND 478 -#define ITEM_TM05_ROAR 479 -#define ITEM_TM06_TOXIC 480 -#define ITEM_TM07_HAIL 481 -#define ITEM_TM08_BULK_UP 482 -#define ITEM_TM09_BULLET_SEED 483 -#define ITEM_TM10_HIDDEN_POWER 484 -#define ITEM_TM11_SUNNY_DAY 485 -#define ITEM_TM12_TAUNT 486 -#define ITEM_TM13_ICE_BEAM 487 -#define ITEM_TM14_BLIZZARD 488 -#define ITEM_TM15_HYPER_BEAM 489 -#define ITEM_TM16_LIGHT_SCREEN 490 -#define ITEM_TM17_PROTECT 491 -#define ITEM_TM18_RAIN_DANCE 492 -#define ITEM_TM19_GIGA_DRAIN 493 -#define ITEM_TM20_SAFEGUARD 494 -#define ITEM_TM21_FRUSTRATION 495 -#define ITEM_TM22_SOLARBEAM 496 -#define ITEM_TM23_IRON_TAIL 497 -#define ITEM_TM24_THUNDERBOLT 498 -#define ITEM_TM25_THUNDER 499 -#define ITEM_TM26_EARTHQUAKE 500 -#define ITEM_TM27_RETURN 501 -#define ITEM_TM28_DIG 502 -#define ITEM_TM29_PSYCHIC 503 -#define ITEM_TM30_SHADOW_BALL 504 -#define ITEM_TM31_BRICK_BREAK 505 -#define ITEM_TM32_DOUBLE_TEAM 506 -#define ITEM_TM33_REFLECT 507 -#define ITEM_TM34_SHOCK_WAVE 508 -#define ITEM_TM35_FLAMETHROWER 509 -#define ITEM_TM36_SLUDGE_BOMB 510 -#define ITEM_TM37_SANDSTORM 511 -#define ITEM_TM38_FIRE_BLAST 512 -#define ITEM_TM39_ROCK_TOMB 513 -#define ITEM_TM40_AERIAL_ACE 514 -#define ITEM_TM41_TORMENT 515 -#define ITEM_TM42_FACADE 516 -#define ITEM_TM43_SECRET_POWER 517 -#define ITEM_TM44_REST 518 -#define ITEM_TM45_ATTRACT 519 -#define ITEM_TM46_THIEF 520 -#define ITEM_TM47_STEEL_WING 521 -#define ITEM_TM48_SKILL_SWAP 522 -#define ITEM_TM49_SNATCH 523 -#define ITEM_TM50_OVERHEAT 524 - -#define ITEM_HM01_CUT 525 -#define ITEM_HM02_FLY 526 -#define ITEM_HM03_SURF 527 -#define ITEM_HM04_STRENGTH 528 -#define ITEM_HM05_FLASH 529 -#define ITEM_HM06_ROCK_SMASH 530 -#define ITEM_HM07_WATERFALL 531 -#define ITEM_HM08_DIVE 532 -// FireRed/LeafGreen -#define ITEM_OAKS_PARCEL 583 -#define ITEM_POKE_FLUTE 584 -#define ITEM_SECRET_KEY 585 -#define ITEM_BIKE_VOUCHER 586 -#define ITEM_GOLD_TEETH 587 -#define ITEM_OLD_AMBER 588 -#define ITEM_CARD_KEY 589 -#define ITEM_LIFT_KEY 590 -#define ITEM_SILPH_SCOPE 591 -#define ITEM_BICYCLE 592 -#define ITEM_TOWN_MAP 593 -#define ITEM_VS_SEEKER 594 -#define ITEM_FAME_CHECKER 595 -#define ITEM_TM_CASE 596 -#define ITEM_BERRY_POUCH 597 -#define ITEM_TEACHY_TV 598 -#define ITEM_TRI_PASS 599 -#define ITEM_RAINBOW_PASS 600 -#define ITEM_TEA 601 -#define ITEM_MYSTIC_TICKET 602 -#define ITEM_AURORA_TICKET 603 -#define ITEM_POWDER_JAR 604 -#define ITEM_RUBY 605 -#define ITEM_SAPPHIRE 606 -// Emerald -#define ITEM_MAGMA_EMBLEM 607 -#define ITEM_OLD_SEA_MAP 608 // Wings -#define ITEM_HEALTH_WING 609 -#define ITEM_MUSCLE_WING 610 -#define ITEM_RESIST_WING 611 -#define ITEM_GENIUS_WING 612 -#define ITEM_CLEVER_WING 613 -#define ITEM_SWIFT_WING 614 -#define ITEM_PRETTY_WING 615 +#define ITEM_HEALTH_WING 94 +#define ITEM_MUSCLE_WING 95 +#define ITEM_RESIST_WING 96 +#define ITEM_GENIUS_WING 97 +#define ITEM_CLEVER_WING 98 +#define ITEM_SWIFT_WING 99 +#define ITEM_PRETTY_WING 100 +// Evolution stones +#define ITEM_SUN_STONE 101 +#define ITEM_MOON_STONE 102 +#define ITEM_FIRE_STONE 103 +#define ITEM_THUNDER_STONE 104 +#define ITEM_WATER_STONE 105 +#define ITEM_LEAF_STONE 106 +#define ITEM_DAWN_STONE 107 +#define ITEM_DUSK_STONE 108 +#define ITEM_SHINY_STONE 109 +#define ITEM_ICE_STONE 110 +// Unusable +#define ITEM_RED_APRICORN 111 +#define ITEM_BLUE_APRICORN 112 +#define ITEM_YELLOW_APRICORN 113 +#define ITEM_GREEN_APRICORN 114 +#define ITEM_PINK_APRICORN 115 +#define ITEM_WHITE_APRICORN 116 +#define ITEM_BLACK_APRICORN 117 +#define ITEM_TINY_MUSHROOM 118 +#define ITEM_BIG_MUSHROOM 119 +#define ITEM_PEARL 120 +#define ITEM_BIG_PEARL 121 +#define ITEM_STARDUST 122 +#define ITEM_STAR_PIECE 123 +#define ITEM_NUGGET 124 +#define ITEM_HEART_SCALE 125 +#define ITEM_RED_NECTAR 126 +#define ITEM_YELLOW_NECTAR 127 +#define ITEM_PINK_NECTAR 128 +#define ITEM_PURPLE_NECTAR 129 +#define ITEM_HONEY 130 +#define ITEM_RARE_BONE 131 +// Mails +#define ITEM_ORANGE_MAIL 132 +#define ITEM_HARBOR_MAIL 133 +#define ITEM_GLITTER_MAIL 134 +#define ITEM_MECH_MAIL 135 +#define ITEM_WOOD_MAIL 136 +#define ITEM_WAVE_MAIL 137 +#define ITEM_BEAD_MAIL 138 +#define ITEM_SHADOW_MAIL 139 +#define ITEM_TROPIC_MAIL 140 +#define ITEM_DREAM_MAIL 141 +#define ITEM_FAB_MAIL 142 +#define ITEM_RETRO_MAIL 143 +// Berries +#define ITEM_CHERI_BERRY 144 +#define ITEM_CHESTO_BERRY 145 +#define ITEM_PECHA_BERRY 146 +#define ITEM_RAWST_BERRY 147 +#define ITEM_ASPEAR_BERRY 148 +#define ITEM_LEPPA_BERRY 149 +#define ITEM_ORAN_BERRY 150 +#define ITEM_PERSIM_BERRY 151 +#define ITEM_LUM_BERRY 152 +#define ITEM_SITRUS_BERRY 153 +#define ITEM_FIGY_BERRY 154 +#define ITEM_WIKI_BERRY 155 +#define ITEM_MAGO_BERRY 156 +#define ITEM_AGUAV_BERRY 157 +#define ITEM_IAPAPA_BERRY 158 +#define ITEM_RAZZ_BERRY 159 +#define ITEM_BLUK_BERRY 160 +#define ITEM_NANAB_BERRY 161 +#define ITEM_WEPEAR_BERRY 162 +#define ITEM_PINAP_BERRY 163 +#define ITEM_POMEG_BERRY 164 +#define ITEM_KELPSY_BERRY 165 +#define ITEM_QUALOT_BERRY 166 +#define ITEM_HONDEW_BERRY 167 +#define ITEM_GREPA_BERRY 168 +#define ITEM_TAMATO_BERRY 169 +#define ITEM_CORNN_BERRY 170 +#define ITEM_MAGOST_BERRY 171 +#define ITEM_RABUTA_BERRY 172 +#define ITEM_NOMEL_BERRY 173 +#define ITEM_SPELON_BERRY 174 +#define ITEM_PAMTRE_BERRY 175 +#define ITEM_WATMEL_BERRY 176 +#define ITEM_DURIN_BERRY 177 +#define ITEM_BELUE_BERRY 178 +#define ITEM_OCCA_BERRY 179 +#define ITEM_PASSHO_BERRY 180 +#define ITEM_WACAN_BERRY 181 +#define ITEM_RINDO_BERRY 182 +#define ITEM_YACHE_BERRY 183 +#define ITEM_CHOPLE_BERRY 184 +#define ITEM_KEBIA_BERRY 185 +#define ITEM_SHUCA_BERRY 186 +#define ITEM_COBA_BERRY 187 +#define ITEM_PAYAPA_BERRY 188 +#define ITEM_TANGA_BERRY 189 +#define ITEM_CHARTI_BERRY 190 +#define ITEM_KASIB_BERRY 191 +#define ITEM_HABAN_BERRY 192 +#define ITEM_COLBUR_BERRY 193 +#define ITEM_BABIRI_BERRY 194 +#define ITEM_CHILAN_BERRY 195 +#define ITEM_ROSELI_BERRY 196 +#define ITEM_LIECHI_BERRY 197 +#define ITEM_GANLON_BERRY 198 +#define ITEM_SALAC_BERRY 199 +#define ITEM_PETAYA_BERRY 200 +#define ITEM_APICOT_BERRY 201 +#define ITEM_LANSAT_BERRY 202 +#define ITEM_STARF_BERRY 203 +#define ITEM_MICLE_BERRY 204 +#define ITEM_ENIGMA_BERRY 205 +#define ITEM_CUSTAP_BERRY 206 +#define ITEM_JABOCA_BERRY 207 +#define ITEM_ROWAP_BERRY 208 +#define ITEM_KEE_BERRY 209 +#define ITEM_MARANGA_BERRY 210 +// Battle Held items +#define ITEM_BRIGHT_POWDER 211 +#define ITEM_WHITE_HERB 212 +#define ITEM_MACHO_BRACE 213 +#define ITEM_EXP_SHARE 214 +#define ITEM_QUICK_CLAW 215 +#define ITEM_SOOTHE_BELL 216 +#define ITEM_MENTAL_HERB 217 +#define ITEM_CHOICE_BAND 218 +#define ITEM_KINGS_ROCK 219 +#define ITEM_SILVER_POWDER 220 +#define ITEM_AMULET_COIN 221 +#define ITEM_CLEANSE_TAG 222 +#define ITEM_SMOKE_BALL 223 +#define ITEM_EVERSTONE 224 +#define ITEM_FOCUS_BAND 225 +#define ITEM_LUCKY_EGG 226 +#define ITEM_SCOPE_LENS 227 +#define ITEM_METAL_COAT 228 +#define ITEM_LEFTOVERS 229 +#define ITEM_DRAGON_SCALE 230 +#define ITEM_OVAL_STONE 231 +#define ITEM_PROTECTOR 232 +#define ITEM_ELECTIRIZER 233 +#define ITEM_MAGMARIZER 234 +#define ITEM_DUBIOUS_DISC 235 +#define ITEM_REAPER_CLOTH 236 +#define ITEM_RAZOR_CLAW 237 +#define ITEM_RAZOR_FANG 238 +#define ITEM_PRISM_SCALE 239 +#define ITEM_WHIPPED_DREAM 240 +#define ITEM_SACHET 241 +#define ITEM_SOFT_SAND 242 +#define ITEM_HARD_STONE 243 +#define ITEM_MIRACLE_SEED 244 +#define ITEM_BLACK_GLASSES 245 +#define ITEM_BLACK_BELT 246 +#define ITEM_MAGNET 247 +#define ITEM_MYSTIC_WATER 248 +#define ITEM_SHARP_BEAK 249 +#define ITEM_POISON_BARB 250 +#define ITEM_NEVER_MELT_ICE 251 +#define ITEM_SPELL_TAG 252 +#define ITEM_TWISTED_SPOON 253 +#define ITEM_CHARCOAL 254 +#define ITEM_DRAGON_FANG 255 +#define ITEM_SILK_SCARF 256 +#define ITEM_UP_GRADE 257 +#define ITEM_SHELL_BELL 258 +#define ITEM_POWER_BRACER 259 +#define ITEM_POWER_BELT 260 +#define ITEM_POWER_LENS 261 +#define ITEM_POWER_BAND 262 +#define ITEM_POWER_ANKLET 263 +#define ITEM_POWER_WEIGHT 264 +#define ITEM_POWER_HERB 265 +#define ITEM_CHOICE_SCARF 266 +#define ITEM_CHOICE_SPECS 267 +#define ITEM_FOCUS_SASH 268 +#define ITEM_WIDE_LENS 269 +#define ITEM_ZOOM_LENS 270 +#define ITEM_METRONOME 271 +#define ITEM_MUSCLE_BAND 272 +#define ITEM_WISE_GLASSES 273 +#define ITEM_EXPERT_BELT 274 +#define ITEM_LIGHT_CLAY 275 +#define ITEM_ICY_ROCK 276 +#define ITEM_SMOOTH_ROCK 277 +#define ITEM_HEAT_ROCK 278 +#define ITEM_DAMP_ROCK 279 +#define ITEM_DESTINY_KNOT 280 +#define ITEM_GRIP_CLAW 281 +#define ITEM_LIFE_ORB 282 +#define ITEM_TOXIC_ORB 283 +#define ITEM_FLAME_ORB 284 +#define ITEM_STICKY_BARB 285 +#define ITEM_BLACK_SLUDGE 286 +#define ITEM_IRON_BALL 287 +#define ITEM_LAGGING_TAIL 288 +#define ITEM_SHED_SHELL 289 +#define ITEM_BIG_ROOT 290 +#define ITEM_EVIOLITE 291 +#define ITEM_FLOAT_STONE 292 +#define ITEM_ROCKY_HELMET 293 +#define ITEM_AIR_BALLOON 294 +#define ITEM_RED_CARD 295 +#define ITEM_RING_TARGET 296 +#define ITEM_BINDING_BAND 297 +#define ITEM_EJECT_BUTTON 298 +#define ITEM_ABSORB_BULB 299 +#define ITEM_CELL_BATTERY 300 +#define ITEM_LUMINOUS_MOSS 301 +#define ITEM_SNOWBALL 302 +#define ITEM_WEAKNESS_POLICY 303 +#define ITEM_ASSAULT_VEST 304 +#define ITEM_SAFETY_GOGGLES 305 +#define ITEM_ADRENALINE_ORB 306 +#define ITEM_TERRAIN_EXTENDER 307 +#define ITEM_PROTECTIVE_PADS 308 +#define ITEM_ELECTRIC_SEED 309 +#define ITEM_PSYCHIC_SEED 310 +#define ITEM_MISTY_SEED 311 +#define ITEM_GRASSY_SEED 312 +// Incenses +#define ITEM_SEA_INCENSE 313 +#define ITEM_LAX_INCENSE 314 +#define ITEM_ODD_INCENSE 315 +#define ITEM_ROCK_INCENSE 316 +#define ITEM_FULL_INCENSE 317 +#define ITEM_WAVE_INCENSE 318 +#define ITEM_ROSE_INCENSE 319 +#define ITEM_LUCK_INCENSE 320 +#define ITEM_PURE_INCENSE 321 +// Plates +#define ITEM_INSECT_PLATE 322 +#define ITEM_DREAD_PLATE 323 +#define ITEM_DRACO_PLATE 324 +#define ITEM_ZAP_PLATE 325 +#define ITEM_PIXIE_PLATE 326 +#define ITEM_FIST_PLATE 327 +#define ITEM_FLAME_PLATE 328 +#define ITEM_SKY_PLATE 329 +#define ITEM_SPOOKY_PLATE 330 +#define ITEM_MEADOW_PLATE 331 +#define ITEM_EARTH_PLATE 332 +#define ITEM_ICICLE_PLATE 333 +#define ITEM_TOXIC_PLATE 334 +#define ITEM_MIND_PLATE 335 +#define ITEM_STONE_PLATE 336 +#define ITEM_IRON_PLATE 337 +#define ITEM_SPLASH_PLATE 338 +// Gems +#define ITEM_BUG_GEM 339 +#define ITEM_DARK_GEM 340 +#define ITEM_DRAGON_GEM 341 +#define ITEM_ELECTRIC_GEM 342 +#define ITEM_FAIRY_GEM 343 +#define ITEM_FIGHTING_GEM 344 +#define ITEM_FIRE_GEM 345 +#define ITEM_FLYING_GEM 346 +#define ITEM_GHOST_GEM 347 +#define ITEM_GRASS_GEM 348 +#define ITEM_GROUND_GEM 349 +#define ITEM_ICE_GEM 350 +#define ITEM_NORMAL_GEM 351 +#define ITEM_POISON_GEM 352 +#define ITEM_PSYCHIC_GEM 353 +#define ITEM_ROCK_GEM 354 +#define ITEM_STEEL_GEM 355 +#define ITEM_WATER_GEM 356 +// Mon specific +#define ITEM_SOUL_DEW 357 +#define ITEM_DEEP_SEA_TOOTH 358 +#define ITEM_DEEP_SEA_SCALE 359 +#define ITEM_LUCKY_PUNCH 360 +#define ITEM_METAL_POWDER 361 +#define ITEM_THICK_CLUB 362 +#define ITEM_STICK 363 +#define ITEM_LIGHT_BALL 364 +#define ITEM_QUICK_POWDER 365 +#define ITEM_ODD_KEYSTONE 366 +#define ITEM_ADAMANT_ORB 367 +#define ITEM_LUSTROUS_ORB 368 +#define ITEM_GRISEOUS_ORB 369 +#define ITEM_GRACIDEA 370 +// Memories +#define ITEM_BUG_MEMORY 371 +#define ITEM_DARK_MEMORY 372 +#define ITEM_DRAGON_MEMORY 373 +#define ITEM_ELECTRIC_MEMORY 374 +#define ITEM_FAIRY_MEMORY 375 +#define ITEM_FIGHTING_MEMORY 376 +#define ITEM_FIRE_MEMORY 377 +#define ITEM_FLYING_MEMORY 378 +#define ITEM_GHOST_MEMORY 379 +#define ITEM_GRASS_MEMORY 380 +#define ITEM_GROUND_MEMORY 381 +#define ITEM_ICE_MEMORY 382 +#define ITEM_POISON_MEMORY 383 +#define ITEM_PSYCHIC_MEMORY 384 +#define ITEM_ROCK_MEMORY 385 +#define ITEM_STEEL_MEMORY 386 +#define ITEM_WATER_MEMORY 387 +// Drives +#define ITEM_DOUSE_DRIVE 388 +#define ITEM_SHOCK_DRIVE 389 +#define ITEM_BURN_DRIVE 390 +#define ITEM_CHILL_DRIVE 391 +// Contest held items +#define ITEM_RED_SCARF 392 +#define ITEM_BLUE_SCARF 393 +#define ITEM_PINK_SCARF 394 +#define ITEM_GREEN_SCARF 395 +#define ITEM_YELLOW_SCARF 396 +// Mega stones +#define ITEM_ABOMASITE 397 +#define ITEM_ABSOLITE 398 +#define ITEM_AERODACTYLITE 399 +#define ITEM_AGGRONITE 400 +#define ITEM_ALAKAZITE 401 +#define ITEM_ALTARIANITE 402 +#define ITEM_AMPHAROSITE 403 +#define ITEM_AUDINITE 404 +#define ITEM_BANETTITE 405 +#define ITEM_BEEDRILLITE 406 +#define ITEM_BLASTOISINITE 407 +#define ITEM_BLAZIKENITE 408 +#define ITEM_CAMERUPTITE 409 +#define ITEM_CHARIZARDITE_X 410 +#define ITEM_CHARIZARDITE_Y 411 +#define ITEM_DIANCITE 412 +#define ITEM_GALLADITE 413 +#define ITEM_GARCHOMPITE 414 +#define ITEM_GARDEVOIRITE 415 +#define ITEM_GENGARITE 416 +#define ITEM_GLALITITE 417 +#define ITEM_GYARADOSITE 418 +#define ITEM_HERACRONITE 419 +#define ITEM_HOUNDOOMINITE 420 +#define ITEM_KANGASKHANITE 421 +#define ITEM_LATIASITE 422 +#define ITEM_LATIOSITE 423 +#define ITEM_LOPUNNITE 424 +#define ITEM_LUCARIONITE 425 +#define ITEM_MANECTITE 426 +#define ITEM_MAWILITE 427 +#define ITEM_MEDICHAMITE 428 +#define ITEM_METAGROSSITE 429 +#define ITEM_MEWTWONITE_X 430 +#define ITEM_MEWTWONITE_Y 431 +#define ITEM_PIDGEOTITE 432 +#define ITEM_PINSIRITE 433 +#define ITEM_SABLENITE 434 +#define ITEM_SALAMENCITE 435 +#define ITEM_SCEPTILITE 436 +#define ITEM_SCIZORITE 437 +#define ITEM_SHARPEDONITE 438 +#define ITEM_SLOWBRONITE 439 +#define ITEM_STEELIXITE 440 +#define ITEM_SWAMPERTITE 441 +#define ITEM_TYRANITARITE 442 +#define ITEM_VENUSAURITE 443 +#define ITEM_MEGA_BRACELET 444 +// Fossils +#define ITEM_ARMOR_FOSSIL 445 +#define ITEM_SKULL_FOSSIL 446 +#define ITEM_HELIX_FOSSIL 447 +#define ITEM_DOME_FOSSIL 448 +#define ITEM_COVER_FOSSIL 449 +#define ITEM_PLUME_FOSSIL 450 +#define ITEM_JAW_FOSSIL 451 +#define ITEM_SAIL_FOSSIL 452 +#define ITEM_ROOT_FOSSIL 453 +#define ITEM_CLAW_FOSSIL 454 +// Key Items +#define ITEM_MACH_BIKE 455 +#define ITEM_COIN_CASE 456 +#define ITEM_ITEMFINDER 457 +#define ITEM_OLD_ROD 458 +#define ITEM_GOOD_ROD 459 +#define ITEM_SUPER_ROD 460 +#define ITEM_SS_TICKET 461 +#define ITEM_CONTEST_PASS 462 +#define ITEM_WAILMER_PAIL 463 +#define ITEM_DEVON_GOODS 464 +#define ITEM_SOOT_SACK 465 +#define ITEM_BASEMENT_KEY 466 +#define ITEM_ACRO_BIKE 467 +#define ITEM_POKEBLOCK_CASE 468 +#define ITEM_LETTER 469 +#define ITEM_EON_TICKET 470 +#define ITEM_RED_ORB 471 +#define ITEM_BLUE_ORB 472 +#define ITEM_SCANNER 473 +#define ITEM_GO_GOGGLES 474 +#define ITEM_METEORITE 475 +#define ITEM_ROOM_1_KEY 476 +#define ITEM_ROOM_2_KEY 477 +#define ITEM_ROOM_4_KEY 478 +#define ITEM_ROOM_6_KEY 479 +#define ITEM_STORAGE_KEY 480 +#define ITEM_DEVON_SCOPE 481 +// TMs/HMs +#define ITEM_TM01 482 +#define ITEM_TM02 483 +#define ITEM_TM03 484 +#define ITEM_TM04 485 +#define ITEM_TM05 486 +#define ITEM_TM06 487 +#define ITEM_TM07 488 +#define ITEM_TM08 489 +#define ITEM_TM09 490 +#define ITEM_TM10 491 +#define ITEM_TM11 492 +#define ITEM_TM12 493 +#define ITEM_TM13 494 +#define ITEM_TM14 495 +#define ITEM_TM15 496 +#define ITEM_TM16 497 +#define ITEM_TM17 498 +#define ITEM_TM18 499 +#define ITEM_TM19 500 +#define ITEM_TM20 501 +#define ITEM_TM21 502 +#define ITEM_TM22 503 +#define ITEM_TM23 504 +#define ITEM_TM24 505 +#define ITEM_TM25 506 +#define ITEM_TM26 507 +#define ITEM_TM27 508 +#define ITEM_TM28 509 +#define ITEM_TM29 510 +#define ITEM_TM30 511 +#define ITEM_TM31 512 +#define ITEM_TM32 513 +#define ITEM_TM33 514 +#define ITEM_TM34 515 +#define ITEM_TM35 516 +#define ITEM_TM36 517 +#define ITEM_TM37 518 +#define ITEM_TM38 519 +#define ITEM_TM39 520 +#define ITEM_TM40 521 +#define ITEM_TM41 522 +#define ITEM_TM42 523 +#define ITEM_TM43 524 +#define ITEM_TM44 525 +#define ITEM_TM45 526 +#define ITEM_TM46 527 +#define ITEM_TM47 528 +#define ITEM_TM48 529 +#define ITEM_TM49 530 +#define ITEM_TM50 531 +#define ITEM_TM51 532 +#define ITEM_TM52 533 +#define ITEM_TM53 534 +#define ITEM_TM54 535 +#define ITEM_TM55 536 +#define ITEM_TM56 537 +#define ITEM_TM57 538 +#define ITEM_TM58 539 +#define ITEM_TM59 540 +#define ITEM_TM60 541 +#define ITEM_TM61 542 +#define ITEM_TM62 543 +#define ITEM_TM63 544 +#define ITEM_TM64 545 +#define ITEM_TM65 546 +#define ITEM_TM66 547 +#define ITEM_TM67 548 +#define ITEM_TM68 549 +#define ITEM_TM69 550 +#define ITEM_TM70 551 +#define ITEM_TM71 552 +#define ITEM_TM72 553 +#define ITEM_TM73 554 +#define ITEM_TM74 555 +#define ITEM_TM75 556 +#define ITEM_TM76 557 +#define ITEM_TM77 558 +#define ITEM_TM78 559 +#define ITEM_TM79 560 +#define ITEM_TM80 561 +#define ITEM_TM81 562 +#define ITEM_TM82 563 +#define ITEM_TM83 564 +#define ITEM_TM84 565 +#define ITEM_TM85 566 +#define ITEM_TM86 567 +#define ITEM_TM87 568 +#define ITEM_TM88 569 +#define ITEM_TM89 570 +#define ITEM_TM90 571 +#define ITEM_TM91 572 +#define ITEM_TM92 573 +#define ITEM_TM93 574 +#define ITEM_TM94 575 +#define ITEM_TM95 576 +#define ITEM_TM96 577 +#define ITEM_TM97 578 +#define ITEM_TM98 579 +#define ITEM_TM99 580 +#define ITEM_TM100 581 + +#define ITEM_HM01 532 +#define ITEM_HM02 533 +#define ITEM_HM03 534 +#define ITEM_HM04 535 +#define ITEM_HM05 536 +#define ITEM_HM06 537 +#define ITEM_HM07 538 +#define ITEM_HM08 539 + +#define ITEM_TM01_FOCUS_PUNCH 482 +#define ITEM_TM02_DRAGON_CLAW 483 +#define ITEM_TM03_WATER_PULSE 484 +#define ITEM_TM04_CALM_MIND 485 +#define ITEM_TM05_ROAR 486 +#define ITEM_TM06_TOXIC 487 +#define ITEM_TM07_HAIL 488 +#define ITEM_TM08_BULK_UP 489 +#define ITEM_TM09_BULLET_SEED 490 +#define ITEM_TM10_HIDDEN_POWER 491 +#define ITEM_TM11_SUNNY_DAY 492 +#define ITEM_TM12_TAUNT 493 +#define ITEM_TM13_ICE_BEAM 494 +#define ITEM_TM14_BLIZZARD 495 +#define ITEM_TM15_HYPER_BEAM 496 +#define ITEM_TM16_LIGHT_SCREEN 497 +#define ITEM_TM17_PROTECT 498 +#define ITEM_TM18_RAIN_DANCE 499 +#define ITEM_TM19_GIGA_DRAIN 500 +#define ITEM_TM20_SAFEGUARD 501 +#define ITEM_TM21_FRUSTRATION 502 +#define ITEM_TM22_SOLARBEAM 503 +#define ITEM_TM23_IRON_TAIL 504 +#define ITEM_TM24_THUNDERBOLT 505 +#define ITEM_TM25_THUNDER 506 +#define ITEM_TM26_EARTHQUAKE 507 +#define ITEM_TM27_RETURN 508 +#define ITEM_TM28_DIG 509 +#define ITEM_TM29_PSYCHIC 510 +#define ITEM_TM30_SHADOW_BALL 511 +#define ITEM_TM31_BRICK_BREAK 512 +#define ITEM_TM32_DOUBLE_TEAM 513 +#define ITEM_TM33_REFLECT 514 +#define ITEM_TM34_SHOCK_WAVE 515 +#define ITEM_TM35_FLAMETHROWER 516 +#define ITEM_TM36_SLUDGE_BOMB 517 +#define ITEM_TM37_SANDSTORM 518 +#define ITEM_TM38_FIRE_BLAST 519 +#define ITEM_TM39_ROCK_TOMB 520 +#define ITEM_TM40_AERIAL_ACE 521 +#define ITEM_TM41_TORMENT 522 +#define ITEM_TM42_FACADE 523 +#define ITEM_TM43_SECRET_POWER 524 +#define ITEM_TM44_REST 525 +#define ITEM_TM45_ATTRACT 526 +#define ITEM_TM46_THIEF 527 +#define ITEM_TM47_STEEL_WING 528 +#define ITEM_TM48_SKILL_SWAP 529 +#define ITEM_TM49_SNATCH 530 +#define ITEM_TM50_OVERHEAT 531 + +#define ITEM_HM01_CUT 532 +#define ITEM_HM02_FLY 533 +#define ITEM_HM03_SURF 534 +#define ITEM_HM04_STRENGTH 535 +#define ITEM_HM05_FLASH 536 +#define ITEM_HM06_ROCK_SMASH 537 +#define ITEM_HM07_WATERFALL 538 +#define ITEM_HM08_DIVE 539 +// FireRed/LeafGreen +#define ITEM_OAKS_PARCEL 590 +#define ITEM_POKE_FLUTE 591 +#define ITEM_SECRET_KEY 592 +#define ITEM_BIKE_VOUCHER 593 +#define ITEM_GOLD_TEETH 594 +#define ITEM_OLD_AMBER 595 +#define ITEM_CARD_KEY 596 +#define ITEM_LIFT_KEY 597 +#define ITEM_SILPH_SCOPE 598 +#define ITEM_BICYCLE 599 +#define ITEM_TOWN_MAP 600 +#define ITEM_VS_SEEKER 601 +#define ITEM_FAME_CHECKER 602 +#define ITEM_TM_CASE 603 +#define ITEM_BERRY_POUCH 604 +#define ITEM_TEACHY_TV 605 +#define ITEM_TRI_PASS 606 +#define ITEM_RAINBOW_PASS 607 +#define ITEM_TEA 608 +#define ITEM_MYSTIC_TICKET 609 +#define ITEM_AURORA_TICKET 610 +#define ITEM_POWDER_JAR 611 +#define ITEM_RUBY 612 +#define ITEM_SAPPHIRE 613 +// Emerald +#define ITEM_MAGMA_EMBLEM 614 +#define ITEM_OLD_SEA_MAP 615 #define ITEMS_COUNT 616 #define ITEM_FIELD_ARROW ITEMS_COUNT @@ -707,8 +707,8 @@ #define LAST_BERRY_INDEX ITEM_MARANGA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) -#define NUM_TECHNICAL_MACHINES 50 -#define NUM_HIDDEN_MACHINES 8 +#define NUM_TECHNICAL_MACHINES 617 +#define NUM_HIDDEN_MACHINES 618 // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX) diff --git a/src/data/items.h b/src/data/items.h index 8460fd9d0..18615ae21 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7289,7 +7289,7 @@ const struct Item gItems[] = .name = _("Health Wing"), .itemId = ITEM_HEALTH_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sHealthWingDesc, .pocket = POCKET_ITEMS, @@ -7303,7 +7303,7 @@ const struct Item gItems[] = .name = _("Muscle Wing"), .itemId = ITEM_MUSCLE_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sMuscleWingDesc, .pocket = POCKET_ITEMS, @@ -7317,7 +7317,7 @@ const struct Item gItems[] = .name = _("Resist Wing"), .itemId = ITEM_RESIST_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sResistWingDesc, .pocket = POCKET_ITEMS, @@ -7331,7 +7331,7 @@ const struct Item gItems[] = .name = _("Genius Wing"), .itemId = ITEM_GENIUS_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sGeniusWingDesc, .pocket = POCKET_ITEMS, @@ -7345,7 +7345,7 @@ const struct Item gItems[] = .name = _("Clever Wing"), .itemId = ITEM_CLEVER_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sCleverWingDesc, .pocket = POCKET_ITEMS, @@ -7359,7 +7359,7 @@ const struct Item gItems[] = .name = _("Swift Wing"), .itemId = ITEM_SWIFT_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sSwiftWingDesc, .pocket = POCKET_ITEMS, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index c2a11d782..d231c4d20 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -173,46 +173,116 @@ const u8 gItemEffect_SacredAsh[7] = { [6] = -1, }; -const u8 gItemEffect_HPUp[10] = { +const u8 gItemEffect_HPUp[11] = { [4] = ITEM4_EV_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Protein[10] = { +const u8 gItemEffect_Protein[11] = { [4] = ITEM4_EV_ATK, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Iron[10] = { +const u8 gItemEffect_Iron[11] = { [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Carbos[10] = { +const u8 gItemEffect_Carbos[11] = { [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Calcium[10] = { +const u8 gItemEffect_Calcium[11] = { [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, +}; + +const u8 gItemEffect_Zinc[11] = { + [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, + [6] = 10, + [7] = 5, + [8] = 3, + [9] = 2, + [10] = 1, +}; + +const u8 gItemEffect_HpWing[11] = { + [4] = ITEM4_EV_HP, + [5] = ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_AtkWing[11] = { + [4] = ITEM4_EV_ATK, + [5] = ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_DefWing[11] = { + [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpeedWing[11] = { + [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpatkWing[11] = { + [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpdefWing[11] = { + [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, }; const u8 gItemEffect_RareCandy[10] = { @@ -233,14 +303,6 @@ const u8 gItemEffect_PPUp[9] = { [8] = 2, }; -const u8 gItemEffect_Zinc[10] = { - [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, - [6] = 10, - [7] = 5, - [8] = 3, - [9] = 2, -}; - const u8 gItemEffect_PPMax[9] = { [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL, [6] = 5, @@ -445,6 +507,12 @@ const u8 *const gItemEffectTable[] = [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, + [ITEM_HEALTH_WING - ITEM_POTION] = gItemEffect_HpWing, + [ITEM_MUSCLE_WING - ITEM_POTION] = gItemEffect_AtkWing, + [ITEM_RESIST_WING - ITEM_POTION] = gItemEffect_DefWing, + [ITEM_GENIUS_WING - ITEM_POTION] = gItemEffect_SpatkWing, + [ITEM_CLEVER_WING - ITEM_POTION] = gItemEffect_SpdefWing, + [ITEM_SWIFT_WING - ITEM_POTION] = gItemEffect_SpeedWing, [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit, diff --git a/src/pokemon.c b/src/pokemon.c index c54e8ad2c..17f7331d9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4614,7 +4614,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e) { u32 dataUnsigned; - s32 dataSigned; + s32 dataSigned, evCap; s32 friendship; s32 cmdIndex; bool8 retVal = TRUE; @@ -4822,11 +4822,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + + if (itemEffect[10]) + evCap = 100; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2; @@ -5026,11 +5032,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + + if (itemEffect[10]) + evCap = 100; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2; From cbf7f7dd7532ef66382d7265a85515f607ea7266 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 16 Jun 2019 09:50:16 +0200 Subject: [PATCH 34/52] Fix tm/hm defines --- include/constants/items.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index 0b3e29b53..42d881350 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -707,8 +707,8 @@ #define LAST_BERRY_INDEX ITEM_MARANGA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) -#define NUM_TECHNICAL_MACHINES 617 -#define NUM_HIDDEN_MACHINES 618 +#define NUM_TECHNICAL_MACHINES 50 +#define NUM_HIDDEN_MACHINES 8 // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX) From cc4676df1c9b0b0240e421769277356c7da770c4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 29 Jun 2019 11:30:58 +0200 Subject: [PATCH 35/52] Fix berry trees --- spritesheet_rules.mk | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 6e49a0a66..797f2f40a 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -562,6 +562,38 @@ $(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(EVENTOBJGFXDIR)/berry_trees/occa.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/yache.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/chople.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/kebia.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/shuca.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/payapa.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/tanga.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/kasib.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/haban.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/colbur.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/roseli.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png From befec51858038120c342655bf4cc5b10844f1375 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 3 Jul 2019 13:50:52 +0300 Subject: [PATCH 36/52] Fixed the filename of the Kangaskhanite's palette. --- .../items/icon_palettes/{Kangaskhanite.pal => kangaskhanite.pal} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename graphics/items/icon_palettes/{Kangaskhanite.pal => kangaskhanite.pal} (100%) diff --git a/graphics/items/icon_palettes/Kangaskhanite.pal b/graphics/items/icon_palettes/kangaskhanite.pal similarity index 100% rename from graphics/items/icon_palettes/Kangaskhanite.pal rename to graphics/items/icon_palettes/kangaskhanite.pal From 51bfdffac3e26a497f510839a69b46195993cbaa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 17 Aug 2019 12:47:25 +0200 Subject: [PATCH 37/52] Ability Capsule --- include/constants/item_effects.h | 4 +- include/item_use.h | 1 + include/party_menu.h | 1 + src/data/items.h | 4 +- src/data/pokemon/item_effects.h | 12 ++-- src/item_use.c | 6 ++ src/party_menu.c | 94 ++++++++++++++++++++++++++++++++ src/pokemon.c | 4 +- 8 files changed, 115 insertions(+), 11 deletions(-) diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h index a5bb77035..a7440b0cb 100644 --- a/include/constants/item_effects.h +++ b/include/constants/item_effects.h @@ -49,7 +49,9 @@ #define ITEM5_FRIENDSHIP_ALL (ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID | ITEM5_FRIENDSHIP_HIGH) -// fields 6 and onwards are item-specific arguments +// fields 6 - 9 are item-specific arguments + +#define ITEM10_IS_VITAMIN 0x1 // Used for GetItemEffectType. #define ITEM_EFFECT_X_ITEM 0 diff --git a/include/item_use.h b/include/item_use.h index 37343f6e7..456222808 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -25,6 +25,7 @@ void sub_80C9D00(u8); void ItemUseOutOfBattle_WailmerPail(u8); void sub_80C9D74(u8); void ItemUseOutOfBattle_Medicine(u8); +void ItemUseOutOfBattle_AbilityCapsule(u8); void ItemUseOutOfBattle_ReduceEV(u8); void ItemUseOutOfBattle_SacredAsh(u8); void ItemUseOutOfBattle_PPRecovery(u8); diff --git a/include/party_menu.h b/include/party_menu.h index c9843e484..7ff129201 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -71,6 +71,7 @@ void LoadHeldItemIcons(void); void sub_81B5D4C(u8 *a, u8 *b, u8 c); void sub_81B617C(void); void ItemUseCB_Medicine(u8 taskId, TaskFunc task); +void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task); void sub_81B67C8(u8 taskId, TaskFunc task); void dp05_ether(u8 taskId, TaskFunc task); void dp05_pp_up(u8 taskId, TaskFunc task); diff --git a/src/data/items.h b/src/data/items.h index 18615ae21..b50451f67 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1216,8 +1216,8 @@ const struct Item gItems[] = .holdEffectParam = 0, .description = sAbilityCapsuleDesc, .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, .secondaryId = 0, }, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index d231c4d20..57926f31e 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -180,7 +180,7 @@ const u8 gItemEffect_HPUp[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_Protein[11] = { @@ -190,7 +190,7 @@ const u8 gItemEffect_Protein[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_Iron[11] = { @@ -199,7 +199,7 @@ const u8 gItemEffect_Iron[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_Carbos[11] = { @@ -208,7 +208,7 @@ const u8 gItemEffect_Carbos[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_Calcium[11] = { @@ -217,7 +217,7 @@ const u8 gItemEffect_Calcium[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_Zinc[11] = { @@ -226,7 +226,7 @@ const u8 gItemEffect_Zinc[11] = { [7] = 5, [8] = 3, [9] = 2, - [10] = 1, + [10] = ITEM10_IS_VITAMIN, }; const u8 gItemEffect_HpWing[11] = { diff --git a/src/item_use.c b/src/item_use.c index 2f4374423..0064acef3 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -726,6 +726,12 @@ void ItemUseOutOfBattle_Medicine(u8 taskId) SetUpItemUseCallback(taskId); } +void ItemUseOutOfBattle_AbilityCapsule(u8 taskId) +{ + gUnknown_03006328 = ItemUseCB_AbilityCapsule; + SetUpItemUseCallback(taskId); +} + void ItemUseOutOfBattle_ReduceEV(u8 taskId) { gUnknown_03006328 = sub_81B67C8; diff --git a/src/party_menu.c b/src/party_menu.c index dd0a4dabd..56d58b2de 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5482,6 +5482,100 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task) } } +#define tState data[0] +#define tSpecies data[1] +#define tAbilityNum data[2] +#define tMonId data[3] +#define tOldFunc 4 + +void Task_AbilityCapsule(u8 taskId) +{ + static const u8 askText[] = _("Would you like to change {STR_VAR_1}'s\nability to {STR_VAR_2}?"); + static const u8 doneText[] = _("{STR_VAR_1}'s ability became\n{STR_VAR_2}!{PAUSE_UNTIL_PRESS}"); + s16 *data = gTasks[taskId].data; + + switch (tState) + { + case 0: + // Can't use. + if (gBaseStats[tSpecies].abilities[0] == gBaseStats[tSpecies].abilities[1] + || gBaseStats[tSpecies].abilities[1] == 0 + || tAbilityNum > 1 + || !tSpecies) + { + gUnknown_0203CEE8 = 0; + PlaySE(SE_SELECT); + sub_81B1B5C(gText_WontHaveEffect, 1); + schedule_bg_copy_tilemap_to_vram(2); + gTasks[taskId].func = sub_81B6794; + return; + } + gUnknown_0203CEE8 = 1; + GetMonNickname(&gPlayerParty[tMonId], gStringVar1); + StringCopy(gStringVar2, gAbilityNames[GetAbilityBySpecies(tSpecies, tAbilityNum)]); + StringExpandPlaceholders(gStringVar4, askText); + PlaySE(SE_SELECT); + sub_81B1B5C(gStringVar4, 1); + schedule_bg_copy_tilemap_to_vram(2); + tState++; + break; + case 1: + if (!sub_81B1BD4()) + { + sub_81B334C(); + tState++; + } + break; + case 2: + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case 0: + tState++; + break; + case 1: + case MENU_B_PRESSED: + gUnknown_0203CEE8 = 0; + PlaySE(SE_SELECT); + schedule_bg_copy_tilemap_to_vram(2); + // Don't exit party selections screen, return to choosing a mon. + ClearStdWindowAndFrameToTransparent(6, 0); + ClearWindowTilemap(6); + display_pokemon_menu_message(5); + gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tOldFunc); + return; + } + break; + case 3: + PlaySE(SE_KAIFUKU); + StringExpandPlaceholders(gStringVar4, doneText); + sub_81B1B5C(gStringVar4, 1); + schedule_bg_copy_tilemap_to_vram(2); + tState++; + break; + case 4: + if (!sub_81B1BD4()) + tState++; + break; + case 5: + SetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, &tAbilityNum); + RemoveBagItem(gSpecialVar_ItemId, 1); + gTasks[taskId].func = sub_81B12C0; + break; + } +} + +void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task) +{ + s16 *data = gTasks[taskId].data; + + tState = 0; + tMonId = gUnknown_0203CEC8.slotId; + tSpecies = GetMonData(&gPlayerParty[tMonId], MON_DATA_SPECIES, NULL); + tAbilityNum = GetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, NULL) ^ 1; + SetWordTaskArg(taskId, tOldFunc, (uintptr_t)(gTasks[taskId].func)); + gTasks[taskId].func = Task_AbilityCapsule; +} + static void sub_81B672C(u8 taskId) { GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1); diff --git a/src/pokemon.c b/src/pokemon.c index b56a19dc8..0539079bd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4818,7 +4818,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (itemEffect[10]) + if (itemEffect[10] & ITEM10_IS_VITAMIN) evCap = 100; else evCap = 252; @@ -5028,7 +5028,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (itemEffect[10]) + if (itemEffect[10] & ITEM10_IS_VITAMIN) evCap = 100; else evCap = 252; From eb0da420cf2657d94268c6d5bf9a295ab473bf15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 17 Aug 2019 12:48:47 +0200 Subject: [PATCH 38/52] Undefs --- src/party_menu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/party_menu.c b/src/party_menu.c index 56d58b2de..69820a4bb 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5576,6 +5576,12 @@ void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task) gTasks[taskId].func = Task_AbilityCapsule; } +#undef tState +#undef tSpecies +#undef tAbilityNum +#undef tMonId +#undef tOldFunc + static void sub_81B672C(u8 taskId) { GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.slotId], gStringVar1); From 91acfb262ff9068b628779790922e404f7a5134a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 25 Aug 2019 16:07:15 +0200 Subject: [PATCH 39/52] Change x defend to x defense --- src/data/lilycove_lady.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h index f60e527a5..d4465efc2 100644 --- a/src/data/lilycove_lady.h +++ b/src/data/lilycove_lady.h @@ -36,7 +36,7 @@ static const u16 sQuizLadyQuestion1[] = static const u16 sQuizLadyQuestion2[] = { - EC_WORD_WHICH, + EC_WORD_WHICH, EC_WORD_ISN_T, EC_WORD_A, EC_WORD_GAME, @@ -119,7 +119,7 @@ static const u16 sQuizLadyQuestion8[] = EC_MOVE2(BLOCK), EC_WORD_ESCAPE, EC_WORD_QUES, - 0xFFFF, + 0xFFFF, EC_WORD_RUN_AWAY, EC_WORD_SHADOW_TAG, EC_WORD_WONDER_GUARD @@ -362,7 +362,7 @@ static const u16 sFavorLadyAcceptedItems_Shiny[] = ITEM_HEAL_POWDER, ITEM_X_SPEED, ITEM_X_ATTACK, - ITEM_X_DEFEND, + ITEM_X_DEFENSE, ITEM_BLUE_FLUTE, ITEM_YELLOW_FLUTE, ITEM_RED_FLUTE, From 22e1e53d666f1642219baf5733f6804128b9d8d6 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 16 Sep 2019 18:04:01 -0300 Subject: [PATCH 40/52] Added missing item data. --- src/data/items.h | 70 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 23 ++++++++++ 2 files changed, 93 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index b50451f67..1a9445ade 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -336,6 +336,62 @@ const struct Item gItems[] = .secondaryId = 22, }, + [ITEM_SPORT_BALL] = + { + .name = _("Sport Ball"), + .itemId = ITEM_SPORT_BALL, + .price = 10, + .description = sSportBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 23, // To Do + }, + + [ITEM_PARK_BALL] = + { + .name = _("Park Ball"), + .itemId = ITEM_PARK_BALL, + .price = 10, + .description = sParkBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 24, // To Do + }, + + [ITEM_DREAM_BALL] = + { + .name = _("Dream Ball"), + .itemId = ITEM_DREAM_BALL, + .price = 10, + .description = sCherishBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 25, // To Do + }, + + [ITEM_BEAST_BALL] = + { + .name = _("Beast Ball"), + .itemId = ITEM_BEAST_BALL, + .price = 10, + .description = sBeastBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 26, // To Do + }, + // Medicine [ITEM_POTION] = @@ -2322,6 +2378,20 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_MICLE_BERRY] = + { + .name = _("Micle Berry"), + .itemId = ITEM_MICLE_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_NONE, // Placeholder + .holdEffectParam = 4, + .description = sMicleBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_ENIGMA_BERRY] = { .name = _("Enigma Berry"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 74ae60e2e..9c722e4dc 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -117,6 +117,24 @@ static const u8 sCherishBallDesc[] = _( "in commemoration\n" "of some event."); +static const u8 sSportBallDesc[] = _( + "A special Ball used\n" + "in the Bug-Catching\n" + "Contest."); + +static const u8 sParkBallDesc[] = _( + "A special Ball for\n" + "the Pal Park."); + +static const u8 sDreamBallDesc[] = _( + "A Poké Ball used in\n" + "the Entree Forest.\n" + "It doesn't fail."); + +static const u8 sBeastBallDesc[] = _( + "A Ball designed to\n" + "catch Ultra Beasts."); + // Medicine static const u8 sPotionDesc[] = _( "Restores the HP of\n" @@ -867,6 +885,11 @@ static const u8 sStarfBerryDesc[] = _( "sharply boosts a\n" "stat in a pinch."); +static const u8 sMicleBerryDesc[] = _( + "When held, it ups\n" + "the Accuracy of a\n" + "move in a pinch."); + static const u8 sEnigmaBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" From c6504ebfd4b210be0318029a215e13406e7b7970 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 16 Sep 2019 18:43:51 -0300 Subject: [PATCH 41/52] Oops. I forgot to set the correct description in the Dream Ball's data. --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 1a9445ade..c359d1c96 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -369,7 +369,7 @@ const struct Item gItems[] = .name = _("Dream Ball"), .itemId = ITEM_DREAM_BALL, .price = 10, - .description = sCherishBallDesc, + .description = sDreamBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, .fieldUseFunc = NULL, From 4d407d22bae9d21d34cad303e731191153fc3d89 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 19 Oct 2019 15:52:21 +0200 Subject: [PATCH 42/52] Fix merge --- src/battle_anim_special.c | 30 +++++++++++++++--------------- src/party_menu.c | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 870c09171..a460e900c 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -427,7 +427,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_LEVELBALL, .paletteTag = TAG_PARTICLES_LEVELBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -436,7 +436,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_LUREBALL, .paletteTag = TAG_PARTICLES_LUREBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -445,7 +445,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_MOONBALL, .paletteTag = TAG_PARTICLES_MOONBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -454,7 +454,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_FRIENDBALL, .paletteTag = TAG_PARTICLES_FRIENDBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -463,7 +463,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_LOVEBALL, .paletteTag = TAG_PARTICLES_LOVEBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -472,7 +472,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_HEAVYBALL, .paletteTag = TAG_PARTICLES_HEAVYBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -481,7 +481,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_FASTBALL, .paletteTag = TAG_PARTICLES_FASTBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -490,7 +490,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_SPORTBALL, .paletteTag = TAG_PARTICLES_SPORTBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -499,7 +499,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_DUSKBALL, .paletteTag = TAG_PARTICLES_DUSKBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -508,7 +508,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_QUICKBALL, .paletteTag = TAG_PARTICLES_QUICKBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -517,7 +517,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_HEALBALL, .paletteTag = TAG_PARTICLES_HEALBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -526,7 +526,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_CHERISHBALL, .paletteTag = TAG_PARTICLES_CHERISHBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -535,7 +535,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_PARKBALL, .paletteTag = TAG_PARTICLES_PARKBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -544,7 +544,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_DREAMBALL, .paletteTag = TAG_PARTICLES_DREAMBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, @@ -553,7 +553,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { .tileTag = TAG_PARTICLES_BEASTBALL, .paletteTag = TAG_PARTICLES_BEASTBALL, - .oam = &gUnknown_08524904, + .oam = &gOamData_AffineOff_ObjNormal_8x8, .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, diff --git a/src/party_menu.c b/src/party_menu.c index fa8b14712..6f910592b 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5506,7 +5506,7 @@ void Task_AbilityCapsule(u8 taskId) { gUnknown_0203CEE8 = 0; PlaySE(SE_SELECT); - sub_81B1B5C(gText_WontHaveEffect, 1); + DisplayPartyMenuMessage(gText_WontHaveEffect, 1); schedule_bg_copy_tilemap_to_vram(2); gTasks[taskId].func = sub_81B6794; return; @@ -5516,7 +5516,7 @@ void Task_AbilityCapsule(u8 taskId) StringCopy(gStringVar2, gAbilityNames[GetAbilityBySpecies(tSpecies, tAbilityNum)]); StringExpandPlaceholders(gStringVar4, askText); PlaySE(SE_SELECT); - sub_81B1B5C(gStringVar4, 1); + DisplayPartyMenuMessage(gStringVar4, 1); schedule_bg_copy_tilemap_to_vram(2); tState++; break; @@ -5541,7 +5541,7 @@ void Task_AbilityCapsule(u8 taskId) // Don't exit party selections screen, return to choosing a mon. ClearStdWindowAndFrameToTransparent(6, 0); ClearWindowTilemap(6); - display_pokemon_menu_message(5); + DisplayPartyMenuStdMessage(5); gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tOldFunc); return; } @@ -5549,7 +5549,7 @@ void Task_AbilityCapsule(u8 taskId) case 3: PlaySE(SE_KAIFUKU); StringExpandPlaceholders(gStringVar4, doneText); - sub_81B1B5C(gStringVar4, 1); + DisplayPartyMenuMessage(gStringVar4, 1); schedule_bg_copy_tilemap_to_vram(2); tState++; break; @@ -5560,7 +5560,7 @@ void Task_AbilityCapsule(u8 taskId) case 5: SetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, &tAbilityNum); RemoveBagItem(gSpecialVar_ItemId, 1); - gTasks[taskId].func = sub_81B12C0; + gTasks[taskId].func = Task_ClosePartyMenu; break; } } From 2c172a36369d7bf6d6dc88337858fecf32f16eba Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Mon, 17 Feb 2020 07:08:06 -0300 Subject: [PATCH 43/52] Shiny charm (#276) * Shiny Charm Item * Shiny Charm Rerolls --- graphics/items/icon_palettes/shiny_charm.pal | 19 +++++++++++++++++++ graphics/items/icons/shiny_charm.png | Bin 0 -> 356 bytes include/constants/items.h | 4 +++- include/constants/pokemon.h | 1 + include/graphics.h | 2 ++ src/data/graphics/items.h | 3 +++ src/data/item_icon_table.h | 1 + src/data/items.h | 14 +++++++++++++- src/data/text/item_descriptions.h | 5 +++++ src/pokemon.c | 15 +++++++++++++-- 10 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 graphics/items/icon_palettes/shiny_charm.pal create mode 100644 graphics/items/icons/shiny_charm.png diff --git a/graphics/items/icon_palettes/shiny_charm.pal b/graphics/items/icon_palettes/shiny_charm.pal new file mode 100644 index 000000000..ab6e64a6e --- /dev/null +++ b/graphics/items/icon_palettes/shiny_charm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +245 218 38 +82 123 230 +90 156 246 +156 255 106 +41 115 148 +156 246 246 +57 205 246 +132 214 255 +189 189 239 +222 222 255 +90 90 90 +32 32 32 +206 173 247 +140 140 247 +173 107 255 +230 206 255 diff --git a/graphics/items/icons/shiny_charm.png b/graphics/items/icons/shiny_charm.png new file mode 100644 index 0000000000000000000000000000000000000000..3829154cd5a3e2702d4039e89e8e4b59d205cdd4 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN11N+zc|J=~?q01BJv( zTq8OS5>&oNwPO&we{_;6Ot|!+)R}5C&2I zfvo=^kXI~g3KU>W@^*Lmzm)ycQ6Q(o)5S5QVovILUExCpJZuljt(MJoZJg`!$WVC2 zF`oqo-keV@2p2xs|L8(;lgeJ@Mc1ESsuB6YAH=KkB4$d1A5W!q*|Z?v#$HW@h&5~` z!ObsAKZQ@7&$sKti{w|ocHU;&8snX~@yyx^wyI|rU*Dfv+a*`}sXle-&-TOn#3NSU i;otZtc|wEPceQ=CA?k*!{(WcxIoZ?I&t;ucLK6Tsaf)yN literal 0 HcmV?d00001 diff --git a/include/constants/items.h b/include/constants/items.h index 32c36a357..262219a59 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -700,7 +700,9 @@ #define ITEM_MAGMA_EMBLEM 614 #define ITEM_OLD_SEA_MAP 615 -#define ITEMS_COUNT 616 +#define ITEM_SHINY_CHARM 616 + +#define ITEMS_COUNT 617 #define ITEM_FIELD_ARROW ITEMS_COUNT #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 6c82404a1..9179658b0 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -86,6 +86,7 @@ // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 +#define SHINY_CHARM_REROLLS 3 // Amount of re-rolls if has Shiny Charm. // Flags for Get(Box)MonData / Set(Box)MonData #define MON_DATA_PERSONALITY 0 diff --git a/include/graphics.h b/include/graphics.h index 3e25aa210..9e4e12486 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4056,6 +4056,8 @@ extern const u32 gItemIcon_NormalGem[]; extern const u32 gItemIconPalette_NormalGem[]; extern const u32 gItemIcon_FairyGem[]; extern const u32 gItemIconPalette_FairyGem[]; +extern const u32 gItemIcon_ShinyCharm[]; +extern const u32 gItemIconPalette_ShinyCharm[]; // Gen 6 Items extern const u32 gItemIcon_AssaultVest[]; extern const u32 gItemIconPalette_AssaultVest[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 701e23e4a..8e6fe9012 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -1002,6 +1002,9 @@ const u32 gItemIconPalette_NormalGem[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_FairyGem[] = INCBIN_U32("graphics/items/icons/fairy_gem.4bpp.lz"); const u32 gItemIconPalette_FairyGem[] = INCBIN_U32("graphics/items/icon_palettes/fairy_gem.gbapal.lz"); +const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz"); +const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz"); + // Gen 6 Items const u32 gItemIcon_AssaultVest[] = INCBIN_U32("graphics/items/icons/assault_vest.4bpp.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index a5d3afd33..a53afe88d 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -417,6 +417,7 @@ const u32 *const gItemIconTable[][2] = [ITEM_STEEL_GEM] = {gItemIcon_SteelGem, gItemIconPalette_SteelGem}, [ITEM_NORMAL_GEM] = {gItemIcon_NormalGem, gItemIconPalette_NormalGem}, [ITEM_FAIRY_GEM] = {gItemIcon_FairyGem, gItemIconPalette_FairyGem}, + [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, // Gen 6 Items [ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest}, [ITEM_PIXIE_PLATE] = {gItemIcon_PixiePlate, gItemIconPalette_PixiePlate}, diff --git a/src/data/items.h b/src/data/items.h index c359d1c96..9940f2ee3 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7448,5 +7448,17 @@ const struct Item gItems[] = .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, - } + }, + + [ITEM_SHINY_CHARM] = + { + .name = _("Shiny Charm"), + .itemId = ITEM_SHINY_CHARM, + .price = 0, + .description = sShinyCharmDesc, + .pocket = POCKET_KEY_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 9c722e4dc..d159eab23 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -2788,3 +2788,8 @@ static const u8 sPrettyWingDesc[] = _( "A beautiful yet\n" "plain feather that\n" "does nothing."); + +static const u8 sShinyCharmDesc[] = _( + "A charm that will\n" + "raise the chance\n" + "of Shiny Pokémon."); diff --git a/src/pokemon.c b/src/pokemon.c index 2504d1a3c..94634cacd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2175,8 +2175,6 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, else personality = Random32(); - SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &personality); - //Determine original trainer ID if (otIdType == OT_ID_RANDOM_NO_SHINY) //Pokemon cannot be shiny { @@ -2197,8 +2195,21 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, | (gSaveBlock2Ptr->playerTrainerId[1] << 8) | (gSaveBlock2Ptr->playerTrainerId[2] << 16) | (gSaveBlock2Ptr->playerTrainerId[3] << 24); + + if (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) + { + u32 shinyValue; + u32 rolls = 0; + do + { + personality = Random32(); + shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality); + rolls++; + } while (shinyValue >= SHINY_ODDS && rolls < SHINY_CHARM_REROLLS); + } } + SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &personality); SetBoxMonData(boxMon, MON_DATA_OT_ID, &value); checksum = CalculateBoxMonChecksum(boxMon); From 0c0af89024742a71f4371c0016014078cae7dcf9 Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Sat, 22 Feb 2020 19:44:30 -0300 Subject: [PATCH 44/52] Ordered unordered item graphics and palettes. (#269) --- include/graphics.h | 354 ++++++++++++------------- src/data/graphics/items.h | 529 ++++++++++++++++++------------------- src/data/item_icon_table.h | 177 ++++++------- 3 files changed, 528 insertions(+), 532 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 9e4e12486..21b52b618 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4005,6 +4005,124 @@ extern const u32 gItemIcon_IronPlate[]; extern const u32 gItemIconPalette_IronPlate[]; extern const u32 gItemIcon_Honey[]; extern const u32 gItemIconPalette_Honey[]; +extern const u32 gItemIcon_OldGateau[]; +extern const u32 gItemIconPalette_OldGateau[]; +extern const u32 gItemIcon_XSpecialDefense[]; +extern const u32 gItemIconPalette_XSpecialDefense[]; +extern const u32 gItemIcon_DawnStone[]; +extern const u32 gItemIconPalette_DawnStone[]; +extern const u32 gItemIcon_DuskStone[]; +extern const u32 gItemIconPalette_DuskStone[]; +extern const u32 gItemIcon_ShinyStone[]; +extern const u32 gItemIconPalette_ShinyStone[]; +extern const u32 gItemIcon_RedApricorn[]; +extern const u32 gItemIconPalette_RedApricorn[]; +extern const u32 gItemIcon_BlueApricorn[]; +extern const u32 gItemIconPalette_BlueApricorn[]; +extern const u32 gItemIcon_YellowApricorn[]; +extern const u32 gItemIconPalette_YellowApricorn[]; +extern const u32 gItemIcon_GreenApricorn[]; +extern const u32 gItemIconPalette_GreenApricorn[]; +extern const u32 gItemIcon_PinkApricorn[]; +extern const u32 gItemIconPalette_PinkApricorn[]; +extern const u32 gItemIcon_WhiteApricorn[]; +extern const u32 gItemIconPalette_WhiteApricorn[]; +extern const u32 gItemIcon_BlackApricorn[]; +extern const u32 gItemIconPalette_BlackApricorn[]; +extern const u32 gItemIcon_RareBone[]; +extern const u32 gItemIconPalette_RareBone[]; +extern const u32 gItemIcon_OccaBerry[]; +extern const u32 gItemIconPalette_OccaBerry[]; +extern const u32 gItemIcon_PasshoBerry[]; +extern const u32 gItemIconPalette_PasshoBerry[]; +extern const u32 gItemIcon_WacanBerry[]; +extern const u32 gItemIconPalette_WacanBerry[]; +extern const u32 gItemIcon_RindoBerry[]; +extern const u32 gItemIconPalette_RindoBerry[]; +extern const u32 gItemIcon_YacheBerry[]; +extern const u32 gItemIconPalette_YacheBerry[]; +extern const u32 gItemIcon_ChopleBerry[]; +extern const u32 gItemIconPalette_ChopleBerry[]; +extern const u32 gItemIcon_KebiaBerry[]; +extern const u32 gItemIconPalette_KebiaBerry[]; +extern const u32 gItemIcon_ShucaBerry[]; +extern const u32 gItemIconPalette_ShucaBerry[]; +extern const u32 gItemIcon_CobaBerry[]; +extern const u32 gItemIconPalette_CobaBerry[]; +extern const u32 gItemIcon_PayapaBerry[]; +extern const u32 gItemIconPalette_PayapaBerry[]; +extern const u32 gItemIcon_TangaBerry[]; +extern const u32 gItemIconPalette_TangaBerry[]; +extern const u32 gItemIcon_ChartiBerry[]; +extern const u32 gItemIconPalette_ChartiBerry[]; +extern const u32 gItemIcon_KasibBerry[]; +extern const u32 gItemIconPalette_KasibBerry[]; +extern const u32 gItemIcon_HabanBerry[]; +extern const u32 gItemIconPalette_HabanBerry[]; +extern const u32 gItemIcon_ColburBerry[]; +extern const u32 gItemIconPalette_ColburBerry[]; +extern const u32 gItemIcon_BabiriBerry[]; +extern const u32 gItemIconPalette_BabiriBerry[]; +extern const u32 gItemIcon_ChilanBerry[]; +extern const u32 gItemIconPalette_ChilanBerry[]; +extern const u32 gItemIcon_MicleBerry[]; +extern const u32 gItemIconPalette_MicleBerry[]; +extern const u32 gItemIcon_CustapBerry[]; +extern const u32 gItemIconPalette_CustapBerry[]; +extern const u32 gItemIcon_JabocaBerry[]; +extern const u32 gItemIconPalette_JabocaBerry[]; +extern const u32 gItemIcon_RowapBerry[]; +extern const u32 gItemIconPalette_RowapBerry[]; +extern const u32 gItemIcon_OvalStone[]; +extern const u32 gItemIconPalette_OvalStone[]; +extern const u32 gItemIcon_Protector[]; +extern const u32 gItemIconPalette_Protector[]; +extern const u32 gItemIcon_Electirizer[]; +extern const u32 gItemIconPalette_Electirizer[]; +extern const u32 gItemIcon_Magmarizer[]; +extern const u32 gItemIconPalette_Magmarizer[]; +extern const u32 gItemIcon_DubiousDisc[]; +extern const u32 gItemIconPalette_DubiousDisc[]; +extern const u32 gItemIcon_ReaperCloth[]; +extern const u32 gItemIconPalette_ReaperCloth[]; +extern const u32 gItemIcon_RazorClaw[]; +extern const u32 gItemIconPalette_RazorClaw[]; +extern const u32 gItemIcon_RazorFang[]; +extern const u32 gItemIconPalette_RazorFang[]; +extern const u32 gItemIcon_PowerBracer[]; +extern const u32 gItemIconPalette_PowerBracer[]; +extern const u32 gItemIcon_PowerBelt[]; +extern const u32 gItemIconPalette_PowerBelt[]; +extern const u32 gItemIcon_PowerLens[]; +extern const u32 gItemIconPalette_PowerLens[]; +extern const u32 gItemIcon_PowerBand[]; +extern const u32 gItemIconPalette_PowerBand[]; +extern const u32 gItemIcon_PowerAnklet[]; +extern const u32 gItemIconPalette_PowerAnklet[]; +extern const u32 gItemIcon_PowerWeight[]; +extern const u32 gItemIconPalette_PowerWeight[]; +extern const u32 gItemIcon_OddIncense[]; +extern const u32 gItemIconPalette_OddIncense[]; +extern const u32 gItemIcon_RockIncense[]; +extern const u32 gItemIconPalette_RockIncense[]; +extern const u32 gItemIcon_FullIncense[]; +extern const u32 gItemIconPalette_FullIncense[]; +extern const u32 gItemIcon_WaveIncense[]; +extern const u32 gItemIconPalette_WaveIncense[]; +extern const u32 gItemIcon_RoseIncense[]; +extern const u32 gItemIconPalette_RoseIncense[]; +extern const u32 gItemIcon_LuckIncense[]; +extern const u32 gItemIconPalette_LuckIncense[]; +extern const u32 gItemIcon_PureIncense[]; +extern const u32 gItemIconPalette_PureIncense[]; +extern const u32 gItemIcon_OddKeystone[]; +extern const u32 gItemIconPalette_OddKeystone[]; +extern const u32 gItemIcon_Gracidea[]; +extern const u32 gItemIconPalette_Gracidea[]; +extern const u32 gItemIcon_ArmorFossil[]; +extern const u32 gItemIconPalette_ArmorFossil[]; +extern const u32 gItemIcon_SkullFossil[]; +extern const u32 gItemIconPalette_SkullFossil[]; // Gen 5 Items extern const u32 gItemIcon_Eviolite[]; extern const u32 gItemIconPalette_Eviolite[]; @@ -4056,6 +4174,42 @@ extern const u32 gItemIcon_NormalGem[]; extern const u32 gItemIconPalette_NormalGem[]; extern const u32 gItemIcon_FairyGem[]; extern const u32 gItemIconPalette_FairyGem[]; +extern const u32 gItemIcon_SweetHeart[]; +extern const u32 gItemIconPalette_SweetHeart[]; +extern const u32 gItemIcon_PrismScale[]; +extern const u32 gItemIconPalette_PrismScale[]; +extern const u32 gItemIcon_RockyHelmet[]; +extern const u32 gItemIconPalette_RockyHelmet[]; +extern const u32 gItemIcon_AirBalloon[]; +extern const u32 gItemIconPalette_AirBalloon[]; +extern const u32 gItemIcon_RedCard[]; +extern const u32 gItemIconPalette_RedCard[]; +extern const u32 gItemIcon_RingTarget[]; +extern const u32 gItemIconPalette_RingTarget[]; +extern const u32 gItemIcon_EjectButton[]; +extern const u32 gItemIconPalette_EjectButton[]; +extern const u32 gItemIcon_AbsorbBulb[]; +extern const u32 gItemIconPalette_AbsorbBulb[]; +extern const u32 gItemIcon_CellBattery[]; +extern const u32 gItemIconPalette_CellBattery[]; +extern const u32 gItemIcon_CoverFossil[]; +extern const u32 gItemIconPalette_CoverFossil[]; +extern const u32 gItemIcon_PlumeFossil[]; +extern const u32 gItemIconPalette_PlumeFossil[]; +extern const u32 gItemIcon_HealthWing[]; +extern const u32 gItemIconPalette_HealthWing[]; +extern const u32 gItemIcon_MuscleWing[]; +extern const u32 gItemIconPalette_MuscleWing[]; +extern const u32 gItemIcon_ResistWing[]; +extern const u32 gItemIconPalette_ResistWing[]; +extern const u32 gItemIcon_GeniusWing[]; +extern const u32 gItemIconPalette_GeniusWing[]; +extern const u32 gItemIcon_CleverWing[]; +extern const u32 gItemIconPalette_CleverWing[]; +extern const u32 gItemIcon_SwiftWing[]; +extern const u32 gItemIconPalette_SwiftWing[]; +extern const u32 gItemIcon_PrettyWing[]; +extern const u32 gItemIconPalette_PrettyWing[]; extern const u32 gItemIcon_ShinyCharm[]; extern const u32 gItemIconPalette_ShinyCharm[]; // Gen 6 Items @@ -4161,6 +4315,28 @@ extern const u32 gItemIcon_Beedrillite[]; extern const u32 gItemIconPalette_Beedrillite[]; extern const u32 gItemIcon_MegaBracelet[]; extern const u32 gItemIconPalette_MegaBracelet[]; +extern const u32 gItemIcon_AbilityCapsule[]; +extern const u32 gItemIconPalette_AbilityCapsule[]; +extern const u32 gItemIcon_RoseliBerry[]; +extern const u32 gItemIconPalette_RoseliBerry[]; +extern const u32 gItemIcon_KeeBerry[]; +extern const u32 gItemIconPalette_KeeBerry[]; +extern const u32 gItemIcon_MarangaBerry[]; +extern const u32 gItemIconPalette_MarangaBerry[]; +extern const u32 gItemIcon_WhippedDream[]; +extern const u32 gItemIconPalette_WhippedDream[]; +extern const u32 gItemIcon_Sachet[]; +extern const u32 gItemIconPalette_Sachet[]; +extern const u32 gItemIcon_LuminousMoss[]; +extern const u32 gItemIconPalette_LuminousMoss[]; +extern const u32 gItemIcon_Snowball[]; +extern const u32 gItemIconPalette_Snowball[]; +extern const u32 gItemIcon_WeaknessPolicy[]; +extern const u32 gItemIconPalette_WeaknessPolicy[]; +extern const u32 gItemIcon_JawFossil[]; +extern const u32 gItemIconPalette_JawFossil[]; +extern const u32 gItemIcon_SailFossil[]; +extern const u32 gItemIconPalette_SailFossil[]; // Gen 7 Items extern const u32 gItemIcon_ProtectivePads[]; extern const u32 gItemIconPalette_ProtectivePads[]; @@ -4176,39 +4352,10 @@ extern const u32 gItemIcon_PsychicSeed[]; extern const u32 gItemIconPalette_PsychicSeed[]; extern const u32 gItemIcon_AdrenalineOrb[]; extern const u32 gItemIconPalette_AdrenalineOrb[]; -// Unordered -extern const u32 gItemIcon_SweetHeart[]; -extern const u32 gItemIconPalette_SweetHeart[]; extern const u32 gItemIcon_BigMalasada[]; extern const u32 gItemIconPalette_BigMalasada[]; -extern const u32 gItemIcon_OldGateau[]; -extern const u32 gItemIconPalette_OldGateau[]; -extern const u32 gItemIcon_XSpecialDefense[]; -extern const u32 gItemIconPalette_XSpecialDefense[]; -extern const u32 gItemIcon_AbilityCapsule[]; -extern const u32 gItemIconPalette_AbilityCapsule[]; -extern const u32 gItemIcon_DawnStone[]; -extern const u32 gItemIconPalette_DawnStone[]; -extern const u32 gItemIcon_DuskStone[]; -extern const u32 gItemIconPalette_DuskStone[]; -extern const u32 gItemIcon_ShinyStone[]; -extern const u32 gItemIconPalette_ShinyStone[]; extern const u32 gItemIcon_IceStone[]; extern const u32 gItemIconPalette_IceStone[]; -extern const u32 gItemIcon_RedApricorn[]; -extern const u32 gItemIconPalette_RedApricorn[]; -extern const u32 gItemIcon_BlueApricorn[]; -extern const u32 gItemIconPalette_BlueApricorn[]; -extern const u32 gItemIcon_YellowApricorn[]; -extern const u32 gItemIconPalette_YellowApricorn[]; -extern const u32 gItemIcon_GreenApricorn[]; -extern const u32 gItemIconPalette_GreenApricorn[]; -extern const u32 gItemIcon_PinkApricorn[]; -extern const u32 gItemIconPalette_PinkApricorn[]; -extern const u32 gItemIcon_WhiteApricorn[]; -extern const u32 gItemIconPalette_WhiteApricorn[]; -extern const u32 gItemIcon_BlackApricorn[]; -extern const u32 gItemIconPalette_BlackApricorn[]; extern const u32 gItemIcon_RedNectar[]; extern const u32 gItemIconPalette_RedNectar[]; extern const u32 gItemIcon_YellowNectar[]; @@ -4217,128 +4364,6 @@ extern const u32 gItemIcon_PinkNectar[]; extern const u32 gItemIconPalette_PinkNectar[]; extern const u32 gItemIcon_PurpleNectar[]; extern const u32 gItemIconPalette_PurpleNectar[]; -extern const u32 gItemIcon_RareBone[]; -extern const u32 gItemIconPalette_RareBone[]; -extern const u32 gItemIcon_OccaBerry[]; -extern const u32 gItemIconPalette_OccaBerry[]; -extern const u32 gItemIcon_PasshoBerry[]; -extern const u32 gItemIconPalette_PasshoBerry[]; -extern const u32 gItemIcon_WacanBerry[]; -extern const u32 gItemIconPalette_WacanBerry[]; -extern const u32 gItemIcon_RindoBerry[]; -extern const u32 gItemIconPalette_RindoBerry[]; -extern const u32 gItemIcon_YacheBerry[]; -extern const u32 gItemIconPalette_YacheBerry[]; -extern const u32 gItemIcon_ChopleBerry[]; -extern const u32 gItemIconPalette_ChopleBerry[]; -extern const u32 gItemIcon_KebiaBerry[]; -extern const u32 gItemIconPalette_KebiaBerry[]; -extern const u32 gItemIcon_ShucaBerry[]; -extern const u32 gItemIconPalette_ShucaBerry[]; -extern const u32 gItemIcon_CobaBerry[]; -extern const u32 gItemIconPalette_CobaBerry[]; -extern const u32 gItemIcon_PayapaBerry[]; -extern const u32 gItemIconPalette_PayapaBerry[]; -extern const u32 gItemIcon_TangaBerry[]; -extern const u32 gItemIconPalette_TangaBerry[]; -extern const u32 gItemIcon_ChartiBerry[]; -extern const u32 gItemIconPalette_ChartiBerry[]; -extern const u32 gItemIcon_KasibBerry[]; -extern const u32 gItemIconPalette_KasibBerry[]; -extern const u32 gItemIcon_HabanBerry[]; -extern const u32 gItemIconPalette_HabanBerry[]; -extern const u32 gItemIcon_ColburBerry[]; -extern const u32 gItemIconPalette_ColburBerry[]; -extern const u32 gItemIcon_BabiriBerry[]; -extern const u32 gItemIconPalette_BabiriBerry[]; -extern const u32 gItemIcon_ChilanBerry[]; -extern const u32 gItemIconPalette_ChilanBerry[]; -extern const u32 gItemIcon_MicleBerry[]; -extern const u32 gItemIconPalette_MicleBerry[]; -extern const u32 gItemIcon_CustapBerry[]; -extern const u32 gItemIconPalette_CustapBerry[]; -extern const u32 gItemIcon_JabocaBerry[]; -extern const u32 gItemIconPalette_JabocaBerry[]; -extern const u32 gItemIcon_RowapBerry[]; -extern const u32 gItemIconPalette_RowapBerry[]; -extern const u32 gItemIcon_RoseliBerry[]; -extern const u32 gItemIconPalette_RoseliBerry[]; -extern const u32 gItemIcon_KeeBerry[]; -extern const u32 gItemIconPalette_KeeBerry[]; -extern const u32 gItemIcon_MarangaBerry[]; -extern const u32 gItemIconPalette_MarangaBerry[]; -extern const u32 gItemIcon_OvalStone[]; -extern const u32 gItemIconPalette_OvalStone[]; -extern const u32 gItemIcon_Protector[]; -extern const u32 gItemIconPalette_Protector[]; -extern const u32 gItemIcon_Electirizer[]; -extern const u32 gItemIconPalette_Electirizer[]; -extern const u32 gItemIcon_Magmarizer[]; -extern const u32 gItemIconPalette_Magmarizer[]; -extern const u32 gItemIcon_DubiousDisc[]; -extern const u32 gItemIconPalette_DubiousDisc[]; -extern const u32 gItemIcon_ReaperCloth[]; -extern const u32 gItemIconPalette_ReaperCloth[]; -extern const u32 gItemIcon_RazorClaw[]; -extern const u32 gItemIconPalette_RazorClaw[]; -extern const u32 gItemIcon_RazorFang[]; -extern const u32 gItemIconPalette_RazorFang[]; -extern const u32 gItemIcon_PrismScale[]; -extern const u32 gItemIconPalette_PrismScale[]; -extern const u32 gItemIcon_WhippedDream[]; -extern const u32 gItemIconPalette_WhippedDream[]; -extern const u32 gItemIcon_Sachet[]; -extern const u32 gItemIconPalette_Sachet[]; -extern const u32 gItemIcon_PowerBracer[]; -extern const u32 gItemIconPalette_PowerBracer[]; -extern const u32 gItemIcon_PowerBelt[]; -extern const u32 gItemIconPalette_PowerBelt[]; -extern const u32 gItemIcon_PowerLens[]; -extern const u32 gItemIconPalette_PowerLens[]; -extern const u32 gItemIcon_PowerBand[]; -extern const u32 gItemIconPalette_PowerBand[]; -extern const u32 gItemIcon_PowerAnklet[]; -extern const u32 gItemIconPalette_PowerAnklet[]; -extern const u32 gItemIcon_PowerWeight[]; -extern const u32 gItemIconPalette_PowerWeight[]; -extern const u32 gItemIcon_RockyHelmet[]; -extern const u32 gItemIconPalette_RockyHelmet[]; -extern const u32 gItemIcon_AirBalloon[]; -extern const u32 gItemIconPalette_AirBalloon[]; -extern const u32 gItemIcon_RedCard[]; -extern const u32 gItemIconPalette_RedCard[]; -extern const u32 gItemIcon_RingTarget[]; -extern const u32 gItemIconPalette_RingTarget[]; -extern const u32 gItemIcon_EjectButton[]; -extern const u32 gItemIconPalette_EjectButton[]; -extern const u32 gItemIcon_AbsorbBulb[]; -extern const u32 gItemIconPalette_AbsorbBulb[]; -extern const u32 gItemIcon_CellBattery[]; -extern const u32 gItemIconPalette_CellBattery[]; -extern const u32 gItemIcon_LuminousMoss[]; -extern const u32 gItemIconPalette_LuminousMoss[]; -extern const u32 gItemIcon_Snowball[]; -extern const u32 gItemIconPalette_Snowball[]; -extern const u32 gItemIcon_WeaknessPolicy[]; -extern const u32 gItemIconPalette_WeaknessPolicy[]; -extern const u32 gItemIcon_OddIncense[]; -extern const u32 gItemIconPalette_OddIncense[]; -extern const u32 gItemIcon_RockIncense[]; -extern const u32 gItemIconPalette_RockIncense[]; -extern const u32 gItemIcon_FullIncense[]; -extern const u32 gItemIconPalette_FullIncense[]; -extern const u32 gItemIcon_WaveIncense[]; -extern const u32 gItemIconPalette_WaveIncense[]; -extern const u32 gItemIcon_RoseIncense[]; -extern const u32 gItemIconPalette_RoseIncense[]; -extern const u32 gItemIcon_LuckIncense[]; -extern const u32 gItemIconPalette_LuckIncense[]; -extern const u32 gItemIcon_PureIncense[]; -extern const u32 gItemIconPalette_PureIncense[]; -extern const u32 gItemIcon_OddKeystone[]; -extern const u32 gItemIconPalette_OddKeystone[]; -extern const u32 gItemIcon_Gracidea[]; -extern const u32 gItemIconPalette_Gracidea[]; extern const u32 gItemIcon_BugMemory[]; extern const u32 gItemIconPalette_BugMemory[]; extern const u32 gItemIcon_DarkMemory[]; @@ -4373,32 +4398,7 @@ extern const u32 gItemIcon_SteelMemory[]; extern const u32 gItemIconPalette_SteelMemory[]; extern const u32 gItemIcon_WaterMemory[]; extern const u32 gItemIconPalette_WaterMemory[]; -extern const u32 gItemIcon_ArmorFossil[]; -extern const u32 gItemIconPalette_ArmorFossil[]; -extern const u32 gItemIcon_SkullFossil[]; -extern const u32 gItemIconPalette_SkullFossil[]; -extern const u32 gItemIcon_CoverFossil[]; -extern const u32 gItemIconPalette_CoverFossil[]; -extern const u32 gItemIcon_PlumeFossil[]; -extern const u32 gItemIconPalette_PlumeFossil[]; -extern const u32 gItemIcon_JawFossil[]; -extern const u32 gItemIconPalette_JawFossil[]; -extern const u32 gItemIcon_SailFossil[]; -extern const u32 gItemIconPalette_SailFossil[]; -extern const u32 gItemIcon_HealthWing[]; -extern const u32 gItemIconPalette_HealthWing[]; -extern const u32 gItemIcon_MuscleWing[]; -extern const u32 gItemIconPalette_MuscleWing[]; -extern const u32 gItemIcon_ResistWing[]; -extern const u32 gItemIconPalette_ResistWing[]; -extern const u32 gItemIcon_GeniusWing[]; -extern const u32 gItemIconPalette_GeniusWing[]; -extern const u32 gItemIcon_CleverWing[]; -extern const u32 gItemIconPalette_CleverWing[]; -extern const u32 gItemIcon_SwiftWing[]; -extern const u32 gItemIconPalette_SwiftWing[]; -extern const u32 gItemIcon_PrettyWing[]; -extern const u32 gItemIconPalette_PrettyWing[]; + extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 8e6fe9012..499344ddb 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -925,6 +925,183 @@ const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_Honey[] = INCBIN_U32("graphics/items/icons/honey.4bpp.lz"); const u32 gItemIconPalette_Honey[] = INCBIN_U32("graphics/items/icon_palettes/honey.gbapal.lz"); +const u32 gItemIcon_OldGateau[] = INCBIN_U32("graphics/items/icons/old_gateau.4bpp.lz"); +const u32 gItemIconPalette_OldGateau[] = INCBIN_U32("graphics/items/icon_palettes/old_gateau.gbapal.lz"); + +const u32 gItemIcon_XSpecialDefense[] = INCBIN_U32("graphics/items/icons/x_special_defense.4bpp.lz"); +const u32 gItemIconPalette_XSpecialDefense[] = INCBIN_U32("graphics/items/icon_palettes/x_special_defense.gbapal.lz"); + +const u32 gItemIcon_DawnStone[] = INCBIN_U32("graphics/items/icons/dawn_stone.4bpp.lz"); +const u32 gItemIconPalette_DawnStone[] = INCBIN_U32("graphics/items/icon_palettes/dawn_stone.gbapal.lz"); + +const u32 gItemIcon_DuskStone[] = INCBIN_U32("graphics/items/icons/dusk_stone.4bpp.lz"); +const u32 gItemIconPalette_DuskStone[] = INCBIN_U32("graphics/items/icon_palettes/dusk_stone.gbapal.lz"); + +const u32 gItemIcon_ShinyStone[] = INCBIN_U32("graphics/items/icons/shiny_stone.4bpp.lz"); +const u32 gItemIconPalette_ShinyStone[] = INCBIN_U32("graphics/items/icon_palettes/shiny_stone.gbapal.lz"); + +const u32 gItemIcon_RedApricorn[] = INCBIN_U32("graphics/items/icons/red_apricorn.4bpp.lz"); +const u32 gItemIconPalette_RedApricorn[] = INCBIN_U32("graphics/items/icon_palettes/red_apricorn.gbapal.lz"); + +const u32 gItemIcon_BlueApricorn[] = INCBIN_U32("graphics/items/icons/blue_apricorn.4bpp.lz"); +const u32 gItemIconPalette_BlueApricorn[] = INCBIN_U32("graphics/items/icon_palettes/blue_apricorn.gbapal.lz"); + +const u32 gItemIcon_YellowApricorn[] = INCBIN_U32("graphics/items/icons/yellow_apricorn.4bpp.lz"); +const u32 gItemIconPalette_YellowApricorn[] = INCBIN_U32("graphics/items/icon_palettes/yellow_apricorn.gbapal.lz"); + +const u32 gItemIcon_GreenApricorn[] = INCBIN_U32("graphics/items/icons/green_apricorn.4bpp.lz"); +const u32 gItemIconPalette_GreenApricorn[] = INCBIN_U32("graphics/items/icon_palettes/green_apricorn.gbapal.lz"); + +const u32 gItemIcon_PinkApricorn[] = INCBIN_U32("graphics/items/icons/pink_apricorn.4bpp.lz"); +const u32 gItemIconPalette_PinkApricorn[] = INCBIN_U32("graphics/items/icon_palettes/pink_apricorn.gbapal.lz"); + +const u32 gItemIcon_WhiteApricorn[] = INCBIN_U32("graphics/items/icons/white_apricorn.4bpp.lz"); +const u32 gItemIconPalette_WhiteApricorn[] = INCBIN_U32("graphics/items/icon_palettes/white_apricorn.gbapal.lz"); + +const u32 gItemIcon_BlackApricorn[] = INCBIN_U32("graphics/items/icons/black_apricorn.4bpp.lz"); +const u32 gItemIconPalette_BlackApricorn[] = INCBIN_U32("graphics/items/icon_palettes/black_apricorn.gbapal.lz"); + +const u32 gItemIcon_RareBone[] = INCBIN_U32("graphics/items/icons/rare_bone.4bpp.lz"); +const u32 gItemIconPalette_RareBone[] = INCBIN_U32("graphics/items/icon_palettes/rare_bone.gbapal.lz"); + +const u32 gItemIcon_OccaBerry[] = INCBIN_U32("graphics/items/icons/occa_berry.4bpp.lz"); +const u32 gItemIconPalette_OccaBerry[] = INCBIN_U32("graphics/items/icon_palettes/occa_berry.gbapal.lz"); + +const u32 gItemIcon_PasshoBerry[] = INCBIN_U32("graphics/items/icons/passho_berry.4bpp.lz"); +const u32 gItemIconPalette_PasshoBerry[] = INCBIN_U32("graphics/items/icon_palettes/passho_berry.gbapal.lz"); + +const u32 gItemIcon_WacanBerry[] = INCBIN_U32("graphics/items/icons/wacan_berry.4bpp.lz"); +const u32 gItemIconPalette_WacanBerry[] = INCBIN_U32("graphics/items/icon_palettes/wacan_berry.gbapal.lz"); + +const u32 gItemIcon_RindoBerry[] = INCBIN_U32("graphics/items/icons/rindo_berry.4bpp.lz"); +const u32 gItemIconPalette_RindoBerry[] = INCBIN_U32("graphics/items/icon_palettes/rindo_berry.gbapal.lz"); + +const u32 gItemIcon_YacheBerry[] = INCBIN_U32("graphics/items/icons/yache_berry.4bpp.lz"); +const u32 gItemIconPalette_YacheBerry[] = INCBIN_U32("graphics/items/icon_palettes/yache_berry.gbapal.lz"); + +const u32 gItemIcon_ChopleBerry[] = INCBIN_U32("graphics/items/icons/chople_berry.4bpp.lz"); +const u32 gItemIconPalette_ChopleBerry[] = INCBIN_U32("graphics/items/icon_palettes/chople_berry.gbapal.lz"); + +const u32 gItemIcon_KebiaBerry[] = INCBIN_U32("graphics/items/icons/kebia_berry.4bpp.lz"); +const u32 gItemIconPalette_KebiaBerry[] = INCBIN_U32("graphics/items/icon_palettes/kebia_berry.gbapal.lz"); + +const u32 gItemIcon_ShucaBerry[] = INCBIN_U32("graphics/items/icons/shuca_berry.4bpp.lz"); +const u32 gItemIconPalette_ShucaBerry[] = INCBIN_U32("graphics/items/icon_palettes/shuca_berry.gbapal.lz"); + +const u32 gItemIcon_CobaBerry[] = INCBIN_U32("graphics/items/icons/coba_berry.4bpp.lz"); +const u32 gItemIconPalette_CobaBerry[] = INCBIN_U32("graphics/items/icon_palettes/coba_berry.gbapal.lz"); + +const u32 gItemIcon_PayapaBerry[] = INCBIN_U32("graphics/items/icons/payapa_berry.4bpp.lz"); +const u32 gItemIconPalette_PayapaBerry[] = INCBIN_U32("graphics/items/icon_palettes/payapa_berry.gbapal.lz"); + +const u32 gItemIcon_TangaBerry[] = INCBIN_U32("graphics/items/icons/tanga_berry.4bpp.lz"); +const u32 gItemIconPalette_TangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/tanga_berry.gbapal.lz"); + +const u32 gItemIcon_ChartiBerry[] = INCBIN_U32("graphics/items/icons/charti_berry.4bpp.lz"); +const u32 gItemIconPalette_ChartiBerry[] = INCBIN_U32("graphics/items/icon_palettes/charti_berry.gbapal.lz"); + +const u32 gItemIcon_KasibBerry[] = INCBIN_U32("graphics/items/icons/kasib_berry.4bpp.lz"); +const u32 gItemIconPalette_KasibBerry[] = INCBIN_U32("graphics/items/icon_palettes/kasib_berry.gbapal.lz"); + +const u32 gItemIcon_HabanBerry[] = INCBIN_U32("graphics/items/icons/haban_berry.4bpp.lz"); +const u32 gItemIconPalette_HabanBerry[] = INCBIN_U32("graphics/items/icon_palettes/haban_berry.gbapal.lz"); + +const u32 gItemIcon_ColburBerry[] = INCBIN_U32("graphics/items/icons/colbur_berry.4bpp.lz"); +const u32 gItemIconPalette_ColburBerry[] = INCBIN_U32("graphics/items/icon_palettes/colbur_berry.gbapal.lz"); + +const u32 gItemIcon_BabiriBerry[] = INCBIN_U32("graphics/items/icons/babiri_berry.4bpp.lz"); +const u32 gItemIconPalette_BabiriBerry[] = INCBIN_U32("graphics/items/icon_palettes/babiri_berry.gbapal.lz"); + +const u32 gItemIcon_ChilanBerry[] = INCBIN_U32("graphics/items/icons/chilan_berry.4bpp.lz"); +const u32 gItemIconPalette_ChilanBerry[] = INCBIN_U32("graphics/items/icon_palettes/chilan_berry.gbapal.lz"); + +const u32 gItemIcon_MicleBerry[] = INCBIN_U32("graphics/items/icons/micle_berry.4bpp.lz"); +const u32 gItemIconPalette_MicleBerry[] = INCBIN_U32("graphics/items/icon_palettes/micle_berry.gbapal.lz"); + +const u32 gItemIcon_CustapBerry[] = INCBIN_U32("graphics/items/icons/custap_berry.4bpp.lz"); +const u32 gItemIconPalette_CustapBerry[] = INCBIN_U32("graphics/items/icon_palettes/custap_berry.gbapal.lz"); + +const u32 gItemIcon_JabocaBerry[] = INCBIN_U32("graphics/items/icons/jaboca_berry.4bpp.lz"); +const u32 gItemIconPalette_JabocaBerry[] = INCBIN_U32("graphics/items/icon_palettes/jaboca_berry.gbapal.lz"); + +const u32 gItemIcon_RowapBerry[] = INCBIN_U32("graphics/items/icons/rowap_berry.4bpp.lz"); +const u32 gItemIconPalette_RowapBerry[] = INCBIN_U32("graphics/items/icon_palettes/rowap_berry.gbapal.lz"); + +const u32 gItemIcon_OvalStone[] = INCBIN_U32("graphics/items/icons/oval_stone.4bpp.lz"); +const u32 gItemIconPalette_OvalStone[] = INCBIN_U32("graphics/items/icon_palettes/oval_stone.gbapal.lz"); + +const u32 gItemIcon_Protector[] = INCBIN_U32("graphics/items/icons/protector.4bpp.lz"); +const u32 gItemIconPalette_Protector[] = INCBIN_U32("graphics/items/icon_palettes/protector.gbapal.lz"); + +const u32 gItemIcon_Electirizer[] = INCBIN_U32("graphics/items/icons/electirizer.4bpp.lz"); +const u32 gItemIconPalette_Electirizer[] = INCBIN_U32("graphics/items/icon_palettes/electirizer.gbapal.lz"); + +const u32 gItemIcon_Magmarizer[] = INCBIN_U32("graphics/items/icons/magmarizer.4bpp.lz"); +const u32 gItemIconPalette_Magmarizer[] = INCBIN_U32("graphics/items/icon_palettes/magmarizer.gbapal.lz"); + +const u32 gItemIcon_DubiousDisc[] = INCBIN_U32("graphics/items/icons/dubious_disc.4bpp.lz"); +const u32 gItemIconPalette_DubiousDisc[] = INCBIN_U32("graphics/items/icon_palettes/dubious_disc.gbapal.lz"); + +const u32 gItemIcon_ReaperCloth[] = INCBIN_U32("graphics/items/icons/reaper_cloth.4bpp.lz"); +const u32 gItemIconPalette_ReaperCloth[] = INCBIN_U32("graphics/items/icon_palettes/reaper_cloth.gbapal.lz"); + +const u32 gItemIcon_RazorClaw[] = INCBIN_U32("graphics/items/icons/razor_claw.4bpp.lz"); +const u32 gItemIconPalette_RazorClaw[] = INCBIN_U32("graphics/items/icon_palettes/razor_claw.gbapal.lz"); + +const u32 gItemIcon_RazorFang[] = INCBIN_U32("graphics/items/icons/razor_fang.4bpp.lz"); +const u32 gItemIconPalette_RazorFang[] = INCBIN_U32("graphics/items/icon_palettes/razor_fang.gbapal.lz"); + +const u32 gItemIcon_PowerBracer[] = INCBIN_U32("graphics/items/icons/power_bracer.4bpp.lz"); +const u32 gItemIconPalette_PowerBracer[] = INCBIN_U32("graphics/items/icon_palettes/power_bracer.gbapal.lz"); + +const u32 gItemIcon_PowerBelt[] = INCBIN_U32("graphics/items/icons/power_belt.4bpp.lz"); +const u32 gItemIconPalette_PowerBelt[] = INCBIN_U32("graphics/items/icon_palettes/power_belt.gbapal.lz"); + +const u32 gItemIcon_PowerLens[] = INCBIN_U32("graphics/items/icons/power_lens.4bpp.lz"); +const u32 gItemIconPalette_PowerLens[] = INCBIN_U32("graphics/items/icon_palettes/power_lens.gbapal.lz"); + +const u32 gItemIcon_PowerBand[] = INCBIN_U32("graphics/items/icons/power_band.4bpp.lz"); +const u32 gItemIconPalette_PowerBand[] = INCBIN_U32("graphics/items/icon_palettes/power_band.gbapal.lz"); + +const u32 gItemIcon_PowerAnklet[] = INCBIN_U32("graphics/items/icons/power_anklet.4bpp.lz"); +const u32 gItemIconPalette_PowerAnklet[] = INCBIN_U32("graphics/items/icon_palettes/power_anklet.gbapal.lz"); + +const u32 gItemIcon_PowerWeight[] = INCBIN_U32("graphics/items/icons/power_weight.4bpp.lz"); +const u32 gItemIconPalette_PowerWeight[] = INCBIN_U32("graphics/items/icon_palettes/power_weight.gbapal.lz"); + +const u32 gItemIcon_OddIncense[] = INCBIN_U32("graphics/items/icons/odd_incense.4bpp.lz"); +const u32 gItemIconPalette_OddIncense[] = INCBIN_U32("graphics/items/icon_palettes/odd_incense.gbapal.lz"); + +const u32 gItemIcon_RockIncense[] = INCBIN_U32("graphics/items/icons/rock_incense.4bpp.lz"); +const u32 gItemIconPalette_RockIncense[] = INCBIN_U32("graphics/items/icon_palettes/rock_incense.gbapal.lz"); + +const u32 gItemIcon_FullIncense[] = INCBIN_U32("graphics/items/icons/full_incense.4bpp.lz"); +const u32 gItemIconPalette_FullIncense[] = INCBIN_U32("graphics/items/icon_palettes/full_incense.gbapal.lz"); + +const u32 gItemIcon_WaveIncense[] = INCBIN_U32("graphics/items/icons/wave_incense.4bpp.lz"); +const u32 gItemIconPalette_WaveIncense[] = INCBIN_U32("graphics/items/icon_palettes/wave_incense.gbapal.lz"); + +const u32 gItemIcon_RoseIncense[] = INCBIN_U32("graphics/items/icons/rose_incense.4bpp.lz"); +const u32 gItemIconPalette_RoseIncense[] = INCBIN_U32("graphics/items/icon_palettes/rose_incense.gbapal.lz"); + +const u32 gItemIcon_LuckIncense[] = INCBIN_U32("graphics/items/icons/luck_incense.4bpp.lz"); +const u32 gItemIconPalette_LuckIncense[] = INCBIN_U32("graphics/items/icon_palettes/luck_incense.gbapal.lz"); + +const u32 gItemIcon_PureIncense[] = INCBIN_U32("graphics/items/icons/pure_incense.4bpp.lz"); +const u32 gItemIconPalette_PureIncense[] = INCBIN_U32("graphics/items/icon_palettes/pure_incense.gbapal.lz"); + +const u32 gItemIcon_OddKeystone[] = INCBIN_U32("graphics/items/icons/odd_keystone.4bpp.lz"); +const u32 gItemIconPalette_OddKeystone[] = INCBIN_U32("graphics/items/icon_palettes/odd_keystone.gbapal.lz"); + +const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); +const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); + +const u32 gItemIcon_ArmorFossil[] = INCBIN_U32("graphics/items/icons/armor_fossil.4bpp.lz"); +const u32 gItemIconPalette_ArmorFossil[] = INCBIN_U32("graphics/items/icon_palettes/armor_fossil.gbapal.lz"); + +const u32 gItemIcon_SkullFossil[] = INCBIN_U32("graphics/items/icons/skull_fossil.4bpp.lz"); +const u32 gItemIconPalette_SkullFossil[] = INCBIN_U32("graphics/items/icon_palettes/skull_fossil.gbapal.lz"); + // Gen 5 Items const u32 gItemIcon_Eviolite[] = INCBIN_U32("graphics/items/icons/eviolite.4bpp.lz"); @@ -1002,6 +1179,59 @@ const u32 gItemIconPalette_NormalGem[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_FairyGem[] = INCBIN_U32("graphics/items/icons/fairy_gem.4bpp.lz"); const u32 gItemIconPalette_FairyGem[] = INCBIN_U32("graphics/items/icon_palettes/fairy_gem.gbapal.lz"); +const u32 gItemIcon_SweetHeart[] = INCBIN_U32("graphics/items/icons/sweet_heart.4bpp.lz"); +const u32 gItemIconPalette_SweetHeart[] = INCBIN_U32("graphics/items/icon_palettes/sweet_heart.gbapal.lz"); + +const u32 gItemIcon_PrismScale[] = INCBIN_U32("graphics/items/icons/prism_scale.4bpp.lz"); +const u32 gItemIconPalette_PrismScale[] = INCBIN_U32("graphics/items/icon_palettes/prism_scale.gbapal.lz"); + +const u32 gItemIcon_RockyHelmet[] = INCBIN_U32("graphics/items/icons/rocky_helmet.4bpp.lz"); +const u32 gItemIconPalette_RockyHelmet[] = INCBIN_U32("graphics/items/icon_palettes/rocky_helmet.gbapal.lz"); + +const u32 gItemIcon_AirBalloon[] = INCBIN_U32("graphics/items/icons/air_balloon.4bpp.lz"); +const u32 gItemIconPalette_AirBalloon[] = INCBIN_U32("graphics/items/icon_palettes/air_balloon.gbapal.lz"); + +const u32 gItemIcon_RedCard[] = INCBIN_U32("graphics/items/icons/red_card.4bpp.lz"); +const u32 gItemIconPalette_RedCard[] = INCBIN_U32("graphics/items/icon_palettes/red_card.gbapal.lz"); + +const u32 gItemIcon_RingTarget[] = INCBIN_U32("graphics/items/icons/ring_target.4bpp.lz"); +const u32 gItemIconPalette_RingTarget[] = INCBIN_U32("graphics/items/icon_palettes/ring_target.gbapal.lz"); + +const u32 gItemIcon_EjectButton[] = INCBIN_U32("graphics/items/icons/eject_button.4bpp.lz"); +const u32 gItemIconPalette_EjectButton[] = INCBIN_U32("graphics/items/icon_palettes/eject_button.gbapal.lz"); + +const u32 gItemIcon_AbsorbBulb[] = INCBIN_U32("graphics/items/icons/absorb_bulb.4bpp.lz"); +const u32 gItemIconPalette_AbsorbBulb[] = INCBIN_U32("graphics/items/icon_palettes/absorb_bulb.gbapal.lz"); + +const u32 gItemIcon_CellBattery[] = INCBIN_U32("graphics/items/icons/cell_battery.4bpp.lz"); +const u32 gItemIconPalette_CellBattery[] = INCBIN_U32("graphics/items/icon_palettes/cell_battery.gbapal.lz"); + +const u32 gItemIcon_CoverFossil[] = INCBIN_U32("graphics/items/icons/cover_fossil.4bpp.lz"); +const u32 gItemIconPalette_CoverFossil[] = INCBIN_U32("graphics/items/icon_palettes/cover_fossil.gbapal.lz"); + +const u32 gItemIcon_PlumeFossil[] = INCBIN_U32("graphics/items/icons/plume_fossil.4bpp.lz"); +const u32 gItemIconPalette_PlumeFossil[] = INCBIN_U32("graphics/items/icon_palettes/plume_fossil.gbapal.lz"); + +const u32 gItemIcon_HealthWing[] = INCBIN_U32("graphics/items/icons/health_wing.4bpp.lz"); +const u32 gItemIconPalette_HealthWing[] = INCBIN_U32("graphics/items/icon_palettes/health_wing.gbapal.lz"); + +const u32 gItemIcon_MuscleWing[] = INCBIN_U32("graphics/items/icons/muscle_wing.4bpp.lz"); +const u32 gItemIconPalette_MuscleWing[] = INCBIN_U32("graphics/items/icon_palettes/muscle_wing.gbapal.lz"); + +const u32 gItemIcon_ResistWing[] = INCBIN_U32("graphics/items/icons/resist_wing.4bpp.lz"); +const u32 gItemIconPalette_ResistWing[] = INCBIN_U32("graphics/items/icon_palettes/resist_wing.gbapal.lz"); + +const u32 gItemIcon_GeniusWing[] = INCBIN_U32("graphics/items/icons/genius_wing.4bpp.lz"); +const u32 gItemIconPalette_GeniusWing[] = INCBIN_U32("graphics/items/icon_palettes/genius_wing.gbapal.lz"); + +const u32 gItemIcon_CleverWing[] = INCBIN_U32("graphics/items/icons/clever_wing.4bpp.lz"); +const u32 gItemIconPalette_CleverWing[] = INCBIN_U32("graphics/items/icon_palettes/clever_wing.gbapal.lz"); + +const u32 gItemIcon_SwiftWing[] = INCBIN_U32("graphics/items/icons/swift_wing.4bpp.lz"); +const u32 gItemIconPalette_SwiftWing[] = INCBIN_U32("graphics/items/icon_palettes/swift_wing.gbapal.lz"); + +const u32 gItemIcon_PrettyWing[] = INCBIN_U32("graphics/items/icons/pretty_wing.4bpp.lz"); +const u32 gItemIconPalette_PrettyWing[] = INCBIN_U32("graphics/items/icon_palettes/pretty_wing.gbapal.lz"); const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz"); const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz"); @@ -1160,6 +1390,39 @@ const u32 gItemIconPalette_Beedrillite[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz"); const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz"); +const u32 gItemIcon_AbilityCapsule[] = INCBIN_U32("graphics/items/icons/ability_capsule.4bpp.lz"); +const u32 gItemIconPalette_AbilityCapsule[] = INCBIN_U32("graphics/items/icon_palettes/ability_capsule.gbapal.lz"); + +const u32 gItemIcon_RoseliBerry[] = INCBIN_U32("graphics/items/icons/roseli_berry.4bpp.lz"); +const u32 gItemIconPalette_RoseliBerry[] = INCBIN_U32("graphics/items/icon_palettes/roseli_berry.gbapal.lz"); + +const u32 gItemIcon_KeeBerry[] = INCBIN_U32("graphics/items/icons/kee_berry.4bpp.lz"); +const u32 gItemIconPalette_KeeBerry[] = INCBIN_U32("graphics/items/icon_palettes/kee_berry.gbapal.lz"); + +const u32 gItemIcon_MarangaBerry[] = INCBIN_U32("graphics/items/icons/maranga_berry.4bpp.lz"); +const u32 gItemIconPalette_MarangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/maranga_berry.gbapal.lz"); + +const u32 gItemIcon_WhippedDream[] = INCBIN_U32("graphics/items/icons/whipped_dream.4bpp.lz"); +const u32 gItemIconPalette_WhippedDream[] = INCBIN_U32("graphics/items/icon_palettes/whipped_dream.gbapal.lz"); + +const u32 gItemIcon_Sachet[] = INCBIN_U32("graphics/items/icons/sachet.4bpp.lz"); +const u32 gItemIconPalette_Sachet[] = INCBIN_U32("graphics/items/icon_palettes/sachet.gbapal.lz"); + +const u32 gItemIcon_LuminousMoss[] = INCBIN_U32("graphics/items/icons/luminous_moss.4bpp.lz"); +const u32 gItemIconPalette_LuminousMoss[] = INCBIN_U32("graphics/items/icon_palettes/luminous_moss.gbapal.lz"); + +const u32 gItemIcon_Snowball[] = INCBIN_U32("graphics/items/icons/snowball.4bpp.lz"); +const u32 gItemIconPalette_Snowball[] = INCBIN_U32("graphics/items/icon_palettes/snowball.gbapal.lz"); + +const u32 gItemIcon_WeaknessPolicy[] = INCBIN_U32("graphics/items/icons/weakness_policy.4bpp.lz"); +const u32 gItemIconPalette_WeaknessPolicy[] = INCBIN_U32("graphics/items/icon_palettes/weakness_policy.gbapal.lz"); + +const u32 gItemIcon_JawFossil[] = INCBIN_U32("graphics/items/icons/jaw_fossil.4bpp.lz"); +const u32 gItemIconPalette_JawFossil[] = INCBIN_U32("graphics/items/icon_palettes/jaw_fossil.gbapal.lz"); + +const u32 gItemIcon_SailFossil[] = INCBIN_U32("graphics/items/icons/sail_fossil.4bpp.lz"); +const u32 gItemIconPalette_SailFossil[] = INCBIN_U32("graphics/items/icon_palettes/sail_fossil.gbapal.lz"); + // Gen 7 Items const u32 gItemIcon_ProtectivePads[] = INCBIN_U32("graphics/items/icons/protective_pads.4bpp.lz"); @@ -1183,56 +1446,12 @@ const u32 gItemIconPalette_PsychicSeed[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_AdrenalineOrb[] = INCBIN_U32("graphics/items/icons/adrenaline_orb.4bpp.lz"); const u32 gItemIconPalette_AdrenalineOrb[] = INCBIN_U32("graphics/items/icon_palettes/adrenaline_orb.gbapal.lz"); -// Unordered - -const u32 gItemIcon_SweetHeart[] = INCBIN_U32("graphics/items/icons/sweet_heart.4bpp.lz"); -const u32 gItemIconPalette_SweetHeart[] = INCBIN_U32("graphics/items/icon_palettes/sweet_heart.gbapal.lz"); - const u32 gItemIcon_BigMalasada[] = INCBIN_U32("graphics/items/icons/big_malasada.4bpp.lz"); const u32 gItemIconPalette_BigMalasada[] = INCBIN_U32("graphics/items/icon_palettes/big_malasada.gbapal.lz"); -const u32 gItemIcon_OldGateau[] = INCBIN_U32("graphics/items/icons/old_gateau.4bpp.lz"); -const u32 gItemIconPalette_OldGateau[] = INCBIN_U32("graphics/items/icon_palettes/old_gateau.gbapal.lz"); - -const u32 gItemIcon_XSpecialDefense[] = INCBIN_U32("graphics/items/icons/x_special_defense.4bpp.lz"); -const u32 gItemIconPalette_XSpecialDefense[] = INCBIN_U32("graphics/items/icon_palettes/x_special_defense.gbapal.lz"); - -const u32 gItemIcon_AbilityCapsule[] = INCBIN_U32("graphics/items/icons/ability_capsule.4bpp.lz"); -const u32 gItemIconPalette_AbilityCapsule[] = INCBIN_U32("graphics/items/icon_palettes/ability_capsule.gbapal.lz"); - -const u32 gItemIcon_DawnStone[] = INCBIN_U32("graphics/items/icons/dawn_stone.4bpp.lz"); -const u32 gItemIconPalette_DawnStone[] = INCBIN_U32("graphics/items/icon_palettes/dawn_stone.gbapal.lz"); - -const u32 gItemIcon_DuskStone[] = INCBIN_U32("graphics/items/icons/dusk_stone.4bpp.lz"); -const u32 gItemIconPalette_DuskStone[] = INCBIN_U32("graphics/items/icon_palettes/dusk_stone.gbapal.lz"); - -const u32 gItemIcon_ShinyStone[] = INCBIN_U32("graphics/items/icons/shiny_stone.4bpp.lz"); -const u32 gItemIconPalette_ShinyStone[] = INCBIN_U32("graphics/items/icon_palettes/shiny_stone.gbapal.lz"); - const u32 gItemIcon_IceStone[] = INCBIN_U32("graphics/items/icons/ice_stone.4bpp.lz"); const u32 gItemIconPalette_IceStone[] = INCBIN_U32("graphics/items/icon_palettes/ice_stone.gbapal.lz"); -const u32 gItemIcon_RedApricorn[] = INCBIN_U32("graphics/items/icons/red_apricorn.4bpp.lz"); -const u32 gItemIconPalette_RedApricorn[] = INCBIN_U32("graphics/items/icon_palettes/red_apricorn.gbapal.lz"); - -const u32 gItemIcon_BlueApricorn[] = INCBIN_U32("graphics/items/icons/blue_apricorn.4bpp.lz"); -const u32 gItemIconPalette_BlueApricorn[] = INCBIN_U32("graphics/items/icon_palettes/blue_apricorn.gbapal.lz"); - -const u32 gItemIcon_YellowApricorn[] = INCBIN_U32("graphics/items/icons/yellow_apricorn.4bpp.lz"); -const u32 gItemIconPalette_YellowApricorn[] = INCBIN_U32("graphics/items/icon_palettes/yellow_apricorn.gbapal.lz"); - -const u32 gItemIcon_GreenApricorn[] = INCBIN_U32("graphics/items/icons/green_apricorn.4bpp.lz"); -const u32 gItemIconPalette_GreenApricorn[] = INCBIN_U32("graphics/items/icon_palettes/green_apricorn.gbapal.lz"); - -const u32 gItemIcon_PinkApricorn[] = INCBIN_U32("graphics/items/icons/pink_apricorn.4bpp.lz"); -const u32 gItemIconPalette_PinkApricorn[] = INCBIN_U32("graphics/items/icon_palettes/pink_apricorn.gbapal.lz"); - -const u32 gItemIcon_WhiteApricorn[] = INCBIN_U32("graphics/items/icons/white_apricorn.4bpp.lz"); -const u32 gItemIconPalette_WhiteApricorn[] = INCBIN_U32("graphics/items/icon_palettes/white_apricorn.gbapal.lz"); - -const u32 gItemIcon_BlackApricorn[] = INCBIN_U32("graphics/items/icons/black_apricorn.4bpp.lz"); -const u32 gItemIconPalette_BlackApricorn[] = INCBIN_U32("graphics/items/icon_palettes/black_apricorn.gbapal.lz"); - const u32 gItemIcon_RedNectar[] = INCBIN_U32("graphics/items/icons/red_nectar.4bpp.lz"); const u32 gItemIconPalette_RedNectar[] = INCBIN_U32("graphics/items/icon_palettes/red_nectar.gbapal.lz"); @@ -1245,189 +1464,6 @@ const u32 gItemIconPalette_PinkNectar[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_PurpleNectar[] = INCBIN_U32("graphics/items/icons/purple_nectar.4bpp.lz"); const u32 gItemIconPalette_PurpleNectar[] = INCBIN_U32("graphics/items/icon_palettes/purple_nectar.gbapal.lz"); -const u32 gItemIcon_RareBone[] = INCBIN_U32("graphics/items/icons/rare_bone.4bpp.lz"); -const u32 gItemIconPalette_RareBone[] = INCBIN_U32("graphics/items/icon_palettes/rare_bone.gbapal.lz"); - -const u32 gItemIcon_OccaBerry[] = INCBIN_U32("graphics/items/icons/occa_berry.4bpp.lz"); -const u32 gItemIconPalette_OccaBerry[] = INCBIN_U32("graphics/items/icon_palettes/occa_berry.gbapal.lz"); - -const u32 gItemIcon_PasshoBerry[] = INCBIN_U32("graphics/items/icons/passho_berry.4bpp.lz"); -const u32 gItemIconPalette_PasshoBerry[] = INCBIN_U32("graphics/items/icon_palettes/passho_berry.gbapal.lz"); - -const u32 gItemIcon_WacanBerry[] = INCBIN_U32("graphics/items/icons/wacan_berry.4bpp.lz"); -const u32 gItemIconPalette_WacanBerry[] = INCBIN_U32("graphics/items/icon_palettes/wacan_berry.gbapal.lz"); - -const u32 gItemIcon_RindoBerry[] = INCBIN_U32("graphics/items/icons/rindo_berry.4bpp.lz"); -const u32 gItemIconPalette_RindoBerry[] = INCBIN_U32("graphics/items/icon_palettes/rindo_berry.gbapal.lz"); - -const u32 gItemIcon_YacheBerry[] = INCBIN_U32("graphics/items/icons/yache_berry.4bpp.lz"); -const u32 gItemIconPalette_YacheBerry[] = INCBIN_U32("graphics/items/icon_palettes/yache_berry.gbapal.lz"); - -const u32 gItemIcon_ChopleBerry[] = INCBIN_U32("graphics/items/icons/chople_berry.4bpp.lz"); -const u32 gItemIconPalette_ChopleBerry[] = INCBIN_U32("graphics/items/icon_palettes/chople_berry.gbapal.lz"); - -const u32 gItemIcon_KebiaBerry[] = INCBIN_U32("graphics/items/icons/kebia_berry.4bpp.lz"); -const u32 gItemIconPalette_KebiaBerry[] = INCBIN_U32("graphics/items/icon_palettes/kebia_berry.gbapal.lz"); - -const u32 gItemIcon_ShucaBerry[] = INCBIN_U32("graphics/items/icons/shuca_berry.4bpp.lz"); -const u32 gItemIconPalette_ShucaBerry[] = INCBIN_U32("graphics/items/icon_palettes/shuca_berry.gbapal.lz"); - -const u32 gItemIcon_CobaBerry[] = INCBIN_U32("graphics/items/icons/coba_berry.4bpp.lz"); -const u32 gItemIconPalette_CobaBerry[] = INCBIN_U32("graphics/items/icon_palettes/coba_berry.gbapal.lz"); - -const u32 gItemIcon_PayapaBerry[] = INCBIN_U32("graphics/items/icons/payapa_berry.4bpp.lz"); -const u32 gItemIconPalette_PayapaBerry[] = INCBIN_U32("graphics/items/icon_palettes/payapa_berry.gbapal.lz"); - -const u32 gItemIcon_TangaBerry[] = INCBIN_U32("graphics/items/icons/tanga_berry.4bpp.lz"); -const u32 gItemIconPalette_TangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/tanga_berry.gbapal.lz"); - -const u32 gItemIcon_ChartiBerry[] = INCBIN_U32("graphics/items/icons/charti_berry.4bpp.lz"); -const u32 gItemIconPalette_ChartiBerry[] = INCBIN_U32("graphics/items/icon_palettes/charti_berry.gbapal.lz"); - -const u32 gItemIcon_KasibBerry[] = INCBIN_U32("graphics/items/icons/kasib_berry.4bpp.lz"); -const u32 gItemIconPalette_KasibBerry[] = INCBIN_U32("graphics/items/icon_palettes/kasib_berry.gbapal.lz"); - -const u32 gItemIcon_HabanBerry[] = INCBIN_U32("graphics/items/icons/haban_berry.4bpp.lz"); -const u32 gItemIconPalette_HabanBerry[] = INCBIN_U32("graphics/items/icon_palettes/haban_berry.gbapal.lz"); - -const u32 gItemIcon_ColburBerry[] = INCBIN_U32("graphics/items/icons/colbur_berry.4bpp.lz"); -const u32 gItemIconPalette_ColburBerry[] = INCBIN_U32("graphics/items/icon_palettes/colbur_berry.gbapal.lz"); - -const u32 gItemIcon_BabiriBerry[] = INCBIN_U32("graphics/items/icons/babiri_berry.4bpp.lz"); -const u32 gItemIconPalette_BabiriBerry[] = INCBIN_U32("graphics/items/icon_palettes/babiri_berry.gbapal.lz"); - -const u32 gItemIcon_ChilanBerry[] = INCBIN_U32("graphics/items/icons/chilan_berry.4bpp.lz"); -const u32 gItemIconPalette_ChilanBerry[] = INCBIN_U32("graphics/items/icon_palettes/chilan_berry.gbapal.lz"); - -const u32 gItemIcon_MicleBerry[] = INCBIN_U32("graphics/items/icons/micle_berry.4bpp.lz"); -const u32 gItemIconPalette_MicleBerry[] = INCBIN_U32("graphics/items/icon_palettes/micle_berry.gbapal.lz"); - -const u32 gItemIcon_CustapBerry[] = INCBIN_U32("graphics/items/icons/custap_berry.4bpp.lz"); -const u32 gItemIconPalette_CustapBerry[] = INCBIN_U32("graphics/items/icon_palettes/custap_berry.gbapal.lz"); - -const u32 gItemIcon_JabocaBerry[] = INCBIN_U32("graphics/items/icons/jaboca_berry.4bpp.lz"); -const u32 gItemIconPalette_JabocaBerry[] = INCBIN_U32("graphics/items/icon_palettes/jaboca_berry.gbapal.lz"); - -const u32 gItemIcon_RowapBerry[] = INCBIN_U32("graphics/items/icons/rowap_berry.4bpp.lz"); -const u32 gItemIconPalette_RowapBerry[] = INCBIN_U32("graphics/items/icon_palettes/rowap_berry.gbapal.lz"); - -const u32 gItemIcon_RoseliBerry[] = INCBIN_U32("graphics/items/icons/roseli_berry.4bpp.lz"); -const u32 gItemIconPalette_RoseliBerry[] = INCBIN_U32("graphics/items/icon_palettes/roseli_berry.gbapal.lz"); - -const u32 gItemIcon_KeeBerry[] = INCBIN_U32("graphics/items/icons/kee_berry.4bpp.lz"); -const u32 gItemIconPalette_KeeBerry[] = INCBIN_U32("graphics/items/icon_palettes/kee_berry.gbapal.lz"); - -const u32 gItemIcon_MarangaBerry[] = INCBIN_U32("graphics/items/icons/maranga_berry.4bpp.lz"); -const u32 gItemIconPalette_MarangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/maranga_berry.gbapal.lz"); - -const u32 gItemIcon_OvalStone[] = INCBIN_U32("graphics/items/icons/oval_stone.4bpp.lz"); -const u32 gItemIconPalette_OvalStone[] = INCBIN_U32("graphics/items/icon_palettes/oval_stone.gbapal.lz"); - -const u32 gItemIcon_Protector[] = INCBIN_U32("graphics/items/icons/protector.4bpp.lz"); -const u32 gItemIconPalette_Protector[] = INCBIN_U32("graphics/items/icon_palettes/protector.gbapal.lz"); - -const u32 gItemIcon_Electirizer[] = INCBIN_U32("graphics/items/icons/electirizer.4bpp.lz"); -const u32 gItemIconPalette_Electirizer[] = INCBIN_U32("graphics/items/icon_palettes/electirizer.gbapal.lz"); - -const u32 gItemIcon_Magmarizer[] = INCBIN_U32("graphics/items/icons/magmarizer.4bpp.lz"); -const u32 gItemIconPalette_Magmarizer[] = INCBIN_U32("graphics/items/icon_palettes/magmarizer.gbapal.lz"); - -const u32 gItemIcon_DubiousDisc[] = INCBIN_U32("graphics/items/icons/dubious_disc.4bpp.lz"); -const u32 gItemIconPalette_DubiousDisc[] = INCBIN_U32("graphics/items/icon_palettes/dubious_disc.gbapal.lz"); - -const u32 gItemIcon_ReaperCloth[] = INCBIN_U32("graphics/items/icons/reaper_cloth.4bpp.lz"); -const u32 gItemIconPalette_ReaperCloth[] = INCBIN_U32("graphics/items/icon_palettes/reaper_cloth.gbapal.lz"); - -const u32 gItemIcon_RazorClaw[] = INCBIN_U32("graphics/items/icons/razor_claw.4bpp.lz"); -const u32 gItemIconPalette_RazorClaw[] = INCBIN_U32("graphics/items/icon_palettes/razor_claw.gbapal.lz"); - -const u32 gItemIcon_RazorFang[] = INCBIN_U32("graphics/items/icons/razor_fang.4bpp.lz"); -const u32 gItemIconPalette_RazorFang[] = INCBIN_U32("graphics/items/icon_palettes/razor_fang.gbapal.lz"); - -const u32 gItemIcon_PrismScale[] = INCBIN_U32("graphics/items/icons/prism_scale.4bpp.lz"); -const u32 gItemIconPalette_PrismScale[] = INCBIN_U32("graphics/items/icon_palettes/prism_scale.gbapal.lz"); - -const u32 gItemIcon_WhippedDream[] = INCBIN_U32("graphics/items/icons/whipped_dream.4bpp.lz"); -const u32 gItemIconPalette_WhippedDream[] = INCBIN_U32("graphics/items/icon_palettes/whipped_dream.gbapal.lz"); - -const u32 gItemIcon_Sachet[] = INCBIN_U32("graphics/items/icons/sachet.4bpp.lz"); -const u32 gItemIconPalette_Sachet[] = INCBIN_U32("graphics/items/icon_palettes/sachet.gbapal.lz"); - -const u32 gItemIcon_PowerBracer[] = INCBIN_U32("graphics/items/icons/power_bracer.4bpp.lz"); -const u32 gItemIconPalette_PowerBracer[] = INCBIN_U32("graphics/items/icon_palettes/power_bracer.gbapal.lz"); - -const u32 gItemIcon_PowerBelt[] = INCBIN_U32("graphics/items/icons/power_belt.4bpp.lz"); -const u32 gItemIconPalette_PowerBelt[] = INCBIN_U32("graphics/items/icon_palettes/power_belt.gbapal.lz"); - -const u32 gItemIcon_PowerLens[] = INCBIN_U32("graphics/items/icons/power_lens.4bpp.lz"); -const u32 gItemIconPalette_PowerLens[] = INCBIN_U32("graphics/items/icon_palettes/power_lens.gbapal.lz"); - -const u32 gItemIcon_PowerBand[] = INCBIN_U32("graphics/items/icons/power_band.4bpp.lz"); -const u32 gItemIconPalette_PowerBand[] = INCBIN_U32("graphics/items/icon_palettes/power_band.gbapal.lz"); - -const u32 gItemIcon_PowerAnklet[] = INCBIN_U32("graphics/items/icons/power_anklet.4bpp.lz"); -const u32 gItemIconPalette_PowerAnklet[] = INCBIN_U32("graphics/items/icon_palettes/power_anklet.gbapal.lz"); - -const u32 gItemIcon_PowerWeight[] = INCBIN_U32("graphics/items/icons/power_weight.4bpp.lz"); -const u32 gItemIconPalette_PowerWeight[] = INCBIN_U32("graphics/items/icon_palettes/power_weight.gbapal.lz"); - -const u32 gItemIcon_RockyHelmet[] = INCBIN_U32("graphics/items/icons/rocky_helmet.4bpp.lz"); -const u32 gItemIconPalette_RockyHelmet[] = INCBIN_U32("graphics/items/icon_palettes/rocky_helmet.gbapal.lz"); - -const u32 gItemIcon_AirBalloon[] = INCBIN_U32("graphics/items/icons/air_balloon.4bpp.lz"); -const u32 gItemIconPalette_AirBalloon[] = INCBIN_U32("graphics/items/icon_palettes/air_balloon.gbapal.lz"); - -const u32 gItemIcon_RedCard[] = INCBIN_U32("graphics/items/icons/red_card.4bpp.lz"); -const u32 gItemIconPalette_RedCard[] = INCBIN_U32("graphics/items/icon_palettes/red_card.gbapal.lz"); - -const u32 gItemIcon_RingTarget[] = INCBIN_U32("graphics/items/icons/ring_target.4bpp.lz"); -const u32 gItemIconPalette_RingTarget[] = INCBIN_U32("graphics/items/icon_palettes/ring_target.gbapal.lz"); - -const u32 gItemIcon_EjectButton[] = INCBIN_U32("graphics/items/icons/eject_button.4bpp.lz"); -const u32 gItemIconPalette_EjectButton[] = INCBIN_U32("graphics/items/icon_palettes/eject_button.gbapal.lz"); - -const u32 gItemIcon_AbsorbBulb[] = INCBIN_U32("graphics/items/icons/absorb_bulb.4bpp.lz"); -const u32 gItemIconPalette_AbsorbBulb[] = INCBIN_U32("graphics/items/icon_palettes/absorb_bulb.gbapal.lz"); - -const u32 gItemIcon_CellBattery[] = INCBIN_U32("graphics/items/icons/cell_battery.4bpp.lz"); -const u32 gItemIconPalette_CellBattery[] = INCBIN_U32("graphics/items/icon_palettes/cell_battery.gbapal.lz"); - -const u32 gItemIcon_LuminousMoss[] = INCBIN_U32("graphics/items/icons/luminous_moss.4bpp.lz"); -const u32 gItemIconPalette_LuminousMoss[] = INCBIN_U32("graphics/items/icon_palettes/luminous_moss.gbapal.lz"); - -const u32 gItemIcon_Snowball[] = INCBIN_U32("graphics/items/icons/snowball.4bpp.lz"); -const u32 gItemIconPalette_Snowball[] = INCBIN_U32("graphics/items/icon_palettes/snowball.gbapal.lz"); - -const u32 gItemIcon_WeaknessPolicy[] = INCBIN_U32("graphics/items/icons/weakness_policy.4bpp.lz"); -const u32 gItemIconPalette_WeaknessPolicy[] = INCBIN_U32("graphics/items/icon_palettes/weakness_policy.gbapal.lz"); - -const u32 gItemIcon_OddIncense[] = INCBIN_U32("graphics/items/icons/odd_incense.4bpp.lz"); -const u32 gItemIconPalette_OddIncense[] = INCBIN_U32("graphics/items/icon_palettes/odd_incense.gbapal.lz"); - -const u32 gItemIcon_RockIncense[] = INCBIN_U32("graphics/items/icons/rock_incense.4bpp.lz"); -const u32 gItemIconPalette_RockIncense[] = INCBIN_U32("graphics/items/icon_palettes/rock_incense.gbapal.lz"); - -const u32 gItemIcon_FullIncense[] = INCBIN_U32("graphics/items/icons/full_incense.4bpp.lz"); -const u32 gItemIconPalette_FullIncense[] = INCBIN_U32("graphics/items/icon_palettes/full_incense.gbapal.lz"); - -const u32 gItemIcon_WaveIncense[] = INCBIN_U32("graphics/items/icons/wave_incense.4bpp.lz"); -const u32 gItemIconPalette_WaveIncense[] = INCBIN_U32("graphics/items/icon_palettes/wave_incense.gbapal.lz"); - -const u32 gItemIcon_RoseIncense[] = INCBIN_U32("graphics/items/icons/rose_incense.4bpp.lz"); -const u32 gItemIconPalette_RoseIncense[] = INCBIN_U32("graphics/items/icon_palettes/rose_incense.gbapal.lz"); - -const u32 gItemIcon_LuckIncense[] = INCBIN_U32("graphics/items/icons/luck_incense.4bpp.lz"); -const u32 gItemIconPalette_LuckIncense[] = INCBIN_U32("graphics/items/icon_palettes/luck_incense.gbapal.lz"); - -const u32 gItemIcon_PureIncense[] = INCBIN_U32("graphics/items/icons/pure_incense.4bpp.lz"); -const u32 gItemIconPalette_PureIncense[] = INCBIN_U32("graphics/items/icon_palettes/pure_incense.gbapal.lz"); - -const u32 gItemIcon_OddKeystone[] = INCBIN_U32("graphics/items/icons/odd_keystone.4bpp.lz"); -const u32 gItemIconPalette_OddKeystone[] = INCBIN_U32("graphics/items/icon_palettes/odd_keystone.gbapal.lz"); - -const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); -const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); - const u32 gItemIcon_BugMemory[] = INCBIN_U32("graphics/items/icons/bug_memory.4bpp.lz"); const u32 gItemIconPalette_BugMemory[] = INCBIN_U32("graphics/items/icon_palettes/bug_memory.gbapal.lz"); @@ -1478,42 +1514,3 @@ const u32 gItemIconPalette_SteelMemory[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_WaterMemory[] = INCBIN_U32("graphics/items/icons/water_memory.4bpp.lz"); const u32 gItemIconPalette_WaterMemory[] = INCBIN_U32("graphics/items/icon_palettes/water_memory.gbapal.lz"); - -const u32 gItemIcon_ArmorFossil[] = INCBIN_U32("graphics/items/icons/armor_fossil.4bpp.lz"); -const u32 gItemIconPalette_ArmorFossil[] = INCBIN_U32("graphics/items/icon_palettes/armor_fossil.gbapal.lz"); - -const u32 gItemIcon_SkullFossil[] = INCBIN_U32("graphics/items/icons/skull_fossil.4bpp.lz"); -const u32 gItemIconPalette_SkullFossil[] = INCBIN_U32("graphics/items/icon_palettes/skull_fossil.gbapal.lz"); - -const u32 gItemIcon_CoverFossil[] = INCBIN_U32("graphics/items/icons/cover_fossil.4bpp.lz"); -const u32 gItemIconPalette_CoverFossil[] = INCBIN_U32("graphics/items/icon_palettes/cover_fossil.gbapal.lz"); - -const u32 gItemIcon_PlumeFossil[] = INCBIN_U32("graphics/items/icons/plume_fossil.4bpp.lz"); -const u32 gItemIconPalette_PlumeFossil[] = INCBIN_U32("graphics/items/icon_palettes/plume_fossil.gbapal.lz"); - -const u32 gItemIcon_JawFossil[] = INCBIN_U32("graphics/items/icons/jaw_fossil.4bpp.lz"); -const u32 gItemIconPalette_JawFossil[] = INCBIN_U32("graphics/items/icon_palettes/jaw_fossil.gbapal.lz"); - -const u32 gItemIcon_SailFossil[] = INCBIN_U32("graphics/items/icons/sail_fossil.4bpp.lz"); -const u32 gItemIconPalette_SailFossil[] = INCBIN_U32("graphics/items/icon_palettes/sail_fossil.gbapal.lz"); - -const u32 gItemIcon_HealthWing[] = INCBIN_U32("graphics/items/icons/health_wing.4bpp.lz"); -const u32 gItemIconPalette_HealthWing[] = INCBIN_U32("graphics/items/icon_palettes/health_wing.gbapal.lz"); - -const u32 gItemIcon_MuscleWing[] = INCBIN_U32("graphics/items/icons/muscle_wing.4bpp.lz"); -const u32 gItemIconPalette_MuscleWing[] = INCBIN_U32("graphics/items/icon_palettes/muscle_wing.gbapal.lz"); - -const u32 gItemIcon_ResistWing[] = INCBIN_U32("graphics/items/icons/resist_wing.4bpp.lz"); -const u32 gItemIconPalette_ResistWing[] = INCBIN_U32("graphics/items/icon_palettes/resist_wing.gbapal.lz"); - -const u32 gItemIcon_GeniusWing[] = INCBIN_U32("graphics/items/icons/genius_wing.4bpp.lz"); -const u32 gItemIconPalette_GeniusWing[] = INCBIN_U32("graphics/items/icon_palettes/genius_wing.gbapal.lz"); - -const u32 gItemIcon_CleverWing[] = INCBIN_U32("graphics/items/icons/clever_wing.4bpp.lz"); -const u32 gItemIconPalette_CleverWing[] = INCBIN_U32("graphics/items/icon_palettes/clever_wing.gbapal.lz"); - -const u32 gItemIcon_SwiftWing[] = INCBIN_U32("graphics/items/icons/swift_wing.4bpp.lz"); -const u32 gItemIconPalette_SwiftWing[] = INCBIN_U32("graphics/items/icon_palettes/swift_wing.gbapal.lz"); - -const u32 gItemIcon_PrettyWing[] = INCBIN_U32("graphics/items/icons/pretty_wing.4bpp.lz"); -const u32 gItemIconPalette_PrettyWing[] = INCBIN_U32("graphics/items/icon_palettes/pretty_wing.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index a53afe88d..b54f28405 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -391,6 +391,65 @@ const u32 *const gItemIconTable[][2] = [ITEM_DREAD_PLATE] = {gItemIcon_DreadPlate, gItemIconPalette_DreadPlate}, [ITEM_IRON_PLATE] = {gItemIcon_IronPlate, gItemIconPalette_IronPlate}, [ITEM_HONEY] = {gItemIcon_Honey, gItemIconPalette_Honey}, + [ITEM_OLD_GATEAU] = {gItemIcon_OldGateau, gItemIconPalette_OldGateau}, + [ITEM_X_SP_DEF] = {gItemIcon_XSpecialDefense, gItemIconPalette_XSpecialDefense}, + [ITEM_DAWN_STONE] = {gItemIcon_DawnStone, gItemIconPalette_DawnStone}, + [ITEM_DUSK_STONE] = {gItemIcon_DuskStone, gItemIconPalette_DuskStone}, + [ITEM_SHINY_STONE] = {gItemIcon_ShinyStone, gItemIconPalette_ShinyStone}, + [ITEM_RED_APRICORN] = {gItemIcon_RedApricorn, gItemIconPalette_RedApricorn}, + [ITEM_BLUE_APRICORN] = {gItemIcon_BlueApricorn, gItemIconPalette_BlueApricorn}, + [ITEM_YELLOW_APRICORN] = {gItemIcon_YellowApricorn, gItemIconPalette_YellowApricorn}, + [ITEM_GREEN_APRICORN] = {gItemIcon_GreenApricorn, gItemIconPalette_GreenApricorn}, + [ITEM_PINK_APRICORN] = {gItemIcon_PinkApricorn, gItemIconPalette_PinkApricorn}, + [ITEM_WHITE_APRICORN] = {gItemIcon_WhiteApricorn, gItemIconPalette_WhiteApricorn}, + [ITEM_BLACK_APRICORN] = {gItemIcon_BlackApricorn, gItemIconPalette_BlackApricorn}, + [ITEM_RARE_BONE] = {gItemIcon_RareBone, gItemIconPalette_RareBone}, + [ITEM_OCCA_BERRY] = {gItemIcon_OccaBerry, gItemIconPalette_OccaBerry}, + [ITEM_PASSHO_BERRY] = {gItemIcon_PasshoBerry, gItemIconPalette_PasshoBerry}, + [ITEM_WACAN_BERRY] = {gItemIcon_WacanBerry, gItemIconPalette_WacanBerry}, + [ITEM_RINDO_BERRY] = {gItemIcon_RindoBerry, gItemIconPalette_RindoBerry}, + [ITEM_YACHE_BERRY] = {gItemIcon_YacheBerry, gItemIconPalette_YacheBerry}, + [ITEM_CHOPLE_BERRY] = {gItemIcon_ChopleBerry, gItemIconPalette_ChopleBerry}, + [ITEM_KEBIA_BERRY] = {gItemIcon_KebiaBerry, gItemIconPalette_KebiaBerry}, + [ITEM_SHUCA_BERRY] = {gItemIcon_ShucaBerry, gItemIconPalette_ShucaBerry}, + [ITEM_COBA_BERRY] = {gItemIcon_CobaBerry, gItemIconPalette_CobaBerry}, + [ITEM_PAYAPA_BERRY] = {gItemIcon_PayapaBerry, gItemIconPalette_PayapaBerry}, + [ITEM_TANGA_BERRY] = {gItemIcon_TangaBerry, gItemIconPalette_TangaBerry}, + [ITEM_CHARTI_BERRY] = {gItemIcon_ChartiBerry, gItemIconPalette_ChartiBerry}, + [ITEM_KASIB_BERRY] = {gItemIcon_KasibBerry, gItemIconPalette_KasibBerry}, + [ITEM_HABAN_BERRY] = {gItemIcon_HabanBerry, gItemIconPalette_HabanBerry}, + [ITEM_COLBUR_BERRY] = {gItemIcon_ColburBerry, gItemIconPalette_ColburBerry}, + [ITEM_BABIRI_BERRY] = {gItemIcon_BabiriBerry, gItemIconPalette_BabiriBerry}, + [ITEM_CHILAN_BERRY] = {gItemIcon_ChilanBerry, gItemIconPalette_ChilanBerry}, + [ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry}, + [ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry}, + [ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry}, + [ITEM_ROWAP_BERRY] = {gItemIcon_RowapBerry, gItemIconPalette_RowapBerry}, + [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, + [ITEM_PROTECTOR] = {gItemIcon_Protector, gItemIconPalette_Protector}, + [ITEM_ELECTIRIZER] = {gItemIcon_Electirizer, gItemIconPalette_Electirizer}, + [ITEM_MAGMARIZER] = {gItemIcon_Magmarizer, gItemIconPalette_Magmarizer}, + [ITEM_DUBIOUS_DISC] = {gItemIcon_DubiousDisc, gItemIconPalette_DubiousDisc}, + [ITEM_REAPER_CLOTH] = {gItemIcon_ReaperCloth, gItemIconPalette_ReaperCloth}, + [ITEM_RAZOR_CLAW] = {gItemIcon_RazorClaw, gItemIconPalette_RazorClaw}, + [ITEM_RAZOR_FANG] = {gItemIcon_RazorFang, gItemIconPalette_RazorFang}, + [ITEM_POWER_BRACER] = {gItemIcon_PowerBracer, gItemIconPalette_PowerBracer}, + [ITEM_POWER_BELT] = {gItemIcon_PowerBelt, gItemIconPalette_PowerBelt}, + [ITEM_POWER_LENS] = {gItemIcon_PowerLens, gItemIconPalette_PowerLens}, + [ITEM_POWER_BAND] = {gItemIcon_PowerBand, gItemIconPalette_PowerBand}, + [ITEM_POWER_ANKLET] = {gItemIcon_PowerAnklet, gItemIconPalette_PowerAnklet}, + [ITEM_POWER_WEIGHT] = {gItemIcon_PowerWeight, gItemIconPalette_PowerWeight}, + [ITEM_ODD_INCENSE] = {gItemIcon_OddIncense, gItemIconPalette_OddIncense}, + [ITEM_ROCK_INCENSE] = {gItemIcon_RockIncense, gItemIconPalette_RockIncense}, + [ITEM_FULL_INCENSE] = {gItemIcon_FullIncense, gItemIconPalette_FullIncense}, + [ITEM_WAVE_INCENSE] = {gItemIcon_WaveIncense, gItemIconPalette_WaveIncense}, + [ITEM_ROSE_INCENSE] = {gItemIcon_RoseIncense, gItemIconPalette_RoseIncense}, + [ITEM_LUCK_INCENSE] = {gItemIcon_LuckIncense, gItemIconPalette_LuckIncense}, + [ITEM_PURE_INCENSE] = {gItemIcon_PureIncense, gItemIconPalette_PureIncense}, + [ITEM_ODD_KEYSTONE] = {gItemIcon_OddKeystone, gItemIconPalette_OddKeystone}, + [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, + [ITEM_ARMOR_FOSSIL] = {gItemIcon_ArmorFossil, gItemIconPalette_ArmorFossil}, + [ITEM_SKULL_FOSSIL] = {gItemIcon_SkullFossil, gItemIconPalette_SkullFossil}, // Gen 5 Items [ITEM_EVIOLITE] = {gItemIcon_Eviolite, gItemIconPalette_Eviolite}, [ITEM_FLOAT_STONE] = {gItemIcon_FloatStone, gItemIconPalette_FloatStone}, @@ -417,6 +476,24 @@ const u32 *const gItemIconTable[][2] = [ITEM_STEEL_GEM] = {gItemIcon_SteelGem, gItemIconPalette_SteelGem}, [ITEM_NORMAL_GEM] = {gItemIcon_NormalGem, gItemIconPalette_NormalGem}, [ITEM_FAIRY_GEM] = {gItemIcon_FairyGem, gItemIconPalette_FairyGem}, + [ITEM_SWEET_HEART] = {gItemIcon_SweetHeart, gItemIconPalette_SweetHeart}, + [ITEM_PRISM_SCALE] = {gItemIcon_PrismScale, gItemIconPalette_PrismScale}, + [ITEM_ROCKY_HELMET] = {gItemIcon_RockyHelmet, gItemIconPalette_RockyHelmet}, + [ITEM_AIR_BALLOON] = {gItemIcon_AirBalloon, gItemIconPalette_AirBalloon}, + [ITEM_RED_CARD] = {gItemIcon_RedCard, gItemIconPalette_RedCard}, + [ITEM_RING_TARGET] = {gItemIcon_RingTarget, gItemIconPalette_RingTarget}, + [ITEM_EJECT_BUTTON] = {gItemIcon_EjectButton, gItemIconPalette_EjectButton}, + [ITEM_ABSORB_BULB] = {gItemIcon_AbsorbBulb, gItemIconPalette_AbsorbBulb}, + [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery}, + [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil}, + [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, + [ITEM_HEALTH_WING] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing}, + [ITEM_MUSCLE_WING] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing}, + [ITEM_RESIST_WING] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing}, + [ITEM_GENIUS_WING] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing}, + [ITEM_CLEVER_WING] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing}, + [ITEM_SWIFT_WING] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing}, + [ITEM_PRETTY_WING] = {gItemIcon_PrettyWing, gItemIconPalette_PrettyWing}, [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, // Gen 6 Items [ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest}, @@ -470,6 +547,17 @@ const u32 *const gItemIconTable[][2] = [ITEM_SALAMENCITE] = {gItemIcon_Salamencite, gItemIconPalette_Salamencite}, [ITEM_BEEDRILLITE] = {gItemIcon_Beedrillite, gItemIconPalette_Beedrillite}, [ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet}, + [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, + [ITEM_ROSELI_BERRY] = {gItemIcon_RoseliBerry, gItemIconPalette_RoseliBerry}, + [ITEM_KEE_BERRY] = {gItemIcon_KeeBerry, gItemIconPalette_KeeBerry}, + [ITEM_MARANGA_BERRY] = {gItemIcon_MarangaBerry, gItemIconPalette_MarangaBerry}, + [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, + [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, + [ITEM_LUMINOUS_MOSS] = {gItemIcon_LuminousMoss, gItemIconPalette_LuminousMoss}, + [ITEM_SNOWBALL] = {gItemIcon_Snowball, gItemIconPalette_Snowball}, + [ITEM_WEAKNESS_POLICY] = {gItemIcon_WeaknessPolicy, gItemIconPalette_WeaknessPolicy}, + [ITEM_JAW_FOSSIL] = {gItemIcon_JawFossil, gItemIconPalette_JawFossil}, + [ITEM_SAIL_FOSSIL] = {gItemIcon_SailFossil, gItemIconPalette_SailFossil}, // Gen 7 Items [ITEM_PROTECTIVE_PADS] = {gItemIcon_ProtectivePads, gItemIconPalette_ProtectivePads}, [ITEM_TERRAIN_EXTENDER] = {gItemIcon_TerrainExtender, gItemIconPalette_TerrainExtender}, @@ -478,88 +566,12 @@ const u32 *const gItemIconTable[][2] = [ITEM_MISTY_SEED] = {gItemIcon_MistySeed, gItemIconPalette_MistySeed}, [ITEM_PSYCHIC_SEED] = {gItemIcon_PsychicSeed, gItemIconPalette_PsychicSeed}, [ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb}, - // Unordered - [ITEM_SWEET_HEART] = {gItemIcon_SweetHeart, gItemIconPalette_SweetHeart}, [ITEM_BIG_MALASADA] = {gItemIcon_BigMalasada, gItemIconPalette_BigMalasada}, - [ITEM_OLD_GATEAU] = {gItemIcon_OldGateau, gItemIconPalette_OldGateau}, - [ITEM_X_SP_DEF] = {gItemIcon_XSpecialDefense, gItemIconPalette_XSpecialDefense}, - [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, - [ITEM_DAWN_STONE] = {gItemIcon_DawnStone, gItemIconPalette_DawnStone}, - [ITEM_DUSK_STONE] = {gItemIcon_DuskStone, gItemIconPalette_DuskStone}, - [ITEM_SHINY_STONE] = {gItemIcon_ShinyStone, gItemIconPalette_ShinyStone}, [ITEM_ICE_STONE] = {gItemIcon_IceStone, gItemIconPalette_IceStone}, - [ITEM_RED_APRICORN] = {gItemIcon_RedApricorn, gItemIconPalette_RedApricorn}, - [ITEM_BLUE_APRICORN] = {gItemIcon_BlueApricorn, gItemIconPalette_BlueApricorn}, - [ITEM_YELLOW_APRICORN] = {gItemIcon_YellowApricorn, gItemIconPalette_YellowApricorn}, - [ITEM_GREEN_APRICORN] = {gItemIcon_GreenApricorn, gItemIconPalette_GreenApricorn}, - [ITEM_PINK_APRICORN] = {gItemIcon_PinkApricorn, gItemIconPalette_PinkApricorn}, - [ITEM_WHITE_APRICORN] = {gItemIcon_WhiteApricorn, gItemIconPalette_WhiteApricorn}, - [ITEM_BLACK_APRICORN] = {gItemIcon_BlackApricorn, gItemIconPalette_BlackApricorn}, [ITEM_RED_NECTAR] = {gItemIcon_RedNectar, gItemIconPalette_RedNectar}, [ITEM_YELLOW_NECTAR] = {gItemIcon_YellowNectar, gItemIconPalette_YellowNectar}, [ITEM_PINK_NECTAR] = {gItemIcon_PinkNectar, gItemIconPalette_PinkNectar}, [ITEM_PURPLE_NECTAR] = {gItemIcon_PurpleNectar, gItemIconPalette_PurpleNectar}, - [ITEM_RARE_BONE] = {gItemIcon_RareBone, gItemIconPalette_RareBone}, - [ITEM_OCCA_BERRY] = {gItemIcon_OccaBerry, gItemIconPalette_OccaBerry}, - [ITEM_PASSHO_BERRY] = {gItemIcon_PasshoBerry, gItemIconPalette_PasshoBerry}, - [ITEM_WACAN_BERRY] = {gItemIcon_WacanBerry, gItemIconPalette_WacanBerry}, - [ITEM_RINDO_BERRY] = {gItemIcon_RindoBerry, gItemIconPalette_RindoBerry}, - [ITEM_YACHE_BERRY] = {gItemIcon_YacheBerry, gItemIconPalette_YacheBerry}, - [ITEM_CHOPLE_BERRY] = {gItemIcon_ChopleBerry, gItemIconPalette_ChopleBerry}, - [ITEM_KEBIA_BERRY] = {gItemIcon_KebiaBerry, gItemIconPalette_KebiaBerry}, - [ITEM_SHUCA_BERRY] = {gItemIcon_ShucaBerry, gItemIconPalette_ShucaBerry}, - [ITEM_COBA_BERRY] = {gItemIcon_CobaBerry, gItemIconPalette_CobaBerry}, - [ITEM_PAYAPA_BERRY] = {gItemIcon_PayapaBerry, gItemIconPalette_PayapaBerry}, - [ITEM_TANGA_BERRY] = {gItemIcon_TangaBerry, gItemIconPalette_TangaBerry}, - [ITEM_CHARTI_BERRY] = {gItemIcon_ChartiBerry, gItemIconPalette_ChartiBerry}, - [ITEM_KASIB_BERRY] = {gItemIcon_KasibBerry, gItemIconPalette_KasibBerry}, - [ITEM_HABAN_BERRY] = {gItemIcon_HabanBerry, gItemIconPalette_HabanBerry}, - [ITEM_COLBUR_BERRY] = {gItemIcon_ColburBerry, gItemIconPalette_ColburBerry}, - [ITEM_BABIRI_BERRY] = {gItemIcon_BabiriBerry, gItemIconPalette_BabiriBerry}, - [ITEM_CHILAN_BERRY] = {gItemIcon_ChilanBerry, gItemIconPalette_ChilanBerry}, - [ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry}, - [ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry}, - [ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry}, - [ITEM_ROWAP_BERRY] = {gItemIcon_RowapBerry, gItemIconPalette_RowapBerry}, - [ITEM_ROSELI_BERRY] = {gItemIcon_RoseliBerry, gItemIconPalette_RoseliBerry}, - [ITEM_KEE_BERRY] = {gItemIcon_KeeBerry, gItemIconPalette_KeeBerry}, - [ITEM_MARANGA_BERRY] = {gItemIcon_MarangaBerry, gItemIconPalette_MarangaBerry}, - [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, - [ITEM_PROTECTOR] = {gItemIcon_Protector, gItemIconPalette_Protector}, - [ITEM_ELECTIRIZER] = {gItemIcon_Electirizer, gItemIconPalette_Electirizer}, - [ITEM_MAGMARIZER] = {gItemIcon_Magmarizer, gItemIconPalette_Magmarizer}, - [ITEM_DUBIOUS_DISC] = {gItemIcon_DubiousDisc, gItemIconPalette_DubiousDisc}, - [ITEM_REAPER_CLOTH] = {gItemIcon_ReaperCloth, gItemIconPalette_ReaperCloth}, - [ITEM_RAZOR_CLAW] = {gItemIcon_RazorClaw, gItemIconPalette_RazorClaw}, - [ITEM_RAZOR_FANG] = {gItemIcon_RazorFang, gItemIconPalette_RazorFang}, - [ITEM_PRISM_SCALE] = {gItemIcon_PrismScale, gItemIconPalette_PrismScale}, - [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, - [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, - [ITEM_POWER_BRACER] = {gItemIcon_PowerBracer, gItemIconPalette_PowerBracer}, - [ITEM_POWER_BELT] = {gItemIcon_PowerBelt, gItemIconPalette_PowerBelt}, - [ITEM_POWER_LENS] = {gItemIcon_PowerLens, gItemIconPalette_PowerLens}, - [ITEM_POWER_BAND] = {gItemIcon_PowerBand, gItemIconPalette_PowerBand}, - [ITEM_POWER_ANKLET] = {gItemIcon_PowerAnklet, gItemIconPalette_PowerAnklet}, - [ITEM_POWER_WEIGHT] = {gItemIcon_PowerWeight, gItemIconPalette_PowerWeight}, - [ITEM_ROCKY_HELMET] = {gItemIcon_RockyHelmet, gItemIconPalette_RockyHelmet}, - [ITEM_AIR_BALLOON] = {gItemIcon_AirBalloon, gItemIconPalette_AirBalloon}, - [ITEM_RED_CARD] = {gItemIcon_RedCard, gItemIconPalette_RedCard}, - [ITEM_RING_TARGET] = {gItemIcon_RingTarget, gItemIconPalette_RingTarget}, - [ITEM_EJECT_BUTTON] = {gItemIcon_EjectButton, gItemIconPalette_EjectButton}, - [ITEM_ABSORB_BULB] = {gItemIcon_AbsorbBulb, gItemIconPalette_AbsorbBulb}, - [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery}, - [ITEM_LUMINOUS_MOSS] = {gItemIcon_LuminousMoss, gItemIconPalette_LuminousMoss}, - [ITEM_SNOWBALL] = {gItemIcon_Snowball, gItemIconPalette_Snowball}, - [ITEM_WEAKNESS_POLICY] = {gItemIcon_WeaknessPolicy, gItemIconPalette_WeaknessPolicy}, - [ITEM_ODD_INCENSE] = {gItemIcon_OddIncense, gItemIconPalette_OddIncense}, - [ITEM_ROCK_INCENSE] = {gItemIcon_RockIncense, gItemIconPalette_RockIncense}, - [ITEM_FULL_INCENSE] = {gItemIcon_FullIncense, gItemIconPalette_FullIncense}, - [ITEM_WAVE_INCENSE] = {gItemIcon_WaveIncense, gItemIconPalette_WaveIncense}, - [ITEM_ROSE_INCENSE] = {gItemIcon_RoseIncense, gItemIconPalette_RoseIncense}, - [ITEM_LUCK_INCENSE] = {gItemIcon_LuckIncense, gItemIconPalette_LuckIncense}, - [ITEM_PURE_INCENSE] = {gItemIcon_PureIncense, gItemIconPalette_PureIncense}, - [ITEM_ODD_KEYSTONE] = {gItemIcon_OddKeystone, gItemIconPalette_OddKeystone}, - [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, [ITEM_BUG_MEMORY] = {gItemIcon_BugMemory, gItemIconPalette_BugMemory}, [ITEM_DARK_MEMORY] = {gItemIcon_DarkMemory, gItemIconPalette_DarkMemory}, [ITEM_DRAGON_MEMORY] = {gItemIcon_DragonMemory, gItemIconPalette_DragonMemory}, @@ -577,17 +589,4 @@ const u32 *const gItemIconTable[][2] = [ITEM_ROCK_MEMORY] = {gItemIcon_RockMemory, gItemIconPalette_RockMemory}, [ITEM_STEEL_MEMORY] = {gItemIcon_SteelMemory, gItemIconPalette_SteelMemory}, [ITEM_WATER_MEMORY] = {gItemIcon_WaterMemory, gItemIconPalette_WaterMemory}, - [ITEM_ARMOR_FOSSIL] = {gItemIcon_ArmorFossil, gItemIconPalette_ArmorFossil}, - [ITEM_SKULL_FOSSIL] = {gItemIcon_SkullFossil, gItemIconPalette_SkullFossil}, - [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil}, - [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, - [ITEM_JAW_FOSSIL] = {gItemIcon_JawFossil, gItemIconPalette_JawFossil}, - [ITEM_SAIL_FOSSIL] = {gItemIcon_SailFossil, gItemIconPalette_SailFossil}, - [ITEM_HEALTH_WING] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing}, - [ITEM_MUSCLE_WING] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing}, - [ITEM_RESIST_WING] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing}, - [ITEM_GENIUS_WING] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing}, - [ITEM_CLEVER_WING] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing}, - [ITEM_SWIFT_WING] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing}, - [ITEM_PRETTY_WING] = {gItemIcon_PrettyWing, gItemIconPalette_PrettyWing}, }; From 1b048c0ecf8fbb23fdea1016e9087ac474d9f1f9 Mon Sep 17 00:00:00 2001 From: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Date: Sat, 29 Feb 2020 00:22:37 -0800 Subject: [PATCH 45/52] Fix grass and Pokemon Center monitor palette issues. (#296) --- src/data/object_events/object_event_graphics.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index be54f8d6c..74caa13a0 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -307,12 +307,12 @@ const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_ const u32 filler_8368A08[0x48] = {}; const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp"); const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal"); const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp"); const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp"); const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); @@ -335,12 +335,12 @@ const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effe const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp"); const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal"); const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp"); const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp"); const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); From 403216064171bcdaf599805f9ff1e12229788ae8 Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Sat, 14 Mar 2020 08:16:59 -0300 Subject: [PATCH 46/52] Restored the definitions of named TM ID to how it is in pokeemerald. (#309) --- include/constants/items.h | 116 +++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index 0dfcdd3e4..c8c0bbfdc 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -612,65 +612,65 @@ #define ITEM_HM07 538 #define ITEM_HM08 539 -#define ITEM_TM01_FOCUS_PUNCH 482 -#define ITEM_TM02_DRAGON_CLAW 483 -#define ITEM_TM03_WATER_PULSE 484 -#define ITEM_TM04_CALM_MIND 485 -#define ITEM_TM05_ROAR 486 -#define ITEM_TM06_TOXIC 487 -#define ITEM_TM07_HAIL 488 -#define ITEM_TM08_BULK_UP 489 -#define ITEM_TM09_BULLET_SEED 490 -#define ITEM_TM10_HIDDEN_POWER 491 -#define ITEM_TM11_SUNNY_DAY 492 -#define ITEM_TM12_TAUNT 493 -#define ITEM_TM13_ICE_BEAM 494 -#define ITEM_TM14_BLIZZARD 495 -#define ITEM_TM15_HYPER_BEAM 496 -#define ITEM_TM16_LIGHT_SCREEN 497 -#define ITEM_TM17_PROTECT 498 -#define ITEM_TM18_RAIN_DANCE 499 -#define ITEM_TM19_GIGA_DRAIN 500 -#define ITEM_TM20_SAFEGUARD 501 -#define ITEM_TM21_FRUSTRATION 502 -#define ITEM_TM22_SOLARBEAM 503 -#define ITEM_TM23_IRON_TAIL 504 -#define ITEM_TM24_THUNDERBOLT 505 -#define ITEM_TM25_THUNDER 506 -#define ITEM_TM26_EARTHQUAKE 507 -#define ITEM_TM27_RETURN 508 -#define ITEM_TM28_DIG 509 -#define ITEM_TM29_PSYCHIC 510 -#define ITEM_TM30_SHADOW_BALL 511 -#define ITEM_TM31_BRICK_BREAK 512 -#define ITEM_TM32_DOUBLE_TEAM 513 -#define ITEM_TM33_REFLECT 514 -#define ITEM_TM34_SHOCK_WAVE 515 -#define ITEM_TM35_FLAMETHROWER 516 -#define ITEM_TM36_SLUDGE_BOMB 517 -#define ITEM_TM37_SANDSTORM 518 -#define ITEM_TM38_FIRE_BLAST 519 -#define ITEM_TM39_ROCK_TOMB 520 -#define ITEM_TM40_AERIAL_ACE 521 -#define ITEM_TM41_TORMENT 522 -#define ITEM_TM42_FACADE 523 -#define ITEM_TM43_SECRET_POWER 524 -#define ITEM_TM44_REST 525 -#define ITEM_TM45_ATTRACT 526 -#define ITEM_TM46_THIEF 527 -#define ITEM_TM47_STEEL_WING 528 -#define ITEM_TM48_SKILL_SWAP 529 -#define ITEM_TM49_SNATCH 530 -#define ITEM_TM50_OVERHEAT 531 +#define ITEM_TM01_FOCUS_PUNCH ITEM_TM01 +#define ITEM_TM02_DRAGON_CLAW ITEM_TM02 +#define ITEM_TM03_WATER_PULSE ITEM_TM03 +#define ITEM_TM04_CALM_MIND ITEM_TM04 +#define ITEM_TM05_ROAR ITEM_TM05 +#define ITEM_TM06_TOXIC ITEM_TM06 +#define ITEM_TM07_HAIL ITEM_TM07 +#define ITEM_TM08_BULK_UP ITEM_TM08 +#define ITEM_TM09_BULLET_SEED ITEM_TM09 +#define ITEM_TM10_HIDDEN_POWER ITEM_TM10 +#define ITEM_TM11_SUNNY_DAY ITEM_TM11 +#define ITEM_TM12_TAUNT ITEM_TM12 +#define ITEM_TM13_ICE_BEAM ITEM_TM13 +#define ITEM_TM14_BLIZZARD ITEM_TM14 +#define ITEM_TM15_HYPER_BEAM ITEM_TM15 +#define ITEM_TM16_LIGHT_SCREEN ITEM_TM16 +#define ITEM_TM17_PROTECT ITEM_TM17 +#define ITEM_TM18_RAIN_DANCE ITEM_TM18 +#define ITEM_TM19_GIGA_DRAIN ITEM_TM19 +#define ITEM_TM20_SAFEGUARD ITEM_TM20 +#define ITEM_TM21_FRUSTRATION ITEM_TM21 +#define ITEM_TM22_SOLARBEAM ITEM_TM22 +#define ITEM_TM23_IRON_TAIL ITEM_TM23 +#define ITEM_TM24_THUNDERBOLT ITEM_TM24 +#define ITEM_TM25_THUNDER ITEM_TM25 +#define ITEM_TM26_EARTHQUAKE ITEM_TM26 +#define ITEM_TM27_RETURN ITEM_TM27 +#define ITEM_TM28_DIG ITEM_TM28 +#define ITEM_TM29_PSYCHIC ITEM_TM29 +#define ITEM_TM30_SHADOW_BALL ITEM_TM30 +#define ITEM_TM31_BRICK_BREAK ITEM_TM31 +#define ITEM_TM32_DOUBLE_TEAM ITEM_TM32 +#define ITEM_TM33_REFLECT ITEM_TM33 +#define ITEM_TM34_SHOCK_WAVE ITEM_TM34 +#define ITEM_TM35_FLAMETHROWER ITEM_TM35 +#define ITEM_TM36_SLUDGE_BOMB ITEM_TM36 +#define ITEM_TM37_SANDSTORM ITEM_TM37 +#define ITEM_TM38_FIRE_BLAST ITEM_TM38 +#define ITEM_TM39_ROCK_TOMB ITEM_TM39 +#define ITEM_TM40_AERIAL_ACE ITEM_TM40 +#define ITEM_TM41_TORMENT ITEM_TM41 +#define ITEM_TM42_FACADE ITEM_TM42 +#define ITEM_TM43_SECRET_POWER ITEM_TM43 +#define ITEM_TM44_REST ITEM_TM44 +#define ITEM_TM45_ATTRACT ITEM_TM45 +#define ITEM_TM46_THIEF ITEM_TM46 +#define ITEM_TM47_STEEL_WING ITEM_TM47 +#define ITEM_TM48_SKILL_SWAP ITEM_TM48 +#define ITEM_TM49_SNATCH ITEM_TM49 +#define ITEM_TM50_OVERHEAT ITEM_TM50 -#define ITEM_HM01_CUT 532 -#define ITEM_HM02_FLY 533 -#define ITEM_HM03_SURF 534 -#define ITEM_HM04_STRENGTH 535 -#define ITEM_HM05_FLASH 536 -#define ITEM_HM06_ROCK_SMASH 537 -#define ITEM_HM07_WATERFALL 538 -#define ITEM_HM08_DIVE 539 +#define ITEM_HM01_CUT ITEM_HM01 +#define ITEM_HM02_FLY ITEM_HM02 +#define ITEM_HM03_SURF ITEM_HM03 +#define ITEM_HM04_STRENGTH ITEM_HM04 +#define ITEM_HM05_FLASH ITEM_HM05 +#define ITEM_HM06_ROCK_SMASH ITEM_HM06 +#define ITEM_HM07_WATERFALL ITEM_HM07 +#define ITEM_HM08_DIVE ITEM_HM08 // FireRed/LeafGreen #define ITEM_OAKS_PARCEL 590 #define ITEM_POKE_FLUTE 591 From 32bb717bf1d5e62dcdc17425bc2db0dc5b3c5a9f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 16 Apr 2020 04:27:13 -0300 Subject: [PATCH 47/52] Implemented missing TMs/HMs type palettes (#327) * Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash * Actually added the Bug and Fairy type TM/HM sprite palettes now --- graphics/items/icon_palettes/bug_tm_hm.pal | 19 +++++++++++++++++++ graphics/items/icon_palettes/fairy_tm_hm.pal | 19 +++++++++++++++++++ include/graphics.h | 2 ++ src/data/graphics/items.h | 4 ++++ 4 files changed, 44 insertions(+) create mode 100755 graphics/items/icon_palettes/bug_tm_hm.pal create mode 100755 graphics/items/icon_palettes/fairy_tm_hm.pal diff --git a/graphics/items/icon_palettes/bug_tm_hm.pal b/graphics/items/icon_palettes/bug_tm_hm.pal new file mode 100755 index 000000000..927711cfa --- /dev/null +++ b/graphics/items/icon_palettes/bug_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +181 181 181 +49 49 49 +74 74 99 +224 240 208 +216 240 192 +208 240 176 +184 232 152 +176 232 136 +168 232 120 +160 232 104 +123 123 148 +123 123 123 +99 99 123 +255 255 255 +232 240 240 +82 82 82 diff --git a/graphics/items/icon_palettes/fairy_tm_hm.pal b/graphics/items/icon_palettes/fairy_tm_hm.pal new file mode 100755 index 000000000..fe903900e --- /dev/null +++ b/graphics/items/icon_palettes/fairy_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +181 181 181 +49 49 49 +74 74 99 +231 205 239 +222 189 247 +214 173 247 +206 148 254 +189 132 254 +222 141 239 +247 148 215 +123 123 148 +123 123 123 +99 99 123 +255 255 255 +246 221 255 +82 82 82 diff --git a/include/graphics.h b/include/graphics.h index df0aca29a..74894edfc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4397,6 +4397,8 @@ extern const u32 gItemIcon_SteelMemory[]; extern const u32 gItemIconPalette_SteelMemory[]; extern const u32 gItemIcon_WaterMemory[]; extern const u32 gItemIconPalette_WaterMemory[]; +extern const u32 gItemIconPalette_BugTMHM[]; +extern const u32 gItemIconPalette_FairyTMHM[]; extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 499344ddb..3255f6968 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -1514,3 +1514,7 @@ const u32 gItemIconPalette_SteelMemory[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_WaterMemory[] = INCBIN_U32("graphics/items/icons/water_memory.4bpp.lz"); const u32 gItemIconPalette_WaterMemory[] = INCBIN_U32("graphics/items/icon_palettes/water_memory.gbapal.lz"); + +const u32 gItemIconPalette_BugTMHM[] = INCBIN_U32("graphics/items/icon_palettes/bug_tm_hm.gbapal.lz"); + +const u32 gItemIconPalette_FairyTMHM[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tm_hm.gbapal.lz"); From 705743a10e8211b6ab5113975fd68318c7024e60 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 24 May 2020 05:18:07 -0300 Subject: [PATCH 48/52] Fix the secondaryId of the Ice and Fighting Gems (#382) Addresses #378 --- src/data/items.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 9940f2ee3..fc8a5e8b3 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -6402,7 +6402,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ICE, }, [ITEM_FIGHTING_GEM] = @@ -6416,7 +6416,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIGHTING, }, [ITEM_POISON_GEM] = From 0be261cc745a1fe75ee4c697372e78ab6a92c536 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 21 Jun 2020 04:25:08 -0400 Subject: [PATCH 49/52] Fixed Eviolite description. --- src/data/text/item_descriptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index d159eab23..a6d0ade8c 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -2297,7 +2297,7 @@ static const u8 sIronPlateDesc[] = _( static const u8 sEvioliteDesc[] = _( "Raises the Def and\n" "Sp. Def of Pokémon\n" - "that can still evolve."); + "that can evolve."); static const u8 sFloatStoneDesc[] = _( "A light stone that\n" From 1ee15997b74a3d8f8da42e76324e14d34331ce75 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 1 Jul 2020 09:39:56 +0200 Subject: [PATCH 50/52] Update hold_effects.h --- include/constants/hold_effects.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 9d4089101..bdf042d63 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -103,6 +103,7 @@ #define HOLD_EFFECT_GRACIDEA 97 #define HOLD_EFFECT_RESIST_BERRY 98 #define HOLD_EFFECT_EV_BOOST 99 +#define HOLD_EFFECT_RESTORE_PCT_HP 100 // Gen5 hold effects #define HOLD_EFFECT_FLOAT_STONE 115 From da3062097a2372539dd7d4b5a43a2098deafc1cb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 11 Jul 2020 12:58:59 +0200 Subject: [PATCH 51/52] Merge --- src/party_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/party_menu.c b/src/party_menu.c index 70b3d467f..0fc902699 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4410,7 +4410,7 @@ void Task_AbilityCapsule(u8 taskId) gPartyMenuUseExitCallback = FALSE; PlaySE(SE_SELECT); DisplayPartyMenuMessage(gText_WontHaveEffect, 1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_ClosePartyMenuAfterText; return; } @@ -4420,7 +4420,7 @@ void Task_AbilityCapsule(u8 taskId) StringExpandPlaceholders(gStringVar4, askText); PlaySE(SE_SELECT); DisplayPartyMenuMessage(gStringVar4, 1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); tState++; break; case 1: @@ -4440,7 +4440,7 @@ void Task_AbilityCapsule(u8 taskId) case MENU_B_PRESSED: gPartyMenuUseExitCallback = FALSE; PlaySE(SE_SELECT); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); // Don't exit party selections screen, return to choosing a mon. ClearStdWindowAndFrameToTransparent(6, 0); ClearWindowTilemap(6); @@ -4453,7 +4453,7 @@ void Task_AbilityCapsule(u8 taskId) PlaySE(SE_KAIFUKU); StringExpandPlaceholders(gStringVar4, doneText); DisplayPartyMenuMessage(gStringVar4, 1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); tState++; break; case 4: From ad95f150a92a33100a32d4c367e28df156037f5f Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Thu, 16 Jul 2020 01:10:21 -0600 Subject: [PATCH 52/52] Expand Pokeball Substructure (#473) * expand ball struct element * remove test case --- include/pokemon.h | 51 +++++++++++++++++++++++++---------------------- src/pokemon.c | 4 ++-- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 69ef7a142..06e286623 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -6,34 +6,37 @@ struct PokemonSubstruct0 { - u16 species; - u16 heldItem; - u32 experience; - u8 ppBonuses; - u8 friendship; -}; + /*0x00*/ u16 species; + /*0x02*/ u16 heldItem; + /*0x04*/ u32 experience; + /*0x08*/ u8 ppBonuses; + /*0x09*/ u8 friendship; + /*0x0A*/ u8 pokeball:5; //31 balls + u8 unused0_A:3; + /*0x0B*/ u8 unused0_B; +}; /* size = 12 */ struct PokemonSubstruct1 { - u16 moves[MAX_MON_MOVES]; - u8 pp[MAX_MON_MOVES]; -}; + /*0x00*/ u16 moves[MAX_MON_MOVES]; + /*0x08*/ u8 pp[MAX_MON_MOVES]; +}; /* size = 12 */ struct PokemonSubstruct2 { - u8 hpEV; - u8 attackEV; - u8 defenseEV; - u8 speedEV; - u8 spAttackEV; - u8 spDefenseEV; - u8 cool; - u8 beauty; - u8 cute; - u8 smart; - u8 tough; - u8 sheen; -}; + /*0x00*/ u8 hpEV; + /*0x01*/ u8 attackEV; + /*0x02*/ u8 defenseEV; + /*0x03*/ u8 speedEV; + /*0x04*/ u8 spAttackEV; + /*0x05*/ u8 spDefenseEV; + /*0x06*/ u8 cool; + /*0x07*/ u8 beauty; + /*0x08*/ u8 cute; + /*0x09*/ u8 smart; + /*0x0A*/ u8 tough; + /*0x0B*/ u8 sheen; +}; /* size = 12 */ struct PokemonSubstruct3 { @@ -42,7 +45,7 @@ struct PokemonSubstruct3 /* 0x02 */ u16 metLevel:7; /* 0x02 */ u16 metGame:4; - /* 0x03 */ u16 pokeball:4; + /* 0x03 */ u16 unused3_3:4; /* 0x03 */ u16 otGender:1; /* 0x04 */ u32 hpIV:5; @@ -73,7 +76,7 @@ struct PokemonSubstruct3 /* 0x0B */ u32 giftRibbon7:1; /* 0x0B */ u32 fatefulEncounter:4; /* 0x0B */ u32 obedient:1; -}; +}; /* size = 12 */ union PokemonSubstruct { diff --git a/src/pokemon.c b/src/pokemon.c index 5d6d00429..af920cbfd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3853,7 +3853,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) retVal = substruct3->metGame; break; case MON_DATA_POKEBALL: - retVal = substruct3->pokeball; + retVal = substruct0->pokeball; break; case MON_DATA_OT_GENDER: retVal = substruct3->otGender; @@ -4227,7 +4227,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) case MON_DATA_POKEBALL: { u8 pokeball = *data; - substruct3->pokeball = pokeball; + substruct0->pokeball = pokeball; break; } case MON_DATA_OT_GENDER: