diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index caa6cddac..659fac036 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -13,19 +13,34 @@ .align 2 gBattlescriptsForBallThrow:: @ 82DBD08 - .4byte BattleScript_BallThrow @ ITEM_NONE - .4byte BattleScript_BallThrow @ ITEM_MASTER_BALL - .4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL - .4byte BattleScript_BallThrow @ ITEM_GREAT_BALL - .4byte BattleScript_BallThrow @ ITEM_POKE_BALL - .4byte BattleScript_SafariBallThrow @ ITEM_SAFARI_BALL - .4byte BattleScript_BallThrow @ ITEM_NET_BALL - .4byte BattleScript_BallThrow @ ITEM_DIVE_BALL - .4byte BattleScript_BallThrow @ ITEM_NEST_BALL - .4byte BattleScript_BallThrow @ ITEM_REPEAT_BALL - .4byte BattleScript_BallThrow @ ITEM_TIMER_BALL - .4byte BattleScript_BallThrow @ ITEM_LUXURY_BALL - .4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_SafariBallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow .align 2 gBattlescriptsForUsingItem:: @ 82DBD3C diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index bf106781a..16be3a5bc 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -19,10 +19,10 @@ FallarborTown_Mart_Pokemart: @ 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 bec38867c..63d2f5df3 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_ClerkRight:: @ 821FC8C .align 2 LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 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/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index b288d42b7..f228ca029 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -21,7 +21,7 @@ MauvilleCity_Mart_Pokemart: @ 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 c0d0ae311..c04c87a1a 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -21,7 +21,7 @@ MossdeepCity_Mart_Pokemart: @ 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 f27f0aeb5..433ebee68 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -23,7 +23,7 @@ PetalburgCity_Mart_Pokemart_Basic: @ 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_Expanded: @ 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 063c5b64f..8619c38b8 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -26,7 +26,7 @@ RustboroCity_Mart_Pokemart_Basic: @ 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_Expanded: @ 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 f7856916c..92956556a 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -19,7 +19,7 @@ SootopolisCity_Mart_Pokemart: @ 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 b5b0f716c..ed04022dc 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -266,9 +266,9 @@ TrainerHill_Entrance_Pokemart_Basic: @ 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 @@ -290,9 +290,9 @@ TrainerHill_Entrance_Pokemart_Expanded: @ 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 cc4694fe1..81a7f41ce 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -22,7 +22,7 @@ VerdanturfTown_Mart_Pokemart: @ 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 82633f77c..bc0f79c8b 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 - finditem ITEM_X_SPECIAL + finditem ITEM_X_SP_ATK end Route116_EventScript_ItemEther:: @ 8290E85 @@ -315,7 +315,7 @@ MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE end RustboroCity_EventScript_ItemXDefend:: @ 82910DB - finditem ITEM_X_DEFEND + finditem ITEM_X_DEFENSE end LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8 diff --git a/graphics/berries/babiri.png b/graphics/berries/babiri.png new file mode 100644 index 000000000..056353bab Binary files /dev/null and b/graphics/berries/babiri.png differ diff --git a/graphics/berries/charti.png b/graphics/berries/charti.png new file mode 100644 index 000000000..9f119ebac Binary files /dev/null and b/graphics/berries/charti.png differ diff --git a/graphics/berries/chilan.png b/graphics/berries/chilan.png new file mode 100644 index 000000000..8f717bb82 Binary files /dev/null and b/graphics/berries/chilan.png differ diff --git a/graphics/berries/chople.png b/graphics/berries/chople.png new file mode 100644 index 000000000..0b4b28014 Binary files /dev/null and b/graphics/berries/chople.png differ diff --git a/graphics/berries/coba.png b/graphics/berries/coba.png new file mode 100644 index 000000000..18283bd79 Binary files /dev/null and b/graphics/berries/coba.png differ diff --git a/graphics/berries/colbur.png b/graphics/berries/colbur.png new file mode 100644 index 000000000..d422a826e Binary files /dev/null and b/graphics/berries/colbur.png differ diff --git a/graphics/berries/haban.png b/graphics/berries/haban.png new file mode 100644 index 000000000..87b27fb26 Binary files /dev/null and b/graphics/berries/haban.png differ diff --git a/graphics/berries/kasib.png b/graphics/berries/kasib.png new file mode 100644 index 000000000..f1b09244b Binary files /dev/null and b/graphics/berries/kasib.png differ diff --git a/graphics/berries/kebia.png b/graphics/berries/kebia.png new file mode 100644 index 000000000..e0dfefd67 Binary files /dev/null and b/graphics/berries/kebia.png differ diff --git a/graphics/berries/occa.png b/graphics/berries/occa.png new file mode 100644 index 000000000..1ad829e5f Binary files /dev/null and b/graphics/berries/occa.png differ diff --git a/graphics/berries/passho.png b/graphics/berries/passho.png new file mode 100644 index 000000000..c54147545 Binary files /dev/null and b/graphics/berries/passho.png differ diff --git a/graphics/berries/payapa.png b/graphics/berries/payapa.png new file mode 100644 index 000000000..aff30a75c Binary files /dev/null and b/graphics/berries/payapa.png differ diff --git a/graphics/berries/rindo.png b/graphics/berries/rindo.png new file mode 100644 index 000000000..91e895d04 Binary files /dev/null and b/graphics/berries/rindo.png differ diff --git a/graphics/berries/roseli.png b/graphics/berries/roseli.png new file mode 100644 index 000000000..4eb675a44 Binary files /dev/null and b/graphics/berries/roseli.png differ diff --git a/graphics/berries/shuca.png b/graphics/berries/shuca.png new file mode 100644 index 000000000..618f3abac Binary files /dev/null and b/graphics/berries/shuca.png differ diff --git a/graphics/berries/tanga.png b/graphics/berries/tanga.png new file mode 100644 index 000000000..702da676f Binary files /dev/null and b/graphics/berries/tanga.png differ diff --git a/graphics/berries/wacan.png b/graphics/berries/wacan.png new file mode 100644 index 000000000..5d88c95bd Binary files /dev/null and b/graphics/berries/wacan.png differ diff --git a/graphics/berries/yache.png b/graphics/berries/yache.png new file mode 100644 index 000000000..3f3978277 Binary files /dev/null and b/graphics/berries/yache.png differ diff --git a/graphics/interface/ball/beast.png b/graphics/interface/ball/beast.png new file mode 100644 index 000000000..56a10224c Binary files /dev/null and b/graphics/interface/ball/beast.png differ diff --git a/graphics/interface/ball/cherish.png b/graphics/interface/ball/cherish.png new file mode 100644 index 000000000..3016b6560 Binary files /dev/null and b/graphics/interface/ball/cherish.png differ diff --git a/graphics/interface/ball/dream.png b/graphics/interface/ball/dream.png new file mode 100644 index 000000000..104ee282f Binary files /dev/null and b/graphics/interface/ball/dream.png differ diff --git a/graphics/interface/ball/dusk.png b/graphics/interface/ball/dusk.png new file mode 100644 index 000000000..2bb4d3d53 Binary files /dev/null and b/graphics/interface/ball/dusk.png differ diff --git a/graphics/interface/ball/fast.png b/graphics/interface/ball/fast.png new file mode 100644 index 000000000..d6b7e283d Binary files /dev/null and b/graphics/interface/ball/fast.png differ diff --git a/graphics/interface/ball/friend.png b/graphics/interface/ball/friend.png new file mode 100644 index 000000000..b016c0c63 Binary files /dev/null and b/graphics/interface/ball/friend.png differ diff --git a/graphics/interface/ball/heal.png b/graphics/interface/ball/heal.png new file mode 100644 index 000000000..5f1604d78 Binary files /dev/null and b/graphics/interface/ball/heal.png differ diff --git a/graphics/interface/ball/heavy.png b/graphics/interface/ball/heavy.png new file mode 100644 index 000000000..d37db7238 Binary files /dev/null and b/graphics/interface/ball/heavy.png differ diff --git a/graphics/interface/ball/level.png b/graphics/interface/ball/level.png new file mode 100644 index 000000000..588bad393 Binary files /dev/null and b/graphics/interface/ball/level.png differ diff --git a/graphics/interface/ball/love.png b/graphics/interface/ball/love.png new file mode 100644 index 000000000..3bb20d2cc Binary files /dev/null and b/graphics/interface/ball/love.png differ diff --git a/graphics/interface/ball/lure.png b/graphics/interface/ball/lure.png new file mode 100644 index 000000000..9d10c2571 Binary files /dev/null and b/graphics/interface/ball/lure.png differ diff --git a/graphics/interface/ball/moon.png b/graphics/interface/ball/moon.png new file mode 100644 index 000000000..beb1016f4 Binary files /dev/null and b/graphics/interface/ball/moon.png differ diff --git a/graphics/interface/ball/park.png b/graphics/interface/ball/park.png new file mode 100644 index 000000000..9b526f524 Binary files /dev/null and b/graphics/interface/ball/park.png differ diff --git a/graphics/interface/ball/particles2.png b/graphics/interface/ball/particles2.png new file mode 100644 index 000000000..9056c253c Binary files /dev/null and b/graphics/interface/ball/particles2.png differ diff --git a/graphics/interface/ball/quick.png b/graphics/interface/ball/quick.png new file mode 100644 index 000000000..6c5dfccb9 Binary files /dev/null and b/graphics/interface/ball/quick.png differ diff --git a/graphics/interface/ball/sport.png b/graphics/interface/ball/sport.png new file mode 100644 index 000000000..93228579b Binary files /dev/null and b/graphics/interface/ball/sport.png differ 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/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/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/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/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/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/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/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/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/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/beast_ball.pal b/graphics/items/icon_palettes/beast_ball.pal new file mode 100644 index 000000000..371cd6904 --- /dev/null +++ b/graphics/items/icon_palettes/beast_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +90 57 246 +57 57 180 +90 90 255 +164 164 197 +57 98 255 +65 106 213 +65 172 255 +139 205 255 +74 82 82 +238 213 57 +189 156 98 +156 106 65 +0 0 0 +49 49 49 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_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/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_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/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/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_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/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/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/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/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/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/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/cherish_ball.pal b/graphics/items/icon_palettes/cherish_ball.pal new file mode 100644 index 000000000..d0ef73747 --- /dev/null +++ b/graphics/items/icon_palettes/cherish_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +74 82 82 +205 57 32 +164 57 41 +222 65 49 +255 65 49 +255 115 106 +255 156 156 +255 255 255 +0 0 0 +49 49 49 +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/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/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/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/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/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/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/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/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/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/dream_ball.pal b/graphics/items/icon_palettes/dream_ball.pal new file mode 100644 index 000000000..5782ed7e4 --- /dev/null +++ b/graphics/items/icon_palettes/dream_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +255 98 164 +197 123 156 +230 156 189 +255 131 189 +255 180 213 +255 213 238 +106 82 139 +131 98 197 +123 123 131 +74 82 82 +0 0 0 +49 49 49 +0 0 0 +0 0 0 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_ball.pal b/graphics/items/icon_palettes/dusk_ball.pal new file mode 100644 index 000000000..7b6bf1de7 --- /dev/null +++ b/graphics/items/icon_palettes/dusk_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +41 139 41 +65 172 65 +82 139 82 +98 213 57 +148 255 82 +123 115 41 +255 106 8 +156 57 0 +222 74 0 +189 32 0 +115 41 24 +0 0 0 +82 82 82 +49 49 49 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/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/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_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_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/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/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/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/graphics/items/icon_palettes/fast_ball.pal b/graphics/items/icon_palettes/fast_ball.pal new file mode 100644 index 000000000..22b9e6212 --- /dev/null +++ b/graphics/items/icon_palettes/fast_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +148 131 65 +246 205 57 +213 172 49 +238 139 65 +205 106 41 +255 180 131 +0 0 0 +49 49 49 +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/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_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/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/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/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/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/friend_ball.pal b/graphics/items/icon_palettes/friend_ball.pal new file mode 100644 index 000000000..051f2e119 --- /dev/null +++ b/graphics/items/icon_palettes/friend_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +90 106 123 +74 82 82 +139 197 57 +189 230 131 +123 164 57 +246 222 16 +172 148 65 +197 90 74 +230 139 131 +0 0 0 +49 49 49 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/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/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/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/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/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/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_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/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/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/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/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/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/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/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/heal_ball.pal b/graphics/items/icon_palettes/heal_ball.pal new file mode 100644 index 000000000..86f787665 --- /dev/null +++ b/graphics/items/icon_palettes/heal_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +246 139 180 +255 180 230 +255 106 213 +238 82 197 +213 16 172 +106 98 197 +123 148 205 +139 172 222 +90 139 205 +255 246 213 +230 180 115 +255 205 172 +0 0 0 +49 49 49 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/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/heavy_ball.pal b/graphics/items/icon_palettes/heavy_ball.pal new file mode 100644 index 000000000..3a02d3d7d --- /dev/null +++ b/graphics/items/icon_palettes/heavy_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +82 123 222 +57 90 164 +131 172 238 +197 205 213 +90 106 123 +115 131 148 +148 164 180 +74 82 82 +0 0 0 +49 49 49 +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/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/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/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/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/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/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/level_ball.pal b/graphics/items/icon_palettes/level_ball.pal new file mode 100644 index 000000000..0b8a16082 --- /dev/null +++ b/graphics/items/icon_palettes/level_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +255 222 189 +238 189 148 +156 98 57 +222 148 90 +180 148 123 +123 106 98 +222 74 57 +255 139 131 +0 0 0 +49 49 49 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/love_ball.pal b/graphics/items/icon_palettes/love_ball.pal new file mode 100644 index 000000000..7c8a8f3c9 --- /dev/null +++ b/graphics/items/icon_palettes/love_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +246 164 205 +222 131 180 +255 197 230 +189 90 156 +139 82 123 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +0 0 0 +49 49 49 +0 0 0 +0 0 0 +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/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/lure_ball.pal b/graphics/items/icon_palettes/lure_ball.pal new file mode 100644 index 000000000..f202c0888 --- /dev/null +++ b/graphics/items/icon_palettes/lure_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 90 106 +255 164 180 +156 131 180 +222 205 246 +164 164 197 +123 123 131 +74 115 139 +41 148 205 +74 180 222 +74 82 82 +255 197 82 +238 139 90 +0 0 0 +49 49 49 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/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/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/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/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/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/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/moon_ball.pal b/graphics/items/icon_palettes/moon_ball.pal new file mode 100644 index 000000000..0f1f67178 --- /dev/null +++ b/graphics/items/icon_palettes/moon_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +98 115 148 +123 139 156 +74 197 238 +65 148 172 +156 255 255 +74 82 82 +189 172 106 +246 205 65 +255 230 164 +0 0 0 +49 49 49 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/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/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/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/park_ball.pal b/graphics/items/icon_palettes/park_ball.pal new file mode 100644 index 000000000..5817b9997 --- /dev/null +++ b/graphics/items/icon_palettes/park_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +123 115 131 +164 164 197 +123 123 131 +32 123 222 +115 131 123 +213 213 205 +246 213 82 +255 230 139 +222 156 41 +255 139 49 +0 0 0 +49 49 49 +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/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/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/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/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_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/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_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/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/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/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/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/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_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_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/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/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/quick_ball.pal b/graphics/items/icon_palettes/quick_ball.pal new file mode 100644 index 000000000..ca7754aa2 --- /dev/null +++ b/graphics/items/icon_palettes/quick_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +106 106 115 +115 189 255 +41 139 213 +41 106 123 +189 255 255 +74 82 82 +189 222 180 +255 255 0 +255 255 213 +156 148 41 +205 189 41 +255 255 255 +0 0 0 +49 49 49 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/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/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/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_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/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/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/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/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 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/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/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/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/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/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/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/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/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/sport_ball.pal b/graphics/items/icon_palettes/sport_ball.pal new file mode 100644 index 000000000..38c8fd8c8 --- /dev/null +++ b/graphics/items/icon_palettes/sport_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +255 213 57 +255 148 57 +222 90 57 +156 74 57 +0 0 0 +49 49 49 +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/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/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/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/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/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/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/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_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/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/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/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/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/ability_capsule.png b/graphics/items/icons/ability_capsule.png new file mode 100755 index 000000000..4cb366137 Binary files /dev/null and b/graphics/items/icons/ability_capsule.png differ diff --git a/graphics/items/icons/abomasite.png b/graphics/items/icons/abomasite.png new file mode 100644 index 000000000..4442f2102 Binary files /dev/null and b/graphics/items/icons/abomasite.png differ diff --git a/graphics/items/icons/absolite.png b/graphics/items/icons/absolite.png new file mode 100644 index 000000000..786aab073 Binary files /dev/null and b/graphics/items/icons/absolite.png differ diff --git a/graphics/items/icons/absorb_bulb.png b/graphics/items/icons/absorb_bulb.png new file mode 100755 index 000000000..d958ab368 Binary files /dev/null and b/graphics/items/icons/absorb_bulb.png differ diff --git a/graphics/items/icons/adamant_orb.png b/graphics/items/icons/adamant_orb.png new file mode 100644 index 000000000..5e4f6b299 Binary files /dev/null and b/graphics/items/icons/adamant_orb.png differ diff --git a/graphics/items/icons/adrenaline_orb.png b/graphics/items/icons/adrenaline_orb.png new file mode 100644 index 000000000..913366e11 Binary files /dev/null and b/graphics/items/icons/adrenaline_orb.png differ diff --git a/graphics/items/icons/aerodactylite.png b/graphics/items/icons/aerodactylite.png new file mode 100644 index 000000000..e94dee670 Binary files /dev/null and b/graphics/items/icons/aerodactylite.png differ diff --git a/graphics/items/icons/aggronite.png b/graphics/items/icons/aggronite.png new file mode 100644 index 000000000..db5dab16f Binary files /dev/null and b/graphics/items/icons/aggronite.png differ diff --git a/graphics/items/icons/air_balloon.png b/graphics/items/icons/air_balloon.png new file mode 100755 index 000000000..6ed3a9ad2 Binary files /dev/null and b/graphics/items/icons/air_balloon.png differ diff --git a/graphics/items/icons/alakazite.png b/graphics/items/icons/alakazite.png new file mode 100644 index 000000000..dfed4caf3 Binary files /dev/null and b/graphics/items/icons/alakazite.png differ diff --git a/graphics/items/icons/altarianite.png b/graphics/items/icons/altarianite.png new file mode 100644 index 000000000..ca88b0002 Binary files /dev/null and b/graphics/items/icons/altarianite.png differ diff --git a/graphics/items/icons/ampharosite.png b/graphics/items/icons/ampharosite.png new file mode 100644 index 000000000..717f4169b Binary files /dev/null and b/graphics/items/icons/ampharosite.png differ diff --git a/graphics/items/icons/armor_fossil.png b/graphics/items/icons/armor_fossil.png new file mode 100755 index 000000000..a24d2ec4d Binary files /dev/null and b/graphics/items/icons/armor_fossil.png differ diff --git a/graphics/items/icons/assault_vest.png b/graphics/items/icons/assault_vest.png new file mode 100644 index 000000000..c42928b8b Binary files /dev/null and b/graphics/items/icons/assault_vest.png differ diff --git a/graphics/items/icons/audinite.png b/graphics/items/icons/audinite.png new file mode 100644 index 000000000..71aaf06af Binary files /dev/null and b/graphics/items/icons/audinite.png differ diff --git a/graphics/items/icons/babiri_berry.png b/graphics/items/icons/babiri_berry.png new file mode 100755 index 000000000..aeca14e70 Binary files /dev/null and b/graphics/items/icons/babiri_berry.png differ diff --git a/graphics/items/icons/banettite.png b/graphics/items/icons/banettite.png new file mode 100644 index 000000000..7b3565ba6 Binary files /dev/null and b/graphics/items/icons/banettite.png differ diff --git a/graphics/items/icons/beast_ball.png b/graphics/items/icons/beast_ball.png new file mode 100644 index 000000000..3d25009fc Binary files /dev/null and b/graphics/items/icons/beast_ball.png differ diff --git a/graphics/items/icons/beedrillite.png b/graphics/items/icons/beedrillite.png new file mode 100644 index 000000000..260c5834c Binary files /dev/null and b/graphics/items/icons/beedrillite.png differ diff --git a/graphics/items/icons/big_malasada.png b/graphics/items/icons/big_malasada.png new file mode 100755 index 000000000..d24cd9e00 Binary files /dev/null and b/graphics/items/icons/big_malasada.png differ diff --git a/graphics/items/icons/big_root.png b/graphics/items/icons/big_root.png new file mode 100644 index 000000000..e857cc5f3 Binary files /dev/null and b/graphics/items/icons/big_root.png differ diff --git a/graphics/items/icons/binding_band.png b/graphics/items/icons/binding_band.png new file mode 100644 index 000000000..9930640ef Binary files /dev/null and b/graphics/items/icons/binding_band.png differ diff --git a/graphics/items/icons/black_apricorn.png b/graphics/items/icons/black_apricorn.png new file mode 100755 index 000000000..c80707e06 Binary files /dev/null and b/graphics/items/icons/black_apricorn.png differ diff --git a/graphics/items/icons/black_sludge.png b/graphics/items/icons/black_sludge.png new file mode 100644 index 000000000..2e1fac755 Binary files /dev/null and b/graphics/items/icons/black_sludge.png differ diff --git a/graphics/items/icons/blastoisinite.png b/graphics/items/icons/blastoisinite.png new file mode 100644 index 000000000..34b8233d9 Binary files /dev/null and b/graphics/items/icons/blastoisinite.png differ diff --git a/graphics/items/icons/blazikenite.png b/graphics/items/icons/blazikenite.png new file mode 100644 index 000000000..f387154de Binary files /dev/null and b/graphics/items/icons/blazikenite.png differ diff --git a/graphics/items/icons/blue_apricorn.png b/graphics/items/icons/blue_apricorn.png new file mode 100755 index 000000000..35d0ed23b Binary files /dev/null and b/graphics/items/icons/blue_apricorn.png differ diff --git a/graphics/items/icons/bug_gem.png b/graphics/items/icons/bug_gem.png new file mode 100644 index 000000000..0561d24d0 Binary files /dev/null and b/graphics/items/icons/bug_gem.png differ diff --git a/graphics/items/icons/bug_memory.png b/graphics/items/icons/bug_memory.png new file mode 100755 index 000000000..5c4c09098 Binary files /dev/null and b/graphics/items/icons/bug_memory.png differ diff --git a/graphics/items/icons/burn_drive.png b/graphics/items/icons/burn_drive.png new file mode 100644 index 000000000..c83fbd335 Binary files /dev/null and b/graphics/items/icons/burn_drive.png differ diff --git a/graphics/items/icons/cameruptite.png b/graphics/items/icons/cameruptite.png new file mode 100644 index 000000000..f064b6da2 Binary files /dev/null and b/graphics/items/icons/cameruptite.png differ diff --git a/graphics/items/icons/cell_battery.png b/graphics/items/icons/cell_battery.png new file mode 100755 index 000000000..6183bdb08 Binary files /dev/null and b/graphics/items/icons/cell_battery.png differ diff --git a/graphics/items/icons/charizardite_x.png b/graphics/items/icons/charizardite_x.png new file mode 100644 index 000000000..a2986c638 Binary files /dev/null and b/graphics/items/icons/charizardite_x.png differ diff --git a/graphics/items/icons/charizardite_y.png b/graphics/items/icons/charizardite_y.png new file mode 100644 index 000000000..f193100ed Binary files /dev/null and b/graphics/items/icons/charizardite_y.png differ diff --git a/graphics/items/icons/charti_berry.png b/graphics/items/icons/charti_berry.png new file mode 100755 index 000000000..8848e18d4 Binary files /dev/null and b/graphics/items/icons/charti_berry.png differ diff --git a/graphics/items/icons/cherish_ball.png b/graphics/items/icons/cherish_ball.png new file mode 100644 index 000000000..7efdf22dc Binary files /dev/null and b/graphics/items/icons/cherish_ball.png differ diff --git a/graphics/items/icons/chilan_berry.png b/graphics/items/icons/chilan_berry.png new file mode 100755 index 000000000..d1516f732 Binary files /dev/null and b/graphics/items/icons/chilan_berry.png differ diff --git a/graphics/items/icons/chill_drive.png b/graphics/items/icons/chill_drive.png new file mode 100644 index 000000000..a2c7e98a6 Binary files /dev/null and b/graphics/items/icons/chill_drive.png differ diff --git a/graphics/items/icons/choice_scarf.png b/graphics/items/icons/choice_scarf.png new file mode 100644 index 000000000..51157fcc2 Binary files /dev/null and b/graphics/items/icons/choice_scarf.png differ diff --git a/graphics/items/icons/choice_specs.png b/graphics/items/icons/choice_specs.png new file mode 100644 index 000000000..6c64cb26e Binary files /dev/null and b/graphics/items/icons/choice_specs.png differ diff --git a/graphics/items/icons/chople_berry.png b/graphics/items/icons/chople_berry.png new file mode 100755 index 000000000..3fa84f379 Binary files /dev/null and b/graphics/items/icons/chople_berry.png differ diff --git a/graphics/items/icons/clever_wing.png b/graphics/items/icons/clever_wing.png new file mode 100755 index 000000000..3cc0a3d5f Binary files /dev/null and b/graphics/items/icons/clever_wing.png differ diff --git a/graphics/items/icons/coba_berry.png b/graphics/items/icons/coba_berry.png new file mode 100755 index 000000000..5ac21683e Binary files /dev/null and b/graphics/items/icons/coba_berry.png differ diff --git a/graphics/items/icons/colbur_berry.png b/graphics/items/icons/colbur_berry.png new file mode 100755 index 000000000..56d46a52a Binary files /dev/null and b/graphics/items/icons/colbur_berry.png differ diff --git a/graphics/items/icons/cover_fossil.png b/graphics/items/icons/cover_fossil.png new file mode 100755 index 000000000..bc8bbe69b Binary files /dev/null and b/graphics/items/icons/cover_fossil.png differ diff --git a/graphics/items/icons/custap_berry.png b/graphics/items/icons/custap_berry.png new file mode 100755 index 000000000..3fa594667 Binary files /dev/null and b/graphics/items/icons/custap_berry.png differ diff --git a/graphics/items/icons/damp_rock.png b/graphics/items/icons/damp_rock.png new file mode 100644 index 000000000..fe908739e Binary files /dev/null and b/graphics/items/icons/damp_rock.png differ diff --git a/graphics/items/icons/dark_gem.png b/graphics/items/icons/dark_gem.png new file mode 100644 index 000000000..947f04167 Binary files /dev/null and b/graphics/items/icons/dark_gem.png differ diff --git a/graphics/items/icons/dark_memory.png b/graphics/items/icons/dark_memory.png new file mode 100755 index 000000000..258bd309b Binary files /dev/null and b/graphics/items/icons/dark_memory.png differ diff --git a/graphics/items/icons/dawn_stone.png b/graphics/items/icons/dawn_stone.png new file mode 100755 index 000000000..0465d18ba Binary files /dev/null and b/graphics/items/icons/dawn_stone.png differ diff --git a/graphics/items/icons/destiny_knot.png b/graphics/items/icons/destiny_knot.png new file mode 100644 index 000000000..ceeb38d5c Binary files /dev/null and b/graphics/items/icons/destiny_knot.png differ diff --git a/graphics/items/icons/diancite.png b/graphics/items/icons/diancite.png new file mode 100644 index 000000000..5bb89f3ed Binary files /dev/null and b/graphics/items/icons/diancite.png differ diff --git a/graphics/items/icons/douse_drive.png b/graphics/items/icons/douse_drive.png new file mode 100644 index 000000000..eee5ae35f Binary files /dev/null and b/graphics/items/icons/douse_drive.png differ diff --git a/graphics/items/icons/draco_plate.png b/graphics/items/icons/draco_plate.png new file mode 100644 index 000000000..9b08c31c8 Binary files /dev/null and b/graphics/items/icons/draco_plate.png differ diff --git a/graphics/items/icons/dragon_gem.png b/graphics/items/icons/dragon_gem.png new file mode 100644 index 000000000..2d41c858c Binary files /dev/null and b/graphics/items/icons/dragon_gem.png differ diff --git a/graphics/items/icons/dragon_memory.png b/graphics/items/icons/dragon_memory.png new file mode 100755 index 000000000..d073dace3 Binary files /dev/null and b/graphics/items/icons/dragon_memory.png differ diff --git a/graphics/items/icons/dread_plate.png b/graphics/items/icons/dread_plate.png new file mode 100644 index 000000000..f93493f97 Binary files /dev/null and b/graphics/items/icons/dread_plate.png differ diff --git a/graphics/items/icons/dream_ball.png b/graphics/items/icons/dream_ball.png new file mode 100644 index 000000000..e429add9e Binary files /dev/null and b/graphics/items/icons/dream_ball.png differ diff --git a/graphics/items/icons/dubious_disc.png b/graphics/items/icons/dubious_disc.png new file mode 100755 index 000000000..bf2ab2fc0 Binary files /dev/null and b/graphics/items/icons/dubious_disc.png differ diff --git a/graphics/items/icons/dusk_ball.png b/graphics/items/icons/dusk_ball.png new file mode 100644 index 000000000..a723c095b Binary files /dev/null and b/graphics/items/icons/dusk_ball.png differ diff --git a/graphics/items/icons/dusk_stone.png b/graphics/items/icons/dusk_stone.png new file mode 100755 index 000000000..e928b2516 Binary files /dev/null and b/graphics/items/icons/dusk_stone.png differ diff --git a/graphics/items/icons/earth_plate.png b/graphics/items/icons/earth_plate.png new file mode 100644 index 000000000..688b24be3 Binary files /dev/null and b/graphics/items/icons/earth_plate.png differ diff --git a/graphics/items/icons/eject_button.png b/graphics/items/icons/eject_button.png new file mode 100755 index 000000000..a0492ed6e Binary files /dev/null and b/graphics/items/icons/eject_button.png differ diff --git a/graphics/items/icons/electirizer.png b/graphics/items/icons/electirizer.png new file mode 100755 index 000000000..73f6f8f26 Binary files /dev/null and b/graphics/items/icons/electirizer.png differ diff --git a/graphics/items/icons/electric_gem.png b/graphics/items/icons/electric_gem.png new file mode 100644 index 000000000..88e604f18 Binary files /dev/null and b/graphics/items/icons/electric_gem.png differ diff --git a/graphics/items/icons/electric_memory.png b/graphics/items/icons/electric_memory.png new file mode 100755 index 000000000..ce9a8f362 Binary files /dev/null and b/graphics/items/icons/electric_memory.png differ diff --git a/graphics/items/icons/electric_seed.png b/graphics/items/icons/electric_seed.png new file mode 100644 index 000000000..cdcac30ae Binary files /dev/null and b/graphics/items/icons/electric_seed.png differ diff --git a/graphics/items/icons/eviolite.png b/graphics/items/icons/eviolite.png new file mode 100644 index 000000000..c08cc5950 Binary files /dev/null and b/graphics/items/icons/eviolite.png differ diff --git a/graphics/items/icons/expert_belt.png b/graphics/items/icons/expert_belt.png new file mode 100644 index 000000000..bc0045490 Binary files /dev/null and b/graphics/items/icons/expert_belt.png differ diff --git a/graphics/items/icons/fairy_gem.png b/graphics/items/icons/fairy_gem.png new file mode 100644 index 000000000..871f74426 Binary files /dev/null and b/graphics/items/icons/fairy_gem.png differ diff --git a/graphics/items/icons/fairy_memory.png b/graphics/items/icons/fairy_memory.png new file mode 100755 index 000000000..fba869128 Binary files /dev/null and b/graphics/items/icons/fairy_memory.png differ diff --git a/graphics/items/icons/fast_ball.png b/graphics/items/icons/fast_ball.png new file mode 100644 index 000000000..2eb8ddd02 Binary files /dev/null and b/graphics/items/icons/fast_ball.png differ diff --git a/graphics/items/icons/fighting_gem.png b/graphics/items/icons/fighting_gem.png new file mode 100644 index 000000000..7f4fc8b97 Binary files /dev/null and b/graphics/items/icons/fighting_gem.png differ diff --git a/graphics/items/icons/fighting_memory.png b/graphics/items/icons/fighting_memory.png new file mode 100755 index 000000000..ad21a2d07 Binary files /dev/null and b/graphics/items/icons/fighting_memory.png differ diff --git a/graphics/items/icons/fire_gem.png b/graphics/items/icons/fire_gem.png new file mode 100644 index 000000000..deb8979bd Binary files /dev/null and b/graphics/items/icons/fire_gem.png differ diff --git a/graphics/items/icons/fire_memory.png b/graphics/items/icons/fire_memory.png new file mode 100755 index 000000000..33116aed1 Binary files /dev/null and b/graphics/items/icons/fire_memory.png differ diff --git a/graphics/items/icons/fist_plate.png b/graphics/items/icons/fist_plate.png new file mode 100644 index 000000000..0142938d5 Binary files /dev/null and b/graphics/items/icons/fist_plate.png differ diff --git a/graphics/items/icons/flame_orb.png b/graphics/items/icons/flame_orb.png new file mode 100644 index 000000000..e5e576f8a Binary files /dev/null and b/graphics/items/icons/flame_orb.png differ diff --git a/graphics/items/icons/flame_plate.png b/graphics/items/icons/flame_plate.png new file mode 100644 index 000000000..6f78e5d02 Binary files /dev/null and b/graphics/items/icons/flame_plate.png differ diff --git a/graphics/items/icons/float_stone.png b/graphics/items/icons/float_stone.png new file mode 100644 index 000000000..61f096fc3 Binary files /dev/null and b/graphics/items/icons/float_stone.png differ diff --git a/graphics/items/icons/flying_gem.png b/graphics/items/icons/flying_gem.png new file mode 100644 index 000000000..563e80f3b Binary files /dev/null and b/graphics/items/icons/flying_gem.png differ diff --git a/graphics/items/icons/flying_memory.png b/graphics/items/icons/flying_memory.png new file mode 100755 index 000000000..da413ba1f Binary files /dev/null and b/graphics/items/icons/flying_memory.png differ diff --git a/graphics/items/icons/focus_sash.png b/graphics/items/icons/focus_sash.png new file mode 100644 index 000000000..e0df9798e Binary files /dev/null and b/graphics/items/icons/focus_sash.png differ diff --git a/graphics/items/icons/friend_ball.png b/graphics/items/icons/friend_ball.png new file mode 100644 index 000000000..7c2c8ce14 Binary files /dev/null and b/graphics/items/icons/friend_ball.png differ diff --git a/graphics/items/icons/full_incense.png b/graphics/items/icons/full_incense.png new file mode 100755 index 000000000..230927e08 Binary files /dev/null and b/graphics/items/icons/full_incense.png differ diff --git a/graphics/items/icons/galladite.png b/graphics/items/icons/galladite.png new file mode 100644 index 000000000..827b616cc Binary files /dev/null and b/graphics/items/icons/galladite.png differ diff --git a/graphics/items/icons/garchompite.png b/graphics/items/icons/garchompite.png new file mode 100644 index 000000000..0be15d5ad Binary files /dev/null and b/graphics/items/icons/garchompite.png differ diff --git a/graphics/items/icons/gardevoirite.png b/graphics/items/icons/gardevoirite.png new file mode 100644 index 000000000..4bb3a9a50 Binary files /dev/null and b/graphics/items/icons/gardevoirite.png differ diff --git a/graphics/items/icons/gengarite.png b/graphics/items/icons/gengarite.png new file mode 100644 index 000000000..22ac015b9 Binary files /dev/null and b/graphics/items/icons/gengarite.png differ diff --git a/graphics/items/icons/genius_wing.png b/graphics/items/icons/genius_wing.png new file mode 100755 index 000000000..5b27a029e Binary files /dev/null and b/graphics/items/icons/genius_wing.png differ diff --git a/graphics/items/icons/ghost_gem.png b/graphics/items/icons/ghost_gem.png new file mode 100644 index 000000000..96e320e21 Binary files /dev/null and b/graphics/items/icons/ghost_gem.png differ diff --git a/graphics/items/icons/ghost_memory.png b/graphics/items/icons/ghost_memory.png new file mode 100755 index 000000000..3041643aa Binary files /dev/null and b/graphics/items/icons/ghost_memory.png differ diff --git a/graphics/items/icons/glalitite.png b/graphics/items/icons/glalitite.png new file mode 100644 index 000000000..cea93a2cb Binary files /dev/null and b/graphics/items/icons/glalitite.png differ diff --git a/graphics/items/icons/gracidea.png b/graphics/items/icons/gracidea.png new file mode 100755 index 000000000..31bac3846 Binary files /dev/null and b/graphics/items/icons/gracidea.png differ diff --git a/graphics/items/icons/grass_gem.png b/graphics/items/icons/grass_gem.png new file mode 100644 index 000000000..df57119b2 Binary files /dev/null and b/graphics/items/icons/grass_gem.png differ diff --git a/graphics/items/icons/grass_memory.png b/graphics/items/icons/grass_memory.png new file mode 100755 index 000000000..646568c41 Binary files /dev/null and b/graphics/items/icons/grass_memory.png differ diff --git a/graphics/items/icons/grassy_seed.png b/graphics/items/icons/grassy_seed.png new file mode 100644 index 000000000..31f30aeb5 Binary files /dev/null and b/graphics/items/icons/grassy_seed.png differ diff --git a/graphics/items/icons/green_apricorn.png b/graphics/items/icons/green_apricorn.png new file mode 100755 index 000000000..dc821541b Binary files /dev/null and b/graphics/items/icons/green_apricorn.png differ diff --git a/graphics/items/icons/grip_claw.png b/graphics/items/icons/grip_claw.png new file mode 100644 index 000000000..d76c6b75c Binary files /dev/null and b/graphics/items/icons/grip_claw.png differ diff --git a/graphics/items/icons/griseous_orb.png b/graphics/items/icons/griseous_orb.png new file mode 100644 index 000000000..5140ea3ac Binary files /dev/null and b/graphics/items/icons/griseous_orb.png differ diff --git a/graphics/items/icons/ground_gem.png b/graphics/items/icons/ground_gem.png new file mode 100644 index 000000000..27a8bf69d Binary files /dev/null and b/graphics/items/icons/ground_gem.png differ diff --git a/graphics/items/icons/ground_memory.png b/graphics/items/icons/ground_memory.png new file mode 100755 index 000000000..0f9f31734 Binary files /dev/null and b/graphics/items/icons/ground_memory.png differ diff --git a/graphics/items/icons/gyaradosite.png b/graphics/items/icons/gyaradosite.png new file mode 100644 index 000000000..5a6278df2 Binary files /dev/null and b/graphics/items/icons/gyaradosite.png differ diff --git a/graphics/items/icons/haban_berry.png b/graphics/items/icons/haban_berry.png new file mode 100755 index 000000000..f413ea9e1 Binary files /dev/null and b/graphics/items/icons/haban_berry.png differ diff --git a/graphics/items/icons/heal_ball.png b/graphics/items/icons/heal_ball.png new file mode 100644 index 000000000..765c7326c Binary files /dev/null and b/graphics/items/icons/heal_ball.png differ diff --git a/graphics/items/icons/health_wing.png b/graphics/items/icons/health_wing.png new file mode 100755 index 000000000..584cc4f13 Binary files /dev/null and b/graphics/items/icons/health_wing.png differ diff --git a/graphics/items/icons/heat_rock.png b/graphics/items/icons/heat_rock.png new file mode 100644 index 000000000..60eae8169 Binary files /dev/null and b/graphics/items/icons/heat_rock.png differ diff --git a/graphics/items/icons/heavy_ball.png b/graphics/items/icons/heavy_ball.png new file mode 100644 index 000000000..c66678ebb Binary files /dev/null and b/graphics/items/icons/heavy_ball.png differ diff --git a/graphics/items/icons/heracronite.png b/graphics/items/icons/heracronite.png new file mode 100644 index 000000000..400a87684 Binary files /dev/null and b/graphics/items/icons/heracronite.png differ diff --git a/graphics/items/icons/honey.png b/graphics/items/icons/honey.png new file mode 100644 index 000000000..837243e77 Binary files /dev/null and b/graphics/items/icons/honey.png differ diff --git a/graphics/items/icons/houndoominite.png b/graphics/items/icons/houndoominite.png new file mode 100644 index 000000000..bca28d336 Binary files /dev/null and b/graphics/items/icons/houndoominite.png differ diff --git a/graphics/items/icons/ice_gem.png b/graphics/items/icons/ice_gem.png new file mode 100644 index 000000000..db87018fe Binary files /dev/null and b/graphics/items/icons/ice_gem.png differ diff --git a/graphics/items/icons/ice_memory.png b/graphics/items/icons/ice_memory.png new file mode 100755 index 000000000..c0f7cd76e Binary files /dev/null and b/graphics/items/icons/ice_memory.png differ diff --git a/graphics/items/icons/ice_stone.png b/graphics/items/icons/ice_stone.png new file mode 100755 index 000000000..ee5309544 Binary files /dev/null and b/graphics/items/icons/ice_stone.png differ diff --git a/graphics/items/icons/icicle_plate.png b/graphics/items/icons/icicle_plate.png new file mode 100644 index 000000000..2d3e27bbb Binary files /dev/null and b/graphics/items/icons/icicle_plate.png differ diff --git a/graphics/items/icons/icy_rock.png b/graphics/items/icons/icy_rock.png new file mode 100644 index 000000000..800b12ec8 Binary files /dev/null and b/graphics/items/icons/icy_rock.png differ diff --git a/graphics/items/icons/insect_plate.png b/graphics/items/icons/insect_plate.png new file mode 100644 index 000000000..993e420da Binary files /dev/null and b/graphics/items/icons/insect_plate.png differ diff --git a/graphics/items/icons/iron_ball.png b/graphics/items/icons/iron_ball.png new file mode 100644 index 000000000..e1f82bde1 Binary files /dev/null and b/graphics/items/icons/iron_ball.png differ diff --git a/graphics/items/icons/iron_plate.png b/graphics/items/icons/iron_plate.png new file mode 100644 index 000000000..08a3cb8b9 Binary files /dev/null and b/graphics/items/icons/iron_plate.png differ diff --git a/graphics/items/icons/jaboca_berry.png b/graphics/items/icons/jaboca_berry.png new file mode 100755 index 000000000..da6d029b0 Binary files /dev/null and b/graphics/items/icons/jaboca_berry.png differ diff --git a/graphics/items/icons/jaw_fossil.png b/graphics/items/icons/jaw_fossil.png new file mode 100755 index 000000000..a52a7579f Binary files /dev/null and b/graphics/items/icons/jaw_fossil.png differ diff --git a/graphics/items/icons/kangaskhanite.png b/graphics/items/icons/kangaskhanite.png new file mode 100644 index 000000000..2b614703e Binary files /dev/null and b/graphics/items/icons/kangaskhanite.png differ diff --git a/graphics/items/icons/kasib_berry.png b/graphics/items/icons/kasib_berry.png new file mode 100755 index 000000000..c09fa20de Binary files /dev/null and b/graphics/items/icons/kasib_berry.png differ diff --git a/graphics/items/icons/kebia_berry.png b/graphics/items/icons/kebia_berry.png new file mode 100755 index 000000000..a4b5a4393 Binary files /dev/null and b/graphics/items/icons/kebia_berry.png differ diff --git a/graphics/items/icons/kee_berry.png b/graphics/items/icons/kee_berry.png new file mode 100755 index 000000000..83749d1b8 Binary files /dev/null and b/graphics/items/icons/kee_berry.png differ diff --git a/graphics/items/icons/lagging_tail.png b/graphics/items/icons/lagging_tail.png new file mode 100644 index 000000000..3299515b6 Binary files /dev/null and b/graphics/items/icons/lagging_tail.png differ diff --git a/graphics/items/icons/latiasite.png b/graphics/items/icons/latiasite.png new file mode 100644 index 000000000..af1d357ee Binary files /dev/null and b/graphics/items/icons/latiasite.png differ diff --git a/graphics/items/icons/latiosite.png b/graphics/items/icons/latiosite.png new file mode 100644 index 000000000..f6d4e7d23 Binary files /dev/null and b/graphics/items/icons/latiosite.png differ diff --git a/graphics/items/icons/level_ball.png b/graphics/items/icons/level_ball.png new file mode 100644 index 000000000..7943f8e85 Binary files /dev/null and b/graphics/items/icons/level_ball.png differ diff --git a/graphics/items/icons/life_orb.png b/graphics/items/icons/life_orb.png new file mode 100644 index 000000000..9a9ed7c68 Binary files /dev/null and b/graphics/items/icons/life_orb.png differ diff --git a/graphics/items/icons/light_clay.png b/graphics/items/icons/light_clay.png new file mode 100644 index 000000000..7cc3e6380 Binary files /dev/null and b/graphics/items/icons/light_clay.png differ diff --git a/graphics/items/icons/lopunnite.png b/graphics/items/icons/lopunnite.png new file mode 100644 index 000000000..dcd8d9574 Binary files /dev/null and b/graphics/items/icons/lopunnite.png differ diff --git a/graphics/items/icons/love_ball.png b/graphics/items/icons/love_ball.png new file mode 100644 index 000000000..0040eb0de Binary files /dev/null and b/graphics/items/icons/love_ball.png differ diff --git a/graphics/items/icons/lucarionite.png b/graphics/items/icons/lucarionite.png new file mode 100644 index 000000000..ea4955c8a Binary files /dev/null and b/graphics/items/icons/lucarionite.png differ diff --git a/graphics/items/icons/luck_incense.png b/graphics/items/icons/luck_incense.png new file mode 100755 index 000000000..396ab2f61 Binary files /dev/null and b/graphics/items/icons/luck_incense.png differ diff --git a/graphics/items/icons/luminous_moss.png b/graphics/items/icons/luminous_moss.png new file mode 100755 index 000000000..6ee31c5e1 Binary files /dev/null and b/graphics/items/icons/luminous_moss.png differ diff --git a/graphics/items/icons/lure_ball.png b/graphics/items/icons/lure_ball.png new file mode 100644 index 000000000..765049c75 Binary files /dev/null and b/graphics/items/icons/lure_ball.png differ diff --git a/graphics/items/icons/lustrous_orb.png b/graphics/items/icons/lustrous_orb.png new file mode 100644 index 000000000..08b452aba Binary files /dev/null and b/graphics/items/icons/lustrous_orb.png differ diff --git a/graphics/items/icons/magmarizer.png b/graphics/items/icons/magmarizer.png new file mode 100755 index 000000000..fcaf04b44 Binary files /dev/null and b/graphics/items/icons/magmarizer.png differ diff --git a/graphics/items/icons/manectite.png b/graphics/items/icons/manectite.png new file mode 100644 index 000000000..af70ce0ae Binary files /dev/null and b/graphics/items/icons/manectite.png differ diff --git a/graphics/items/icons/maranga_berry.png b/graphics/items/icons/maranga_berry.png new file mode 100755 index 000000000..2551c0167 Binary files /dev/null and b/graphics/items/icons/maranga_berry.png differ diff --git a/graphics/items/icons/mawilite.png b/graphics/items/icons/mawilite.png new file mode 100644 index 000000000..8505274fd Binary files /dev/null and b/graphics/items/icons/mawilite.png differ diff --git a/graphics/items/icons/meadow_plate.png b/graphics/items/icons/meadow_plate.png new file mode 100644 index 000000000..5cec7fc16 Binary files /dev/null and b/graphics/items/icons/meadow_plate.png differ diff --git a/graphics/items/icons/medichamite.png b/graphics/items/icons/medichamite.png new file mode 100644 index 000000000..e494b4c03 Binary files /dev/null and b/graphics/items/icons/medichamite.png differ diff --git a/graphics/items/icons/mega_bracelet.png b/graphics/items/icons/mega_bracelet.png new file mode 100644 index 000000000..5a0989474 Binary files /dev/null and b/graphics/items/icons/mega_bracelet.png differ diff --git a/graphics/items/icons/metagrossite.png b/graphics/items/icons/metagrossite.png new file mode 100644 index 000000000..9a936f4cf Binary files /dev/null and b/graphics/items/icons/metagrossite.png differ diff --git a/graphics/items/icons/metronome.png b/graphics/items/icons/metronome.png new file mode 100644 index 000000000..4aa57f95e Binary files /dev/null and b/graphics/items/icons/metronome.png differ diff --git a/graphics/items/icons/mewtwonite_x.png b/graphics/items/icons/mewtwonite_x.png new file mode 100644 index 000000000..5085bf221 Binary files /dev/null and b/graphics/items/icons/mewtwonite_x.png differ diff --git a/graphics/items/icons/mewtwonite_y.png b/graphics/items/icons/mewtwonite_y.png new file mode 100644 index 000000000..25209bb39 Binary files /dev/null and b/graphics/items/icons/mewtwonite_y.png differ diff --git a/graphics/items/icons/micle_berry.png b/graphics/items/icons/micle_berry.png new file mode 100755 index 000000000..74e011d0e Binary files /dev/null and b/graphics/items/icons/micle_berry.png differ diff --git a/graphics/items/icons/mind_plate.png b/graphics/items/icons/mind_plate.png new file mode 100644 index 000000000..dfe89ddbb Binary files /dev/null and b/graphics/items/icons/mind_plate.png differ diff --git a/graphics/items/icons/misty_seed.png b/graphics/items/icons/misty_seed.png new file mode 100644 index 000000000..58764aca5 Binary files /dev/null and b/graphics/items/icons/misty_seed.png differ diff --git a/graphics/items/icons/moon_ball.png b/graphics/items/icons/moon_ball.png new file mode 100644 index 000000000..cc67522d4 Binary files /dev/null and b/graphics/items/icons/moon_ball.png differ diff --git a/graphics/items/icons/muscle_band.png b/graphics/items/icons/muscle_band.png new file mode 100644 index 000000000..b374760a7 Binary files /dev/null and b/graphics/items/icons/muscle_band.png differ diff --git a/graphics/items/icons/muscle_wing.png b/graphics/items/icons/muscle_wing.png new file mode 100755 index 000000000..5ebf263b2 Binary files /dev/null and b/graphics/items/icons/muscle_wing.png differ diff --git a/graphics/items/icons/normal_gem.png b/graphics/items/icons/normal_gem.png new file mode 100644 index 000000000..c57142c32 Binary files /dev/null and b/graphics/items/icons/normal_gem.png differ diff --git a/graphics/items/icons/occa_berry.png b/graphics/items/icons/occa_berry.png new file mode 100755 index 000000000..05d9860fb Binary files /dev/null and b/graphics/items/icons/occa_berry.png differ diff --git a/graphics/items/icons/odd_incense.png b/graphics/items/icons/odd_incense.png new file mode 100755 index 000000000..11c7d24f7 Binary files /dev/null and b/graphics/items/icons/odd_incense.png differ diff --git a/graphics/items/icons/odd_keystone.png b/graphics/items/icons/odd_keystone.png new file mode 100755 index 000000000..8ef2d3cdb Binary files /dev/null and b/graphics/items/icons/odd_keystone.png differ diff --git a/graphics/items/icons/old_gateau.png b/graphics/items/icons/old_gateau.png new file mode 100755 index 000000000..064c997a5 Binary files /dev/null and b/graphics/items/icons/old_gateau.png differ diff --git a/graphics/items/icons/oval_stone.png b/graphics/items/icons/oval_stone.png new file mode 100755 index 000000000..27e0a7ccf Binary files /dev/null and b/graphics/items/icons/oval_stone.png differ diff --git a/graphics/items/icons/park_ball.png b/graphics/items/icons/park_ball.png new file mode 100644 index 000000000..c527ac1cc Binary files /dev/null and b/graphics/items/icons/park_ball.png differ diff --git a/graphics/items/icons/passho_berry.png b/graphics/items/icons/passho_berry.png new file mode 100755 index 000000000..cdf375607 Binary files /dev/null and b/graphics/items/icons/passho_berry.png differ diff --git a/graphics/items/icons/payapa_berry.png b/graphics/items/icons/payapa_berry.png new file mode 100755 index 000000000..fe021c473 Binary files /dev/null and b/graphics/items/icons/payapa_berry.png differ diff --git a/graphics/items/icons/pidgeotite.png b/graphics/items/icons/pidgeotite.png new file mode 100644 index 000000000..8cc9ab6b1 Binary files /dev/null and b/graphics/items/icons/pidgeotite.png differ diff --git a/graphics/items/icons/pink_apricorn.png b/graphics/items/icons/pink_apricorn.png new file mode 100755 index 000000000..abcedcba4 Binary files /dev/null and b/graphics/items/icons/pink_apricorn.png differ diff --git a/graphics/items/icons/pink_nectar.png b/graphics/items/icons/pink_nectar.png new file mode 100755 index 000000000..21e88d302 Binary files /dev/null and b/graphics/items/icons/pink_nectar.png differ diff --git a/graphics/items/icons/pinsirite.png b/graphics/items/icons/pinsirite.png new file mode 100644 index 000000000..a201c320c Binary files /dev/null and b/graphics/items/icons/pinsirite.png differ diff --git a/graphics/items/icons/pixie_plate.png b/graphics/items/icons/pixie_plate.png new file mode 100644 index 000000000..4c34f22ab Binary files /dev/null and b/graphics/items/icons/pixie_plate.png differ diff --git a/graphics/items/icons/plume_fossil.png b/graphics/items/icons/plume_fossil.png new file mode 100755 index 000000000..cf98166b3 Binary files /dev/null and b/graphics/items/icons/plume_fossil.png differ diff --git a/graphics/items/icons/poison_gem.png b/graphics/items/icons/poison_gem.png new file mode 100644 index 000000000..ab339eb71 Binary files /dev/null and b/graphics/items/icons/poison_gem.png differ diff --git a/graphics/items/icons/poison_memory.png b/graphics/items/icons/poison_memory.png new file mode 100755 index 000000000..e665d8176 Binary files /dev/null and b/graphics/items/icons/poison_memory.png differ diff --git a/graphics/items/icons/power_anklet.png b/graphics/items/icons/power_anklet.png new file mode 100755 index 000000000..3a2091c8e Binary files /dev/null and b/graphics/items/icons/power_anklet.png differ diff --git a/graphics/items/icons/power_band.png b/graphics/items/icons/power_band.png new file mode 100755 index 000000000..a88e5391b Binary files /dev/null and b/graphics/items/icons/power_band.png differ diff --git a/graphics/items/icons/power_belt.png b/graphics/items/icons/power_belt.png new file mode 100755 index 000000000..e4273f85c Binary files /dev/null and b/graphics/items/icons/power_belt.png differ diff --git a/graphics/items/icons/power_bracer.png b/graphics/items/icons/power_bracer.png new file mode 100755 index 000000000..54aa34844 Binary files /dev/null and b/graphics/items/icons/power_bracer.png differ diff --git a/graphics/items/icons/power_herb.png b/graphics/items/icons/power_herb.png new file mode 100644 index 000000000..947996c4c Binary files /dev/null and b/graphics/items/icons/power_herb.png differ diff --git a/graphics/items/icons/power_lens.png b/graphics/items/icons/power_lens.png new file mode 100755 index 000000000..b18d91186 Binary files /dev/null and b/graphics/items/icons/power_lens.png differ diff --git a/graphics/items/icons/power_weight.png b/graphics/items/icons/power_weight.png new file mode 100755 index 000000000..149679c38 Binary files /dev/null and b/graphics/items/icons/power_weight.png differ diff --git a/graphics/items/icons/pretty_wing.png b/graphics/items/icons/pretty_wing.png new file mode 100755 index 000000000..69c66306d Binary files /dev/null and b/graphics/items/icons/pretty_wing.png differ diff --git a/graphics/items/icons/prism_scale.png b/graphics/items/icons/prism_scale.png new file mode 100755 index 000000000..335816ddb Binary files /dev/null and b/graphics/items/icons/prism_scale.png differ diff --git a/graphics/items/icons/protective_pads.png b/graphics/items/icons/protective_pads.png new file mode 100644 index 000000000..3676fd311 Binary files /dev/null and b/graphics/items/icons/protective_pads.png differ diff --git a/graphics/items/icons/protector.png b/graphics/items/icons/protector.png new file mode 100755 index 000000000..fa88ae155 Binary files /dev/null and b/graphics/items/icons/protector.png differ diff --git a/graphics/items/icons/psychic_gem.png b/graphics/items/icons/psychic_gem.png new file mode 100644 index 000000000..6b84f38da Binary files /dev/null and b/graphics/items/icons/psychic_gem.png differ diff --git a/graphics/items/icons/psychic_memory.png b/graphics/items/icons/psychic_memory.png new file mode 100755 index 000000000..beda2c22d Binary files /dev/null and b/graphics/items/icons/psychic_memory.png differ diff --git a/graphics/items/icons/psychic_seed.png b/graphics/items/icons/psychic_seed.png new file mode 100644 index 000000000..4c90afb9c Binary files /dev/null and b/graphics/items/icons/psychic_seed.png differ diff --git a/graphics/items/icons/pure_incense.png b/graphics/items/icons/pure_incense.png new file mode 100755 index 000000000..8657683b1 Binary files /dev/null and b/graphics/items/icons/pure_incense.png differ diff --git a/graphics/items/icons/purple_nectar.png b/graphics/items/icons/purple_nectar.png new file mode 100755 index 000000000..59111f1e4 Binary files /dev/null and b/graphics/items/icons/purple_nectar.png differ diff --git a/graphics/items/icons/quick_ball.png b/graphics/items/icons/quick_ball.png new file mode 100644 index 000000000..6f39b934f Binary files /dev/null and b/graphics/items/icons/quick_ball.png differ diff --git a/graphics/items/icons/quick_powder.png b/graphics/items/icons/quick_powder.png new file mode 100644 index 000000000..d83b0b506 Binary files /dev/null and b/graphics/items/icons/quick_powder.png differ diff --git a/graphics/items/icons/rare_bone.png b/graphics/items/icons/rare_bone.png new file mode 100755 index 000000000..80b4af9d5 Binary files /dev/null and b/graphics/items/icons/rare_bone.png differ diff --git a/graphics/items/icons/razor_claw.png b/graphics/items/icons/razor_claw.png new file mode 100755 index 000000000..59c27fc80 Binary files /dev/null and b/graphics/items/icons/razor_claw.png differ diff --git a/graphics/items/icons/razor_fang.png b/graphics/items/icons/razor_fang.png new file mode 100755 index 000000000..dd54b98e7 Binary files /dev/null and b/graphics/items/icons/razor_fang.png differ diff --git a/graphics/items/icons/reaper_cloth.png b/graphics/items/icons/reaper_cloth.png new file mode 100755 index 000000000..73f087442 Binary files /dev/null and b/graphics/items/icons/reaper_cloth.png differ diff --git a/graphics/items/icons/red_apricorn.png b/graphics/items/icons/red_apricorn.png new file mode 100755 index 000000000..52d219c07 Binary files /dev/null and b/graphics/items/icons/red_apricorn.png differ diff --git a/graphics/items/icons/red_card.png b/graphics/items/icons/red_card.png new file mode 100755 index 000000000..1d07d827f Binary files /dev/null and b/graphics/items/icons/red_card.png differ diff --git a/graphics/items/icons/red_nectar.png b/graphics/items/icons/red_nectar.png new file mode 100755 index 000000000..1d2058dca Binary files /dev/null and b/graphics/items/icons/red_nectar.png differ diff --git a/graphics/items/icons/resist_wing.png b/graphics/items/icons/resist_wing.png new file mode 100755 index 000000000..d71715162 Binary files /dev/null and b/graphics/items/icons/resist_wing.png differ diff --git a/graphics/items/icons/rindo_berry.png b/graphics/items/icons/rindo_berry.png new file mode 100755 index 000000000..4729e188c Binary files /dev/null and b/graphics/items/icons/rindo_berry.png differ diff --git a/graphics/items/icons/ring_target.png b/graphics/items/icons/ring_target.png new file mode 100755 index 000000000..fae2b944b Binary files /dev/null and b/graphics/items/icons/ring_target.png differ diff --git a/graphics/items/icons/rock_gem.png b/graphics/items/icons/rock_gem.png new file mode 100644 index 000000000..6d6070b51 Binary files /dev/null and b/graphics/items/icons/rock_gem.png differ diff --git a/graphics/items/icons/rock_incense.png b/graphics/items/icons/rock_incense.png new file mode 100755 index 000000000..04a3d1b5c Binary files /dev/null and b/graphics/items/icons/rock_incense.png differ diff --git a/graphics/items/icons/rock_memory.png b/graphics/items/icons/rock_memory.png new file mode 100755 index 000000000..32d46fea4 Binary files /dev/null and b/graphics/items/icons/rock_memory.png differ diff --git a/graphics/items/icons/rocky_helmet.png b/graphics/items/icons/rocky_helmet.png new file mode 100755 index 000000000..006a9f8aa Binary files /dev/null and b/graphics/items/icons/rocky_helmet.png differ diff --git a/graphics/items/icons/rose_incense.png b/graphics/items/icons/rose_incense.png new file mode 100755 index 000000000..c6b6abcc3 Binary files /dev/null and b/graphics/items/icons/rose_incense.png differ diff --git a/graphics/items/icons/roseli_berry.png b/graphics/items/icons/roseli_berry.png new file mode 100755 index 000000000..7487cb2a4 Binary files /dev/null and b/graphics/items/icons/roseli_berry.png differ diff --git a/graphics/items/icons/rowap_berry.png b/graphics/items/icons/rowap_berry.png new file mode 100755 index 000000000..a25d39838 Binary files /dev/null and b/graphics/items/icons/rowap_berry.png differ diff --git a/graphics/items/icons/sablenite.png b/graphics/items/icons/sablenite.png new file mode 100644 index 000000000..ad348b435 Binary files /dev/null and b/graphics/items/icons/sablenite.png differ diff --git a/graphics/items/icons/sachet.png b/graphics/items/icons/sachet.png new file mode 100755 index 000000000..32c566a91 Binary files /dev/null and b/graphics/items/icons/sachet.png differ diff --git a/graphics/items/icons/safety_goggles.png b/graphics/items/icons/safety_goggles.png new file mode 100644 index 000000000..7a1efab67 Binary files /dev/null and b/graphics/items/icons/safety_goggles.png differ diff --git a/graphics/items/icons/sail_fossil.png b/graphics/items/icons/sail_fossil.png new file mode 100755 index 000000000..4c6514820 Binary files /dev/null and b/graphics/items/icons/sail_fossil.png differ diff --git a/graphics/items/icons/salamencite.png b/graphics/items/icons/salamencite.png new file mode 100644 index 000000000..557cc29d7 Binary files /dev/null and b/graphics/items/icons/salamencite.png differ diff --git a/graphics/items/icons/sceptilite.png b/graphics/items/icons/sceptilite.png new file mode 100644 index 000000000..ba61c74aa Binary files /dev/null and b/graphics/items/icons/sceptilite.png differ diff --git a/graphics/items/icons/scizorite.png b/graphics/items/icons/scizorite.png new file mode 100644 index 000000000..8b2d81335 Binary files /dev/null and b/graphics/items/icons/scizorite.png differ diff --git a/graphics/items/icons/sharpedonite.png b/graphics/items/icons/sharpedonite.png new file mode 100644 index 000000000..20c8642b2 Binary files /dev/null and b/graphics/items/icons/sharpedonite.png differ diff --git a/graphics/items/icons/shed_shell.png b/graphics/items/icons/shed_shell.png new file mode 100644 index 000000000..6e02ff4a3 Binary files /dev/null and b/graphics/items/icons/shed_shell.png differ diff --git a/graphics/items/icons/shiny_charm.png b/graphics/items/icons/shiny_charm.png new file mode 100644 index 000000000..3829154cd Binary files /dev/null and b/graphics/items/icons/shiny_charm.png differ diff --git a/graphics/items/icons/shiny_stone.png b/graphics/items/icons/shiny_stone.png new file mode 100755 index 000000000..d48db4d86 Binary files /dev/null and b/graphics/items/icons/shiny_stone.png differ diff --git a/graphics/items/icons/shock_drive.png b/graphics/items/icons/shock_drive.png new file mode 100644 index 000000000..2ac62f6ce Binary files /dev/null and b/graphics/items/icons/shock_drive.png differ diff --git a/graphics/items/icons/shuca_berry.png b/graphics/items/icons/shuca_berry.png new file mode 100755 index 000000000..cc9967187 Binary files /dev/null and b/graphics/items/icons/shuca_berry.png differ diff --git a/graphics/items/icons/skull_fossil.png b/graphics/items/icons/skull_fossil.png new file mode 100755 index 000000000..186898346 Binary files /dev/null and b/graphics/items/icons/skull_fossil.png differ diff --git a/graphics/items/icons/sky_plate.png b/graphics/items/icons/sky_plate.png new file mode 100644 index 000000000..f64b14aff Binary files /dev/null and b/graphics/items/icons/sky_plate.png differ diff --git a/graphics/items/icons/slowbronite.png b/graphics/items/icons/slowbronite.png new file mode 100644 index 000000000..89bb8bf48 Binary files /dev/null and b/graphics/items/icons/slowbronite.png differ diff --git a/graphics/items/icons/smooth_rock.png b/graphics/items/icons/smooth_rock.png new file mode 100644 index 000000000..8db8ef11f Binary files /dev/null and b/graphics/items/icons/smooth_rock.png differ diff --git a/graphics/items/icons/snowball.png b/graphics/items/icons/snowball.png new file mode 100755 index 000000000..3ba834ae3 Binary files /dev/null and b/graphics/items/icons/snowball.png differ diff --git a/graphics/items/icons/splash_plate.png b/graphics/items/icons/splash_plate.png new file mode 100644 index 000000000..b290e8100 Binary files /dev/null and b/graphics/items/icons/splash_plate.png differ diff --git a/graphics/items/icons/spooky_plate.png b/graphics/items/icons/spooky_plate.png new file mode 100644 index 000000000..215657bcc Binary files /dev/null and b/graphics/items/icons/spooky_plate.png differ diff --git a/graphics/items/icons/sport_ball.png b/graphics/items/icons/sport_ball.png new file mode 100644 index 000000000..20549f7d3 Binary files /dev/null and b/graphics/items/icons/sport_ball.png differ diff --git a/graphics/items/icons/steel_gem.png b/graphics/items/icons/steel_gem.png new file mode 100644 index 000000000..252dc2d47 Binary files /dev/null and b/graphics/items/icons/steel_gem.png differ diff --git a/graphics/items/icons/steel_memory.png b/graphics/items/icons/steel_memory.png new file mode 100755 index 000000000..b9329e2d0 Binary files /dev/null and b/graphics/items/icons/steel_memory.png differ diff --git a/graphics/items/icons/steelixite.png b/graphics/items/icons/steelixite.png new file mode 100644 index 000000000..fa2a8209e Binary files /dev/null and b/graphics/items/icons/steelixite.png differ diff --git a/graphics/items/icons/sticky_barb.png b/graphics/items/icons/sticky_barb.png new file mode 100644 index 000000000..735d3a051 Binary files /dev/null and b/graphics/items/icons/sticky_barb.png differ diff --git a/graphics/items/icons/stone_plate.png b/graphics/items/icons/stone_plate.png new file mode 100644 index 000000000..8af90a8a6 Binary files /dev/null and b/graphics/items/icons/stone_plate.png differ diff --git a/graphics/items/icons/swampertite.png b/graphics/items/icons/swampertite.png new file mode 100644 index 000000000..f2d386a3d Binary files /dev/null and b/graphics/items/icons/swampertite.png differ diff --git a/graphics/items/icons/sweet_heart.png b/graphics/items/icons/sweet_heart.png new file mode 100755 index 000000000..06b592022 Binary files /dev/null and b/graphics/items/icons/sweet_heart.png differ diff --git a/graphics/items/icons/swift_wing.png b/graphics/items/icons/swift_wing.png new file mode 100755 index 000000000..75af06017 Binary files /dev/null and b/graphics/items/icons/swift_wing.png differ diff --git a/graphics/items/icons/tanga_berry.png b/graphics/items/icons/tanga_berry.png new file mode 100755 index 000000000..37f8e2465 Binary files /dev/null and b/graphics/items/icons/tanga_berry.png differ diff --git a/graphics/items/icons/terrain_extender.png b/graphics/items/icons/terrain_extender.png new file mode 100644 index 000000000..7735dd890 Binary files /dev/null and b/graphics/items/icons/terrain_extender.png differ diff --git a/graphics/items/icons/toxic_orb.png b/graphics/items/icons/toxic_orb.png new file mode 100644 index 000000000..d63ad4fa3 Binary files /dev/null and b/graphics/items/icons/toxic_orb.png differ diff --git a/graphics/items/icons/toxic_plate.png b/graphics/items/icons/toxic_plate.png new file mode 100644 index 000000000..de64d6c20 Binary files /dev/null and b/graphics/items/icons/toxic_plate.png differ diff --git a/graphics/items/icons/tyranitarite.png b/graphics/items/icons/tyranitarite.png new file mode 100644 index 000000000..ba61c74aa Binary files /dev/null and b/graphics/items/icons/tyranitarite.png differ diff --git a/graphics/items/icons/venusaurite.png b/graphics/items/icons/venusaurite.png new file mode 100644 index 000000000..e4a8acbf9 Binary files /dev/null and b/graphics/items/icons/venusaurite.png differ diff --git a/graphics/items/icons/wacan_berry.png b/graphics/items/icons/wacan_berry.png new file mode 100755 index 000000000..af113c9b5 Binary files /dev/null and b/graphics/items/icons/wacan_berry.png differ diff --git a/graphics/items/icons/water_gem.png b/graphics/items/icons/water_gem.png new file mode 100644 index 000000000..79e0ca07f Binary files /dev/null and b/graphics/items/icons/water_gem.png differ diff --git a/graphics/items/icons/water_memory.png b/graphics/items/icons/water_memory.png new file mode 100755 index 000000000..d7096f57c Binary files /dev/null and b/graphics/items/icons/water_memory.png differ diff --git a/graphics/items/icons/wave_incense.png b/graphics/items/icons/wave_incense.png new file mode 100755 index 000000000..aec3fd05e Binary files /dev/null and b/graphics/items/icons/wave_incense.png differ diff --git a/graphics/items/icons/weakness_policy.png b/graphics/items/icons/weakness_policy.png new file mode 100755 index 000000000..d8f0b4553 Binary files /dev/null and b/graphics/items/icons/weakness_policy.png differ diff --git a/graphics/items/icons/whipped_dream.png b/graphics/items/icons/whipped_dream.png new file mode 100755 index 000000000..9cf9c959a Binary files /dev/null and b/graphics/items/icons/whipped_dream.png differ diff --git a/graphics/items/icons/white_apricorn.png b/graphics/items/icons/white_apricorn.png new file mode 100755 index 000000000..c2ea56174 Binary files /dev/null and b/graphics/items/icons/white_apricorn.png differ diff --git a/graphics/items/icons/wide_lens.png b/graphics/items/icons/wide_lens.png new file mode 100644 index 000000000..ea432dc8d Binary files /dev/null and b/graphics/items/icons/wide_lens.png differ diff --git a/graphics/items/icons/wise_glasses.png b/graphics/items/icons/wise_glasses.png new file mode 100644 index 000000000..a3982f181 Binary files /dev/null and b/graphics/items/icons/wise_glasses.png differ diff --git a/graphics/items/icons/x_special_defense.png b/graphics/items/icons/x_special_defense.png new file mode 100755 index 000000000..54a3e00fd Binary files /dev/null and b/graphics/items/icons/x_special_defense.png differ diff --git a/graphics/items/icons/yache_berry.png b/graphics/items/icons/yache_berry.png new file mode 100755 index 000000000..08bb40fcf Binary files /dev/null and b/graphics/items/icons/yache_berry.png differ diff --git a/graphics/items/icons/yellow_apricorn.png b/graphics/items/icons/yellow_apricorn.png new file mode 100755 index 000000000..4dd12c5eb Binary files /dev/null and b/graphics/items/icons/yellow_apricorn.png differ diff --git a/graphics/items/icons/yellow_nectar.png b/graphics/items/icons/yellow_nectar.png new file mode 100755 index 000000000..fff8ae697 Binary files /dev/null and b/graphics/items/icons/yellow_nectar.png differ diff --git a/graphics/items/icons/zap_plate.png b/graphics/items/icons/zap_plate.png new file mode 100644 index 000000000..80fed9a1e Binary files /dev/null and b/graphics/items/icons/zap_plate.png differ diff --git a/graphics/items/icons/zoom_lens.png b/graphics/items/icons/zoom_lens.png new file mode 100644 index 000000000..167619aa6 Binary files /dev/null and b/graphics/items/icons/zoom_lens.png differ diff --git a/graphics/object_events/pics/berry_trees/chople.png b/graphics/object_events/pics/berry_trees/chople.png new file mode 100644 index 000000000..fc70a9af5 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/chople.png differ diff --git a/graphics/object_events/pics/berry_trees/colbur.png b/graphics/object_events/pics/berry_trees/colbur.png new file mode 100644 index 000000000..241507aaf Binary files /dev/null and b/graphics/object_events/pics/berry_trees/colbur.png differ diff --git a/graphics/object_events/pics/berry_trees/haban.png b/graphics/object_events/pics/berry_trees/haban.png new file mode 100644 index 000000000..ba4839c80 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/haban.png differ diff --git a/graphics/object_events/pics/berry_trees/kasib.png b/graphics/object_events/pics/berry_trees/kasib.png new file mode 100644 index 000000000..b8a8401e8 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/kasib.png differ diff --git a/graphics/object_events/pics/berry_trees/kebia.png b/graphics/object_events/pics/berry_trees/kebia.png new file mode 100644 index 000000000..03efc73c1 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/kebia.png differ diff --git a/graphics/object_events/pics/berry_trees/occa.png b/graphics/object_events/pics/berry_trees/occa.png new file mode 100644 index 000000000..8685264f9 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/occa.png differ diff --git a/graphics/object_events/pics/berry_trees/payapa.png b/graphics/object_events/pics/berry_trees/payapa.png new file mode 100644 index 000000000..14aed0c23 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/payapa.png differ diff --git a/graphics/object_events/pics/berry_trees/roseli.png b/graphics/object_events/pics/berry_trees/roseli.png new file mode 100644 index 000000000..f59bf93a2 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/roseli.png differ diff --git a/graphics/object_events/pics/berry_trees/shuca.png b/graphics/object_events/pics/berry_trees/shuca.png new file mode 100644 index 000000000..4e95bb4f6 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/shuca.png differ diff --git a/graphics/object_events/pics/berry_trees/tanga.png b/graphics/object_events/pics/berry_trees/tanga.png new file mode 100644 index 000000000..28e86f6f4 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/tanga.png differ diff --git a/graphics/object_events/pics/berry_trees/yache.png b/graphics/object_events/pics/berry_trees/yache.png new file mode 100644 index 000000000..bde439354 Binary files /dev/null and b/graphics/object_events/pics/berry_trees/yache.png differ diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index b653f5a92..bdf042d63 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -69,4 +69,72 @@ #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 +#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 +#define HOLD_EFFECT_EVIOLITE 116 +#define HOLD_EFFECT_ASSAULT_VEST 117 +#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_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_MEMORY 153 + +#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/item_effects.h b/include/constants/item_effects.h index 49fcedc61..63185163e 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/constants/items.h b/include/constants/items.h index 95c6aacfe..9b95524d5 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,359 +14,606 @@ #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 #define LAST_BALL ITEM_PREMIER_BALL // 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 +// Wings +#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_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 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 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 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 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 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 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 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 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 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 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 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 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 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 ITEM_TM01 #define ITEM_TM02_DRAGON_CLAW ITEM_TM02 @@ -419,6 +665,7 @@ #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 @@ -427,48 +674,42 @@ #define ITEM_HM06_ROCK_SMASH ITEM_HM06 #define ITEM_HM07_WATERFALL ITEM_HM07 #define ITEM_HM08_DIVE ITEM_HM08 - -// Unknown -#define ITEM_15B 347 -#define ITEM_15C 348 - // 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 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 375 -#define ITEM_OLD_SEA_MAP 376 +#define ITEM_MAGMA_EMBLEM 614 +#define ITEM_OLD_SEA_MAP 615 -#define ITEMS_COUNT 377 +#define ITEM_SHINY_CHARM 616 + +#define ITEMS_COUNT 617 #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 // Range of berries given out by various NPCS #define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY @@ -491,7 +732,7 @@ #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) #define NUM_TECHNICAL_MACHINES 50 -#define NUM_HIDDEN_MACHINES 8 +#define NUM_HIDDEN_MACHINES 8 #define MAX_BAG_ITEM_CAPACITY 99 #define MAX_PC_ITEM_CAPACITY 999 @@ -507,6 +748,6 @@ #define SUPER_ROD 2 // Check if the item is one that can be used on a Pokemon. -#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX) #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 52eabe71b..777b4e02b 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -21,7 +21,8 @@ #define TYPE_ICE 15 #define TYPE_DRAGON 16 #define TYPE_DARK 17 -#define NUMBER_OF_MON_TYPES 18 +#define TYPE_FAIRY 18 +#define NUMBER_OF_MON_TYPES 19 // Pokemon egg groups #define EGG_GROUP_NONE 0 @@ -90,6 +91,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 32268d6db..50ba1f7e2 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -30,6 +30,36 @@ extern const u32 gInterfaceGfx_LuxuryBall[]; extern const u32 gInterfacePal_LuxuryBall[]; extern const u32 gInterfaceGfx_PremierBall[]; extern const u32 gInterfacePal_PremierBall[]; +extern const u32 gInterfaceGfx_LevelBall[]; +extern const u32 gInterfacePal_LevelBall[]; +extern const u32 gInterfaceGfx_LureBall[]; +extern const u32 gInterfacePal_LureBall[]; +extern const u32 gInterfaceGfx_MoonBall[]; +extern const u32 gInterfacePal_MoonBall[]; +extern const u32 gInterfaceGfx_FriendBall[]; +extern const u32 gInterfacePal_FriendBall[]; +extern const u32 gInterfaceGfx_LoveBall[]; +extern const u32 gInterfacePal_LoveBall[]; +extern const u32 gInterfaceGfx_HeavyBall[]; +extern const u32 gInterfacePal_HeavyBall[]; +extern const u32 gInterfaceGfx_FastBall[]; +extern const u32 gInterfacePal_FastBall[]; +extern const u32 gInterfaceGfx_SportBall[]; +extern const u32 gInterfacePal_SportBall[]; +extern const u32 gInterfaceGfx_DuskBall[]; +extern const u32 gInterfacePal_DuskBall[]; +extern const u32 gInterfaceGfx_QuickBall[]; +extern const u32 gInterfacePal_QuickBall[]; +extern const u32 gInterfaceGfx_HealBall[]; +extern const u32 gInterfacePal_HealBall[]; +extern const u32 gInterfaceGfx_CherishBall[]; +extern const u32 gInterfacePal_CherishBall[]; +extern const u32 gInterfaceGfx_ParkBall[]; +extern const u32 gInterfacePal_ParkBall[]; +extern const u32 gInterfaceGfx_DreamBall[]; +extern const u32 gInterfacePal_DreamBall[]; +extern const u32 gInterfaceGfx_BeastBall[]; +extern const u32 gInterfacePal_BeastBall[]; extern const u32 gOpenPokeballGfx[]; // pokemon gfx @@ -3385,6 +3415,36 @@ extern const u32 gItemIcon_TimerBall[]; extern const u32 gItemIcon_LuxuryBall[]; extern const u32 gItemIconPalette_LuxuryBall[]; extern const u32 gItemIcon_PremierBall[]; +extern const u32 gItemIcon_LevelBall[]; +extern const u32 gItemIconPalette_LevelBall[]; +extern const u32 gItemIcon_LureBall[]; +extern const u32 gItemIconPalette_LureBall[]; +extern const u32 gItemIcon_MoonBall[]; +extern const u32 gItemIconPalette_MoonBall[]; +extern const u32 gItemIcon_FriendBall[]; +extern const u32 gItemIconPalette_FriendBall[]; +extern const u32 gItemIcon_LoveBall[]; +extern const u32 gItemIconPalette_LoveBall[]; +extern const u32 gItemIcon_HeavyBall[]; +extern const u32 gItemIconPalette_HeavyBall[]; +extern const u32 gItemIcon_FastBall[]; +extern const u32 gItemIconPalette_FastBall[]; +extern const u32 gItemIcon_SportBall[]; +extern const u32 gItemIconPalette_SportBall[]; +extern const u32 gItemIcon_DuskBall[]; +extern const u32 gItemIconPalette_DuskBall[]; +extern const u32 gItemIcon_QuickBall[]; +extern const u32 gItemIconPalette_QuickBall[]; +extern const u32 gItemIcon_HealBall[]; +extern const u32 gItemIconPalette_HealBall[]; +extern const u32 gItemIcon_CherishBall[]; +extern const u32 gItemIconPalette_CherishBall[]; +extern const u32 gItemIcon_ParkBall[]; +extern const u32 gItemIconPalette_ParkBall[]; +extern const u32 gItemIcon_DreamBall[]; +extern const u32 gItemIconPalette_DreamBall[]; +extern const u32 gItemIcon_BeastBall[]; +extern const u32 gItemIconPalette_BeastBall[]; // Medicine extern const u32 gItemIcon_Potion[]; extern const u32 gItemIconPalette_Potion[]; @@ -3850,6 +3910,496 @@ extern const u32 gItemIcon_MagmaEmblem[]; extern const u32 gItemIconPalette_MagmaEmblem[]; extern const u32 gItemIcon_OldSeaMap[]; extern const u32 gItemIconPalette_OldSeaMap[]; +// Gen 4 Items +extern const u32 gItemIcon_WideLens[]; +extern const u32 gItemIconPalette_WideLens[]; +extern const u32 gItemIcon_MuscleBand[]; +extern const u32 gItemIconPalette_MuscleBand[]; +extern const u32 gItemIcon_WiseGlasses[]; +extern const u32 gItemIconPalette_WiseGlasses[]; +extern const u32 gItemIcon_ExpertBelt[]; +extern const u32 gItemIconPalette_ExpertBelt[]; +extern const u32 gItemIcon_LightClay[]; +extern const u32 gItemIconPalette_LightClay[]; +extern const u32 gItemIcon_LifeOrb[]; +extern const u32 gItemIconPalette_LifeOrb[]; +extern const u32 gItemIcon_PowerHerb[]; +extern const u32 gItemIconPalette_PowerHerb[]; +extern const u32 gItemIcon_ToxicOrb[]; +extern const u32 gItemIconPalette_ToxicOrb[]; +extern const u32 gItemIcon_FlameOrb[]; +extern const u32 gItemIconPalette_FlameOrb[]; +extern const u32 gItemIcon_QuickPowder[]; +extern const u32 gItemIconPalette_QuickPowder[]; +extern const u32 gItemIcon_FocusSash[]; +extern const u32 gItemIconPalette_FocusSash[]; +extern const u32 gItemIcon_ZoomLens[]; +extern const u32 gItemIconPalette_ZoomLens[]; +extern const u32 gItemIcon_Metronome[]; +extern const u32 gItemIconPalette_Metronome[]; +extern const u32 gItemIcon_IronBall[]; +extern const u32 gItemIconPalette_IronBall[]; +extern const u32 gItemIcon_LaggingTail[]; +extern const u32 gItemIconPalette_LaggingTail[]; +extern const u32 gItemIcon_DestinyKnot[]; +extern const u32 gItemIconPalette_DestinyKnot[]; +extern const u32 gItemIcon_BlackSludge[]; +extern const u32 gItemIconPalette_BlackSludge[]; +extern const u32 gItemIcon_IcyRock[]; +extern const u32 gItemIconPalette_IcyRock[]; +extern const u32 gItemIcon_SmoothRock[]; +extern const u32 gItemIconPalette_SmoothRock[]; +extern const u32 gItemIcon_HeatRock[]; +extern const u32 gItemIconPalette_HeatRock[]; +extern const u32 gItemIcon_DampRock[]; +extern const u32 gItemIconPalette_DampRock[]; +extern const u32 gItemIcon_GripClaw[]; +extern const u32 gItemIconPalette_GripClaw[]; +extern const u32 gItemIcon_ChoiceScarf[]; +extern const u32 gItemIconPalette_ChoiceScarf[]; +extern const u32 gItemIcon_StickyBarb[]; +extern const u32 gItemIconPalette_StickyBarb[]; +extern const u32 gItemIcon_ShedShell[]; +extern const u32 gItemIconPalette_ShedShell[]; +extern const u32 gItemIcon_BigRoot[]; +extern const u32 gItemIconPalette_BigRoot[]; +extern const u32 gItemIcon_ChoiceSpecs[]; +extern const u32 gItemIconPalette_ChoiceSpecs[]; +extern const u32 gItemIcon_AdamantOrb[]; +extern const u32 gItemIconPalette_AdamantOrb[]; +extern const u32 gItemIcon_LustrousOrb[]; +extern const u32 gItemIconPalette_LustrousOrb[]; +extern const u32 gItemIcon_GriseousOrb[]; +extern const u32 gItemIconPalette_GriseousOrb[]; +extern const u32 gItemIcon_FlamePlate[]; +extern const u32 gItemIconPalette_FlamePlate[]; +extern const u32 gItemIcon_SplashPlate[]; +extern const u32 gItemIconPalette_SplashPlate[]; +extern const u32 gItemIcon_ZapPlate[]; +extern const u32 gItemIconPalette_ZapPlate[]; +extern const u32 gItemIcon_MeadowPlate[]; +extern const u32 gItemIconPalette_MeadowPlate[]; +extern const u32 gItemIcon_IciclePlate[]; +extern const u32 gItemIconPalette_IciclePlate[]; +extern const u32 gItemIcon_FistPlate[]; +extern const u32 gItemIconPalette_FistPlate[]; +extern const u32 gItemIcon_ToxicPlate[]; +extern const u32 gItemIconPalette_ToxicPlate[]; +extern const u32 gItemIcon_EarthPlate[]; +extern const u32 gItemIconPalette_EarthPlate[]; +extern const u32 gItemIcon_SkyPlate[]; +extern const u32 gItemIconPalette_SkyPlate[]; +extern const u32 gItemIcon_MindPlate[]; +extern const u32 gItemIconPalette_MindPlate[]; +extern const u32 gItemIcon_InsectPlate[]; +extern const u32 gItemIconPalette_InsectPlate[]; +extern const u32 gItemIcon_StonePlate[]; +extern const u32 gItemIconPalette_StonePlate[]; +extern const u32 gItemIcon_SpookyPlate[]; +extern const u32 gItemIconPalette_SpookyPlate[]; +extern const u32 gItemIcon_DracoPlate[]; +extern const u32 gItemIconPalette_DracoPlate[]; +extern const u32 gItemIcon_DreadPlate[]; +extern const u32 gItemIconPalette_DreadPlate[]; +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[]; +extern const u32 gItemIcon_FloatStone[]; +extern const u32 gItemIconPalette_FloatStone[]; +extern const u32 gItemIcon_BindingBand[]; +extern const u32 gItemIconPalette_BindingBand[]; +extern const u32 gItemIcon_DouseDrive[]; +extern const u32 gItemIconPalette_DouseDrive[]; +extern const u32 gItemIcon_ShockDrive[]; +extern const u32 gItemIconPalette_ShockDrive[]; +extern const u32 gItemIcon_BurnDrive[]; +extern const u32 gItemIconPalette_BurnDrive[]; +extern const u32 gItemIcon_ChillDrive[]; +extern const u32 gItemIconPalette_ChillDrive[]; +extern const u32 gItemIcon_FireGem[]; +extern const u32 gItemIconPalette_FireGem[]; +extern const u32 gItemIcon_WaterGem[]; +extern const u32 gItemIconPalette_WaterGem[]; +extern const u32 gItemIcon_ElectricGem[]; +extern const u32 gItemIconPalette_ElectricGem[]; +extern const u32 gItemIcon_GrassGem[]; +extern const u32 gItemIconPalette_GrassGem[]; +extern const u32 gItemIcon_IceGem[]; +extern const u32 gItemIconPalette_IceGem[]; +extern const u32 gItemIcon_FightingGem[]; +extern const u32 gItemIconPalette_FightingGem[]; +extern const u32 gItemIcon_PoisonGem[]; +extern const u32 gItemIconPalette_PoisonGem[]; +extern const u32 gItemIcon_GroundGem[]; +extern const u32 gItemIconPalette_GroundGem[]; +extern const u32 gItemIcon_FlyingGem[]; +extern const u32 gItemIconPalette_FlyingGem[]; +extern const u32 gItemIcon_PsychicGem[]; +extern const u32 gItemIconPalette_PsychicGem[]; +extern const u32 gItemIcon_BugGem[]; +extern const u32 gItemIconPalette_BugGem[]; +extern const u32 gItemIcon_RockGem[]; +extern const u32 gItemIconPalette_RockGem[]; +extern const u32 gItemIcon_GhostGem[]; +extern const u32 gItemIconPalette_GhostGem[]; +extern const u32 gItemIcon_DragonGem[]; +extern const u32 gItemIconPalette_DragonGem[]; +extern const u32 gItemIcon_DarkGem[]; +extern const u32 gItemIconPalette_DarkGem[]; +extern const u32 gItemIcon_SteelGem[]; +extern const u32 gItemIconPalette_SteelGem[]; +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 +extern const u32 gItemIcon_AssaultVest[]; +extern const u32 gItemIconPalette_AssaultVest[]; +extern const u32 gItemIcon_PixiePlate[]; +extern const u32 gItemIconPalette_PixiePlate[]; +extern const u32 gItemIcon_SafetyGoggles[]; +extern const u32 gItemIconPalette_SafetyGoggles[]; +extern const u32 gItemIcon_Gengarite[]; +extern const u32 gItemIconPalette_Gengarite[]; +extern const u32 gItemIcon_Gardevoirite[]; +extern const u32 gItemIconPalette_Gardevoirite[]; +extern const u32 gItemIcon_Ampharosite[]; +extern const u32 gItemIconPalette_Ampharosite[]; +extern const u32 gItemIcon_Venusaurite[]; +extern const u32 gItemIconPalette_Venusaurite[]; +extern const u32 gItemIcon_CharizarditeX[]; +extern const u32 gItemIconPalette_CharizarditeX[]; +extern const u32 gItemIcon_Blastoisinite[]; +extern const u32 gItemIconPalette_Blastoisinite[]; +extern const u32 gItemIcon_MewtwoniteX[]; +extern const u32 gItemIconPalette_MewtwoniteX[]; +extern const u32 gItemIcon_MewtwoniteY[]; +extern const u32 gItemIconPalette_MewtwoniteY[]; +extern const u32 gItemIcon_Blazikenite[]; +extern const u32 gItemIconPalette_Blazikenite[]; +extern const u32 gItemIcon_Medichamite[]; +extern const u32 gItemIconPalette_Medichamite[]; +extern const u32 gItemIcon_Houndoominite[]; +extern const u32 gItemIconPalette_Houndoominite[]; +extern const u32 gItemIcon_Aggronite[]; +extern const u32 gItemIconPalette_Aggronite[]; +extern const u32 gItemIcon_Banettite[]; +extern const u32 gItemIconPalette_Banettite[]; +extern const u32 gItemIcon_Tyranitarite[]; +extern const u32 gItemIconPalette_Tyranitarite[]; +extern const u32 gItemIcon_Scizorite[]; +extern const u32 gItemIconPalette_Scizorite[]; +extern const u32 gItemIcon_Pinsirite[]; +extern const u32 gItemIconPalette_Pinsirite[]; +extern const u32 gItemIcon_Aerodactylite[]; +extern const u32 gItemIconPalette_Aerodactylite[]; +extern const u32 gItemIcon_Lucarionite[]; +extern const u32 gItemIconPalette_Lucarionite[]; +extern const u32 gItemIcon_Abomasite[]; +extern const u32 gItemIconPalette_Abomasite[]; +extern const u32 gItemIcon_Kangaskhanite[]; +extern const u32 gItemIconPalette_Kangaskhanite[]; +extern const u32 gItemIcon_Gyaradosite[]; +extern const u32 gItemIconPalette_Gyaradosite[]; +extern const u32 gItemIcon_Absolite[]; +extern const u32 gItemIconPalette_Absolite[]; +extern const u32 gItemIcon_CharizarditeY[]; +extern const u32 gItemIconPalette_CharizarditeY[]; +extern const u32 gItemIcon_Alakazite[]; +extern const u32 gItemIconPalette_Alakazite[]; +extern const u32 gItemIcon_Heracronite[]; +extern const u32 gItemIconPalette_Heracronite[]; +extern const u32 gItemIcon_Mawilite[]; +extern const u32 gItemIconPalette_Mawilite[]; +extern const u32 gItemIcon_Manectite[]; +extern const u32 gItemIconPalette_Manectite[]; +extern const u32 gItemIcon_Garchompite[]; +extern const u32 gItemIconPalette_Garchompite[]; +extern const u32 gItemIcon_Latiasite[]; +extern const u32 gItemIconPalette_Latiasite[]; +extern const u32 gItemIcon_Latiosite[]; +extern const u32 gItemIconPalette_Latiosite[]; +extern const u32 gItemIcon_Swampertite[]; +extern const u32 gItemIconPalette_Swampertite[]; +extern const u32 gItemIcon_Sceptilite[]; +extern const u32 gItemIconPalette_Sceptilite[]; +extern const u32 gItemIcon_Sablenite[]; +extern const u32 gItemIconPalette_Sablenite[]; +extern const u32 gItemIcon_Altarianite[]; +extern const u32 gItemIconPalette_Altarianite[]; +extern const u32 gItemIcon_Galladite[]; +extern const u32 gItemIconPalette_Galladite[]; +extern const u32 gItemIcon_Audinite[]; +extern const u32 gItemIconPalette_Audinite[]; +extern const u32 gItemIcon_Metagrossite[]; +extern const u32 gItemIconPalette_Metagrossite[]; +extern const u32 gItemIcon_Sharpedonite[]; +extern const u32 gItemIconPalette_Sharpedonite[]; +extern const u32 gItemIcon_Slowbronite[]; +extern const u32 gItemIconPalette_Slowbronite[]; +extern const u32 gItemIcon_Steelixite[]; +extern const u32 gItemIconPalette_Steelixite[]; +extern const u32 gItemIcon_Pidgeotite[]; +extern const u32 gItemIconPalette_Pidgeotite[]; +extern const u32 gItemIcon_Glalitite[]; +extern const u32 gItemIconPalette_Glalitite[]; +extern const u32 gItemIcon_Diancite[]; +extern const u32 gItemIconPalette_Diancite[]; +extern const u32 gItemIcon_Cameruptite[]; +extern const u32 gItemIconPalette_Cameruptite[]; +extern const u32 gItemIcon_Lopunnite[]; +extern const u32 gItemIconPalette_Lopunnite[]; +extern const u32 gItemIcon_Salamencite[]; +extern const u32 gItemIconPalette_Salamencite[]; +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[]; +extern const u32 gItemIcon_TerrainExtender[]; +extern const u32 gItemIconPalette_TerrainExtender[]; +extern const u32 gItemIcon_ElectricSeed[]; +extern const u32 gItemIconPalette_ElectricSeed[]; +extern const u32 gItemIcon_GrassySeed[]; +extern const u32 gItemIconPalette_GrassySeed[]; +extern const u32 gItemIcon_MistySeed[]; +extern const u32 gItemIconPalette_MistySeed[]; +extern const u32 gItemIcon_PsychicSeed[]; +extern const u32 gItemIconPalette_PsychicSeed[]; +extern const u32 gItemIcon_AdrenalineOrb[]; +extern const u32 gItemIconPalette_AdrenalineOrb[]; +extern const u32 gItemIcon_BigMalasada[]; +extern const u32 gItemIconPalette_BigMalasada[]; +extern const u32 gItemIcon_IceStone[]; +extern const u32 gItemIconPalette_IceStone[]; +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_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 gItemIconPalette_BugTMHM[]; +extern const u32 gItemIconPalette_FairyTMHM[]; extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; @@ -4007,6 +4557,42 @@ extern const u32 gBerryPic_Starf[]; extern const u32 gBerryPalette_Starf[]; extern const u32 gBerryPic_Enigma[]; extern const u32 gBerryPalette_Enigma[]; +extern const u32 gBerryPic_Occa[]; +extern const u32 gBerryPic_Passho[]; +extern const u32 gBerryPic_Wacan[]; +extern const u32 gBerryPic_Rindo[]; +extern const u32 gBerryPic_Yache[]; +extern const u32 gBerryPic_Chople[]; +extern const u32 gBerryPic_Kebia[]; +extern const u32 gBerryPic_Shuca[]; +extern const u32 gBerryPic_Coba[]; +extern const u32 gBerryPic_Payapa[]; +extern const u32 gBerryPic_Tanga[]; +extern const u32 gBerryPic_Charti[]; +extern const u32 gBerryPic_Kasib[]; +extern const u32 gBerryPic_Haban[]; +extern const u32 gBerryPic_Colbur[]; +extern const u32 gBerryPic_Babiri[]; +extern const u32 gBerryPic_Chilan[]; +extern const u32 gBerryPic_Roseli[]; +extern const u32 gBerryPalette_Occa[]; +extern const u32 gBerryPalette_Passho[]; +extern const u32 gBerryPalette_Wacan[]; +extern const u32 gBerryPalette_Rindo[]; +extern const u32 gBerryPalette_Yache[]; +extern const u32 gBerryPalette_Chople[]; +extern const u32 gBerryPalette_Kebia[]; +extern const u32 gBerryPalette_Shuca[]; +extern const u32 gBerryPalette_Coba[]; +extern const u32 gBerryPalette_Payapa[]; +extern const u32 gBerryPalette_Tanga[]; +extern const u32 gBerryPalette_Charti[]; +extern const u32 gBerryPalette_Kasib[]; +extern const u32 gBerryPalette_Haban[]; +extern const u32 gBerryPalette_Colbur[]; +extern const u32 gBerryPalette_Babiri[]; +extern const u32 gBerryPalette_Chilan[]; +extern const u32 gBerryPalette_Roseli[]; //pokenav extern const u16 gPokenavCondition_Pal[]; diff --git a/include/item_use.h b/include/item_use.h index f577f8d46..266bcad0b 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -11,6 +11,7 @@ void ItemUseOutOfBattle_PowderJar(u8); void ItemUseOutOfBattle_SSTicket(u8); void ItemUseOutOfBattle_WailmerPail(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 7f51d08c9..845db5222 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -49,6 +49,7 @@ void LoadHeldItemIcons(void); void DrawHeldItemIconsForTrade(u8 *partyCounts, u8 *partySpriteIds, u8 whichParty); void CB2_ShowPartyMenuForItemUse(void); void ItemUseCB_Medicine(u8 taskId, TaskFunc task); +void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task); void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task); void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task); void ItemUseCB_PPUp(u8 taskId, TaskFunc task); diff --git a/include/pokeball.h b/include/pokeball.h index 1cdb08f94..0ed73fd5d 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -15,6 +15,21 @@ enum BALL_TIMER, BALL_LUXURY, BALL_PREMIER, + BALL_LEVEL, + BALL_LURE, + BALL_MOON, + BALL_FRIEND, + BALL_LOVE, + BALL_HEAVY, + BALL_FAST, + BALL_SPORT, + BALL_DUSK, + BALL_QUICK, + BALL_HEAL, + BALL_CHERISH, + BALL_PARK, + BALL_DREAM, + BALL_BEAST, POKEBALL_COUNT }; diff --git a/include/pokemon.h b/include/pokemon.h index 81c17f545..d44950d3d 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/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/spritesheet_rules.mk b/spritesheet_rules.mk index ae7971960..d5d055c86 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -563,6 +563,38 @@ $(OBJEVENTGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/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 $(OBJEVENTGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index fef301326..8ed01cd41 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -126,49 +126,97 @@ static const struct CaptureStar sCaptureStars[] = }, }; -#define TAG_PARTICLES_POKEBALL 55020 -#define TAG_PARTICLES_GREATBALL 55021 -#define TAG_PARTICLES_SAFARIBALL 55022 -#define TAG_PARTICLES_ULTRABALL 55023 -#define TAG_PARTICLES_MASTERBALL 55024 -#define TAG_PARTICLES_NETBALL 55025 -#define TAG_PARTICLES_DIVEBALL 55026 -#define TAG_PARTICLES_NESTBALL 55027 -#define TAG_PARTICLES_REPEATBALL 55028 -#define TAG_PARTICLES_TIMERBALL 55029 -#define TAG_PARTICLES_LUXURYBALL 55030 -#define TAG_PARTICLES_PREMIERBALL 55031 +#define TAG_PARTICLES_POKEBALL 65030 +#define TAG_PARTICLES_GREATBALL 65031 +#define TAG_PARTICLES_SAFARIBALL 65032 +#define TAG_PARTICLES_ULTRABALL 65033 +#define TAG_PARTICLES_MASTERBALL 65034 +#define TAG_PARTICLES_NETBALL 65035 +#define TAG_PARTICLES_DIVEBALL 65036 +#define TAG_PARTICLES_NESTBALL 65037 +#define TAG_PARTICLES_REPEATBALL 65038 +#define TAG_PARTICLES_TIMERBALL 65039 +#define TAG_PARTICLES_LUXURYBALL 65040 +#define TAG_PARTICLES_PREMIERBALL 65041 +#define TAG_PARTICLES_LEVELBALL 65042 +#define TAG_PARTICLES_LUREBALL 65043 +#define TAG_PARTICLES_MOONBALL 65044 +#define TAG_PARTICLES_FRIENDBALL 65045 +#define TAG_PARTICLES_LOVEBALL 65046 +#define TAG_PARTICLES_HEAVYBALL 65047 +#define TAG_PARTICLES_FASTBALL 65048 +#define TAG_PARTICLES_SPORTBALL 65049 +#define TAG_PARTICLES_DUSKBALL 65050 +#define TAG_PARTICLES_QUICKBALL 65051 +#define TAG_PARTICLES_HEALBALL 65052 +#define TAG_PARTICLES_CHERISHBALL 65053 +#define TAG_PARTICLES_PARKBALL 65054 +#define TAG_PARTICLES_DREAMBALL 65065 +#define TAG_PARTICLES_BEASTBALL 65056 -static const struct CompressedSpriteSheet sBallParticleSpriteSheets[POKEBALL_COUNT] = +static const u32 sNewParticlesGfx[] = INCBIN_U32("graphics/interface/ball/particles2.4bpp.lz"); +static const u32 sNewParticlesPal[] = INCBIN_U32("graphics/interface/ball/particles2.gbapal.lz"); + +static const struct CompressedSpriteSheet sBallParticleSpriteSheets[] = { - [BALL_POKE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL}, - [BALL_GREAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL}, - [BALL_SAFARI] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL}, - [BALL_ULTRA] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL}, - [BALL_MASTER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL}, - [BALL_NET] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL}, - [BALL_DIVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL}, - [BALL_NEST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL}, - [BALL_REPEAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL}, - [BALL_TIMER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL}, - [BALL_LUXURY] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL}, - [BALL_PREMIER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL}, + [BALL_POKE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL}, + [BALL_LEVEL] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_LEVELBALL}, + [BALL_LURE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUREBALL}, + [BALL_MOON] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_MOONBALL}, + [BALL_FRIEND] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_FRIENDBALL}, + [BALL_LOVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LOVEBALL}, + [BALL_HEAVY] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_HEAVYBALL}, + [BALL_FAST] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_FASTBALL}, + [BALL_SPORT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SPORTBALL}, + [BALL_DUSK] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_DUSKBALL}, + [BALL_QUICK] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_QUICKBALL}, + [BALL_HEAL] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_HEALBALL}, + [BALL_CHERISH] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_CHERISHBALL}, + [BALL_PARK] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PARKBALL}, + [BALL_DREAM] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DREAMBALL}, + [BALL_BEAST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_BEASTBALL}, }; -static const struct CompressedSpritePalette sBallParticlePalettes[POKEBALL_COUNT] = +static const struct CompressedSpritePalette sBallParticlePalettes[] = { - [BALL_POKE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL}, - [BALL_GREAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL}, - [BALL_SAFARI] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL}, - [BALL_ULTRA] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL}, - [BALL_MASTER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL}, - [BALL_NET] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL}, - [BALL_DIVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL}, - [BALL_NEST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL}, - [BALL_REPEAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL}, - [BALL_TIMER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL}, - [BALL_LUXURY] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL}, - [BALL_PREMIER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, + [BALL_POKE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, + [BALL_LEVEL] = {sNewParticlesPal, TAG_PARTICLES_LEVELBALL}, + [BALL_LURE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUREBALL}, + [BALL_MOON] = {sNewParticlesPal, TAG_PARTICLES_MOONBALL}, + [BALL_FRIEND] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_FRIENDBALL}, + [BALL_LOVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LOVEBALL}, + [BALL_HEAVY] = {sNewParticlesPal, TAG_PARTICLES_HEAVYBALL}, + [BALL_FAST] = {sNewParticlesPal, TAG_PARTICLES_FASTBALL}, + [BALL_SPORT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SPORTBALL}, + [BALL_DUSK] = {sNewParticlesPal, TAG_PARTICLES_DUSKBALL}, + [BALL_QUICK] = {sNewParticlesPal, TAG_PARTICLES_QUICKBALL}, + [BALL_HEAL] = {sNewParticlesPal, TAG_PARTICLES_HEALBALL}, + [BALL_CHERISH] = {sNewParticlesPal, TAG_PARTICLES_CHERISHBALL}, + [BALL_PARK] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PARKBALL}, + [BALL_DREAM] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DREAMBALL}, + [BALL_BEAST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_BEASTBALL}, }; static const union AnimCmd sAnim_RegularBall[] = @@ -237,22 +285,55 @@ static const u8 sBallParticleAnimNums[POKEBALL_COUNT] = [BALL_TIMER] = 5, [BALL_LUXURY] = 4, [BALL_PREMIER] = 4, + + [BALL_LEVEL] = 5, + [BALL_LURE] = 2, + [BALL_MOON] = 4, + [BALL_FRIEND] = 3, + [BALL_LOVE] = 3, + [BALL_HEAVY] = 0, + [BALL_FAST] = 4, + [BALL_SPORT] = 0, + [BALL_DUSK] = 2, + [BALL_QUICK] = 4, + [BALL_HEAL] = 0, + [BALL_CHERISH] = 0, + [BALL_PARK] = 5, + [BALL_DREAM] = 5, + [BALL_BEAST] = 5, }; -static const TaskFunc sBallParticleAnimationFuncs[POKEBALL_COUNT] = +static const TaskFunc sBallParticleAnimationFuncs[] = { - [BALL_POKE] = PokeBallOpenParticleAnimation, - [BALL_GREAT] = GreatBallOpenParticleAnimation, - [BALL_SAFARI] = SafariBallOpenParticleAnimation, - [BALL_ULTRA] = UltraBallOpenParticleAnimation, - [BALL_MASTER] = MasterBallOpenParticleAnimation, - [BALL_NET] = SafariBallOpenParticleAnimation, - [BALL_DIVE] = DiveBallOpenParticleAnimation, - [BALL_NEST] = UltraBallOpenParticleAnimation, - [BALL_REPEAT] = RepeatBallOpenParticleAnimation, - [BALL_TIMER] = TimerBallOpenParticleAnimation, - [BALL_LUXURY] = GreatBallOpenParticleAnimation, + [BALL_POKE] = PokeBallOpenParticleAnimation, + [BALL_GREAT] = GreatBallOpenParticleAnimation, + [BALL_SAFARI] = SafariBallOpenParticleAnimation, + [BALL_ULTRA] = UltraBallOpenParticleAnimation, + [BALL_MASTER] = MasterBallOpenParticleAnimation, + [BALL_NET] = SafariBallOpenParticleAnimation, + [BALL_DIVE] = DiveBallOpenParticleAnimation, + [BALL_NEST] = UltraBallOpenParticleAnimation, + [BALL_REPEAT] = RepeatBallOpenParticleAnimation, + [BALL_TIMER] = TimerBallOpenParticleAnimation, + [BALL_LUXURY] = GreatBallOpenParticleAnimation, [BALL_PREMIER] = PremierBallOpenParticleAnimation, + + // Todo: assign and possibly create different particles + [BALL_LEVEL] = SafariBallOpenParticleAnimation, + [BALL_LURE] = GreatBallOpenParticleAnimation, + [BALL_MOON] = UltraBallOpenParticleAnimation, + [BALL_FRIEND] = UltraBallOpenParticleAnimation, + [BALL_LOVE] = GreatBallOpenParticleAnimation, + [BALL_HEAVY] = GreatBallOpenParticleAnimation, + [BALL_FAST] = GreatBallOpenParticleAnimation, + [BALL_SPORT] = UltraBallOpenParticleAnimation, + [BALL_DUSK] = UltraBallOpenParticleAnimation, + [BALL_QUICK] = UltraBallOpenParticleAnimation, + [BALL_HEAL] = PokeBallOpenParticleAnimation, + [BALL_CHERISH] = MasterBallOpenParticleAnimation, + [BALL_PARK] = UltraBallOpenParticleAnimation, + [BALL_DREAM] = UltraBallOpenParticleAnimation, + [BALL_BEAST] = UltraBallOpenParticleAnimation }; static const struct SpriteTemplate sBallParticleSpriteTemplates[POKEBALL_COUNT] = @@ -365,6 +446,141 @@ static const struct SpriteTemplate sBallParticleSpriteTemplates[POKEBALL_COUNT] .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, + { + .tileTag = TAG_PARTICLES_LEVELBALL, + .paletteTag = TAG_PARTICLES_LEVELBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_LUREBALL, + .paletteTag = TAG_PARTICLES_LUREBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_MOONBALL, + .paletteTag = TAG_PARTICLES_MOONBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_FRIENDBALL, + .paletteTag = TAG_PARTICLES_FRIENDBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_LOVEBALL, + .paletteTag = TAG_PARTICLES_LOVEBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_HEAVYBALL, + .paletteTag = TAG_PARTICLES_HEAVYBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_FASTBALL, + .paletteTag = TAG_PARTICLES_FASTBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_SPORTBALL, + .paletteTag = TAG_PARTICLES_SPORTBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_DUSKBALL, + .paletteTag = TAG_PARTICLES_DUSKBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_QUICKBALL, + .paletteTag = TAG_PARTICLES_QUICKBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_HEALBALL, + .paletteTag = TAG_PARTICLES_HEALBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_CHERISHBALL, + .paletteTag = TAG_PARTICLES_CHERISHBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_PARKBALL, + .paletteTag = TAG_PARTICLES_PARKBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_DREAMBALL, + .paletteTag = TAG_PARTICLES_DREAMBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_BEASTBALL, + .paletteTag = TAG_PARTICLES_BEASTBALL, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = sAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, }; const u16 gBallOpenFadeColors[] = @@ -382,15 +598,22 @@ const u16 gBallOpenFadeColors[] = [BALL_LUXURY] = RGB(31, 17, 10), [BALL_PREMIER] = RGB(31, 9, 10), - // Garbage data - RGB(0, 0, 0), - RGB(1, 16, 0), - RGB(3, 0, 1), - RGB(1, 8, 0), - RGB(0, 8, 0), - RGB(3, 8, 1), - RGB(6, 8, 1), - RGB(4, 0, 0), + // Todo, assign different colors + [BALL_LEVEL] = RGB(24, 4, 4), + [BALL_LURE] = RGB(9, 22, 27), + [BALL_MOON] = RGB(30, 25, 8), + [BALL_FRIEND] = RGB(17, 24, 7), + [BALL_LOVE] = RGB(31, 19, 26), + [BALL_HEAVY] = RGB(7, 11, 20), + [BALL_FAST] = RGB(29, 17, 8), + [BALL_SPORT] = RGB(31, 31, 15), + [BALL_DUSK] = RGB(7, 1, 13), + [BALL_QUICK] = RGB(16, 25, 30), + [BALL_HEAL] = RGB(31, 23, 27), + [BALL_CHERISH] = RGB(25, 4, 3), + [BALL_PARK] = RGB(31, 31, 15), + [BALL_DREAM] = RGB(31, 31, 15), + [BALL_BEAST] = RGB(31, 31, 15), }; const struct SpriteTemplate gPokeblockSpriteTemplate = @@ -748,6 +971,37 @@ u8 ItemIdToBallId(u16 ballItem) case ITEM_PREMIER_BALL: return BALL_PREMIER; case ITEM_POKE_BALL: + return BALL_POKE; + case ITEM_LEVEL_BALL: + return BALL_LEVEL; + case ITEM_LURE_BALL: + return BALL_LURE; + case ITEM_MOON_BALL: + return BALL_MOON; + case ITEM_FRIEND_BALL: + return BALL_FRIEND; + case ITEM_LOVE_BALL: + return BALL_LOVE; + case ITEM_HEAVY_BALL: + return BALL_HEAVY; + case ITEM_FAST_BALL: + return BALL_FAST; + case ITEM_SPORT_BALL: + return BALL_SPORT; + case ITEM_DUSK_BALL: + return BALL_DUSK; + case ITEM_QUICK_BALL: + return BALL_QUICK; + case ITEM_HEAL_BALL: + return BALL_HEAL; + case ITEM_CHERISH_BALL: + return BALL_CHERISH; + case ITEM_PARK_BALL: + return BALL_PARK; + case ITEM_DREAM_BALL: + return BALL_DREAM; + case ITEM_BEAST_BALL: + return BALL_BEAST; default: return BALL_POKE; } @@ -1135,8 +1389,8 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite) switch (STATE(sprite->sState)) { - case BALL_ROLL_1: - // Rolling effect: every frame in the rotation, the sprite shifts 176/256 of a pixel. + case BALL_ROLL_1: + // Rolling effect: every frame in the rotation, the sprite shifts 176/256 of a pixel. if (gBattleSpritesDataPtr->animationData->ballSubpx > 255) { sprite->pos2.x += sprite->sDirection; @@ -2266,7 +2520,7 @@ static void Task_ShinyStars(u8 taskId) } // Wait until the ball particles have despawned - if (gBattleSpritesDataPtr->animationData->numBallParticles) + if (gBattleSpritesDataPtr->animationData->numBallParticles) return; timer = gTasks[taskId].tStarTimer++; @@ -2438,7 +2692,7 @@ static void SpriteCB_PokeBlock_Arc(struct Sprite *sprite) } // Destroy after end of player animation -static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *sprite) +static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *sprite) { if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animEnded) { diff --git a/src/battle_main.c b/src/battle_main.c index bdde96be2..c05061656 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -48,6 +48,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" @@ -5071,6 +5072,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void) { if (!gPaletteFade.active) { + gIsFishingEncounter = FALSE; ResetSpriteData(); if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON) { diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 203b572eb..517442ac3 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -291,23 +291,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] = @@ -315,23 +315,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/battle_script_commands.c b/src/battle_script_commands.c index 3b77df294..bc689117a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -41,6 +41,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" @@ -9748,7 +9750,7 @@ static void Cmd_removelightscreenreflect(void) // brick break static void Cmd_handleballthrow(void) { - u8 ballMultiplier = 0; + u8 ballMultiplier = 10; if (gBattleControllerExecFlags) return; @@ -9770,7 +9772,7 @@ static void Cmd_handleballthrow(void) } else { - u32 odds; + u32 odds, i; u8 catchRate; if (gLastUsedItem == ITEM_SAFARI_BALL) @@ -9785,14 +9787,10 @@ static void Cmd_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) @@ -9801,16 +9799,10 @@ static void Cmd_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; @@ -9819,8 +9811,70 @@ static void Cmd_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 >= 100) + 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 @@ -9884,6 +9938,14 @@ static void Cmd_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/berry.c b/src/berry.c index d70e8c353..181ecd154 100644 --- a/src/berry.c +++ b/src/berry.c @@ -113,6 +113,43 @@ static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a m static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); +static const u8 sBerryDescriptionPart1_Occa[] = _("Said to grow in the tropics once,"); +static const u8 sBerryDescriptionPart2_Occa[] = _("it boasts an intensely hot spiciness."); +static const u8 sBerryDescriptionPart1_Passho[] = _("Its flesh is dotted with many tiny"); +static const u8 sBerryDescriptionPart2_Passho[] = _("bubbles that keep it afloat in water."); +static const u8 sBerryDescriptionPart1_Wacan[] = _("Energy drawn from lightning strikes"); +static const u8 sBerryDescriptionPart2_Wacan[] = _("makes this Berry grow big and rich."); +static const u8 sBerryDescriptionPart1_Rindo[] = _("This berry has a vegetable-like flavor,"); +static const u8 sBerryDescriptionPart2_Rindo[] = _("but is rich in health-promoting fiber."); +static const u8 sBerryDescriptionPart1_Yache[] = _("This Berry has a refreshing dry and"); +static const u8 sBerryDescriptionPart2_Yache[] = _("sour flavor. Tastes better chilled."); +static const u8 sBerryDescriptionPart1_Chople[] = _("Contains a substance that generates"); +static const u8 sBerryDescriptionPart2_Chople[] = _("heat. Can even fire up a chilly heart."); +static const u8 sBerryDescriptionPart1_Kebia[] = _("Brilliant green on the outside, inside"); +static const u8 sBerryDescriptionPart2_Kebia[] = _("it is packed with black-colored flesh."); +static const u8 sBerryDescriptionPart1_Shuca[] = _("The sweet pulp has just the hint of a"); +static const u8 sBerryDescriptionPart2_Shuca[] = _("a hard-edged and fragrant bite to it."); +static const u8 sBerryDescriptionPart1_Coba[] = _("This Berry is said to be a cross of"); +static const u8 sBerryDescriptionPart2_Coba[] = _("two Berries blown in from far away."); +static const u8 sBerryDescriptionPart1_Payapa[] = _("Said to sense human emotions, it swells"); +static const u8 sBerryDescriptionPart2_Payapa[] = _("roundly when a person approaches."); +static const u8 sBerryDescriptionPart1_Tanga[] = _("It grows a flower at the tip that lures"); +static const u8 sBerryDescriptionPart2_Tanga[] = _("Bug Pokémon with its stringy petals."); +static const u8 sBerryDescriptionPart1_Charti[] = _("Often used for pickles because of its"); +static const u8 sBerryDescriptionPart2_Charti[] = _("dry flavor. Sometimes eaten raw."); +static const u8 sBerryDescriptionPart1_Kasib[] = _("Old superstitions say it has an odd"); +static const u8 sBerryDescriptionPart2_Kasib[] = _("power. A popular good-luck charm."); +static const u8 sBerryDescriptionPart1_Haban[] = _("Less bitter if enough of this Berry"); +static const u8 sBerryDescriptionPart2_Haban[] = _("is boiled down. Makes a good jam."); +static const u8 sBerryDescriptionPart1_Colbur[] = _("Tiny hooks on the surface latch onto"); +static const u8 sBerryDescriptionPart2_Colbur[] = _("Pokémon to reach far-off places."); +static const u8 sBerryDescriptionPart1_Babiri[] = _("Very tough with a strong flavor. It"); +static const u8 sBerryDescriptionPart2_Babiri[] = _("was used to make medicine in the past."); +static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whistle that"); +static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound."); +static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings"); +static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown."); + const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = @@ -888,6 +925,330 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 40, }, + + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("OCCA"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 89, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Occa, + .description2 = sBerryDescriptionPart2_Occa, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("PASSHO"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 33, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Passho, + .description2 = sBerryDescriptionPart2_Passho, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("WACAN"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 250, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Wacan, + .description2 = sBerryDescriptionPart2_Wacan, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("RINDO"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 155, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Rindo, + .description2 = sBerryDescriptionPart2_Rindo, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("YACHE"), + .firmness = BERRY_FIRMNESS_VERY_HARD, + .size = 135, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Yache, + .description2 = sBerryDescriptionPart2_Yache, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHOPLE"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 77, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Chople, + .description2 = sBerryDescriptionPart2_Chople, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("KEBIA"), + .firmness = BERRY_FIRMNESS_HARD, + .size = 89, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Kebia, + .description2 = sBerryDescriptionPart2_Kebia, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("SHUCA"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 42, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Shuca, + .description2 = sBerryDescriptionPart2_Shuca, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("COBA"), + .firmness = BERRY_FIRMNESS_VERY_HARD, + .size = 277, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Coba, + .description2 = sBerryDescriptionPart2_Coba, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("PAYAPA"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 251, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Payapa, + .description2 = sBerryDescriptionPart2_Payapa, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("TANGA"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 43, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Tanga, + .description2 = sBerryDescriptionPart2_Tanga, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHARTI"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 28, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Charti, + .description2 = sBerryDescriptionPart2_Charti, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("KASIB"), + .firmness = BERRY_FIRMNESS_HARD, + .size = 144, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Kasib, + .description2 = sBerryDescriptionPart2_Kasib, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("HABAN"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 23, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Haban, + .description2 = sBerryDescriptionPart2_Haban, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("COLBUR"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 38, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Colbur, + .description2 = sBerryDescriptionPart2_Colbur, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("BABIRI"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 265, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Babiri, + .description2 = sBerryDescriptionPart2_Babiri, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHILAN"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 33, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Chilan, + .description2 = sBerryDescriptionPart2_Chilan, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("ROSELI"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 35, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Roseli, + .description2 = sBerryDescriptionPart2_Roseli, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, }; const struct UnkStruct_0858AB24 gUnknown_0858AB24[] = { diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h index eb3f9f4dc..95c72b3e9 100644 --- a/src/data/graphics/berries.h +++ b/src/data/graphics/berries.h @@ -49,6 +49,24 @@ const u32 gBerryPic_Apicot[] = INCBIN_U32("graphics/berries/apicot.4bpp.lz"); const u32 gBerryPic_Lansat[] = INCBIN_U32("graphics/berries/lansat.4bpp.lz"); const u32 gBerryPic_Starf[] = INCBIN_U32("graphics/berries/starf.4bpp.lz"); const u32 gBerryPic_Enigma[] = INCBIN_U32("graphics/berries/enigma.4bpp.lz"); +const u32 gBerryPic_Occa[] = INCBIN_U32("graphics/berries/occa.4bpp.lz"); +const u32 gBerryPic_Passho[] = INCBIN_U32("graphics/berries/passho.4bpp.lz"); +const u32 gBerryPic_Wacan[] = INCBIN_U32("graphics/berries/wacan.4bpp.lz"); +const u32 gBerryPic_Rindo[] = INCBIN_U32("graphics/berries/rindo.4bpp.lz"); +const u32 gBerryPic_Yache[] = INCBIN_U32("graphics/berries/yache.4bpp.lz"); +const u32 gBerryPic_Chople[] = INCBIN_U32("graphics/berries/chople.4bpp.lz"); +const u32 gBerryPic_Kebia[] = INCBIN_U32("graphics/berries/kebia.4bpp.lz"); +const u32 gBerryPic_Shuca[] = INCBIN_U32("graphics/berries/shuca.4bpp.lz"); +const u32 gBerryPic_Coba[] = INCBIN_U32("graphics/berries/coba.4bpp.lz"); +const u32 gBerryPic_Payapa[] = INCBIN_U32("graphics/berries/payapa.4bpp.lz"); +const u32 gBerryPic_Tanga[] = INCBIN_U32("graphics/berries/tanga.4bpp.lz"); +const u32 gBerryPic_Charti[] = INCBIN_U32("graphics/berries/charti.4bpp.lz"); +const u32 gBerryPic_Kasib[] = INCBIN_U32("graphics/berries/kasib.4bpp.lz"); +const u32 gBerryPic_Haban[] = INCBIN_U32("graphics/berries/haban.4bpp.lz"); +const u32 gBerryPic_Colbur[] = INCBIN_U32("graphics/berries/colbur.4bpp.lz"); +const u32 gBerryPic_Babiri[] = INCBIN_U32("graphics/berries/babiri.4bpp.lz"); +const u32 gBerryPic_Chilan[] = INCBIN_U32("graphics/berries/chilan.4bpp.lz"); +const u32 gBerryPic_Roseli[] = INCBIN_U32("graphics/berries/roseli.4bpp.lz"); const u32 gBerryPalette_Cheri[] = INCBIN_U32("graphics/berries/cheri.gbapal.lz"); const u32 gBerryPalette_Oran[] = INCBIN_U32("graphics/berries/oran.gbapal.lz"); @@ -93,3 +111,21 @@ const u32 gBerryPalette_Apicot[] = INCBIN_U32("graphics/berries/apicot.gbapal.lz const u32 gBerryPalette_Lansat[] = INCBIN_U32("graphics/berries/lansat.gbapal.lz"); const u32 gBerryPalette_Starf[] = INCBIN_U32("graphics/berries/starf.gbapal.lz"); const u32 gBerryPalette_Enigma[] = INCBIN_U32("graphics/berries/enigma.gbapal.lz"); +const u32 gBerryPalette_Occa[] = INCBIN_U32("graphics/berries/occa.gbapal.lz"); +const u32 gBerryPalette_Passho[] = INCBIN_U32("graphics/berries/passho.gbapal.lz"); +const u32 gBerryPalette_Wacan[] = INCBIN_U32("graphics/berries/wacan.gbapal.lz"); +const u32 gBerryPalette_Rindo[] = INCBIN_U32("graphics/berries/rindo.gbapal.lz"); +const u32 gBerryPalette_Yache[] = INCBIN_U32("graphics/berries/yache.gbapal.lz"); +const u32 gBerryPalette_Chople[] = INCBIN_U32("graphics/berries/chople.gbapal.lz"); +const u32 gBerryPalette_Kebia[] = INCBIN_U32("graphics/berries/kebia.gbapal.lz"); +const u32 gBerryPalette_Shuca[] = INCBIN_U32("graphics/berries/shuca.gbapal.lz"); +const u32 gBerryPalette_Coba[] = INCBIN_U32("graphics/berries/coba.gbapal.lz"); +const u32 gBerryPalette_Payapa[] = INCBIN_U32("graphics/berries/payapa.gbapal.lz"); +const u32 gBerryPalette_Tanga[] = INCBIN_U32("graphics/berries/tanga.gbapal.lz"); +const u32 gBerryPalette_Charti[] = INCBIN_U32("graphics/berries/charti.gbapal.lz"); +const u32 gBerryPalette_Kasib[] = INCBIN_U32("graphics/berries/kasib.gbapal.lz"); +const u32 gBerryPalette_Haban[] = INCBIN_U32("graphics/berries/haban.gbapal.lz"); +const u32 gBerryPalette_Colbur[] = INCBIN_U32("graphics/berries/colbur.gbapal.lz"); +const u32 gBerryPalette_Babiri[] = INCBIN_U32("graphics/berries/babiri.gbapal.lz"); +const u32 gBerryPalette_Chilan[] = INCBIN_U32("graphics/berries/chilan.gbapal.lz"); +const u32 gBerryPalette_Roseli[] = INCBIN_U32("graphics/berries/roseli.gbapal.lz"); diff --git a/src/data/graphics/interface_pokeballs.h b/src/data/graphics/interface_pokeballs.h index fe9a4e5be..c3842571b 100644 --- a/src/data/graphics/interface_pokeballs.h +++ b/src/data/graphics/interface_pokeballs.h @@ -34,4 +34,49 @@ const u32 gInterfacePal_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxur const u32 gInterfaceGfx_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.4bpp.lz"); const u32 gInterfacePal_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.gbapal.lz"); +const u32 gInterfaceGfx_LevelBall[] = INCBIN_U32("graphics/interface/ball/level.4bpp.lz"); +const u32 gInterfacePal_LevelBall[] = INCBIN_U32("graphics/interface/ball/level.gbapal.lz"); + +const u32 gInterfaceGfx_LureBall[] = INCBIN_U32("graphics/interface/ball/lure.4bpp.lz"); +const u32 gInterfacePal_LureBall[] = INCBIN_U32("graphics/interface/ball/lure.gbapal.lz"); + +const u32 gInterfaceGfx_MoonBall[] = INCBIN_U32("graphics/interface/ball/moon.4bpp.lz"); +const u32 gInterfacePal_MoonBall[] = INCBIN_U32("graphics/interface/ball/moon.gbapal.lz"); + +const u32 gInterfaceGfx_FriendBall[] = INCBIN_U32("graphics/interface/ball/friend.4bpp.lz"); +const u32 gInterfacePal_FriendBall[] = INCBIN_U32("graphics/interface/ball/friend.gbapal.lz"); + +const u32 gInterfaceGfx_LoveBall[] = INCBIN_U32("graphics/interface/ball/love.4bpp.lz"); +const u32 gInterfacePal_LoveBall[] = INCBIN_U32("graphics/interface/ball/love.gbapal.lz"); + +const u32 gInterfaceGfx_HeavyBall[] = INCBIN_U32("graphics/interface/ball/heavy.4bpp.lz"); +const u32 gInterfacePal_HeavyBall[] = INCBIN_U32("graphics/interface/ball/heavy.gbapal.lz"); + +const u32 gInterfaceGfx_FastBall[] = INCBIN_U32("graphics/interface/ball/fast.4bpp.lz"); +const u32 gInterfacePal_FastBall[] = INCBIN_U32("graphics/interface/ball/fast.gbapal.lz"); + +const u32 gInterfaceGfx_SportBall[] = INCBIN_U32("graphics/interface/ball/sport.4bpp.lz"); +const u32 gInterfacePal_SportBall[] = INCBIN_U32("graphics/interface/ball/sport.gbapal.lz"); + +const u32 gInterfaceGfx_DuskBall[] = INCBIN_U32("graphics/interface/ball/dusk.4bpp.lz"); +const u32 gInterfacePal_DuskBall[] = INCBIN_U32("graphics/interface/ball/dusk.gbapal.lz"); + +const u32 gInterfaceGfx_QuickBall[] = INCBIN_U32("graphics/interface/ball/quick.4bpp.lz"); +const u32 gInterfacePal_QuickBall[] = INCBIN_U32("graphics/interface/ball/quick.gbapal.lz"); + +const u32 gInterfaceGfx_HealBall[] = INCBIN_U32("graphics/interface/ball/heal.4bpp.lz"); +const u32 gInterfacePal_HealBall[] = INCBIN_U32("graphics/interface/ball/heal.gbapal.lz"); + +const u32 gInterfaceGfx_CherishBall[] = INCBIN_U32("graphics/interface/ball/cherish.4bpp.lz"); +const u32 gInterfacePal_CherishBall[] = INCBIN_U32("graphics/interface/ball/cherish.gbapal.lz"); + +const u32 gInterfaceGfx_ParkBall[] = INCBIN_U32("graphics/interface/ball/park.4bpp.lz"); +const u32 gInterfacePal_ParkBall[] = INCBIN_U32("graphics/interface/ball/park.gbapal.lz"); + +const u32 gInterfaceGfx_DreamBall[] = INCBIN_U32("graphics/interface/ball/dream.4bpp.lz"); +const u32 gInterfacePal_DreamBall[] = INCBIN_U32("graphics/interface/ball/dream.gbapal.lz"); + +const u32 gInterfaceGfx_BeastBall[] = INCBIN_U32("graphics/interface/ball/beast.4bpp.lz"); +const u32 gInterfacePal_BeastBall[] = INCBIN_U32("graphics/interface/ball/beast.gbapal.lz"); + const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/interface/ball_open.4bpp.lz"); diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 26da9061d..3255f6968 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -40,6 +40,51 @@ const u32 gItemIconPalette_LuxuryBall[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_PremierBall[] = INCBIN_U32("graphics/items/icons/premier_ball.4bpp.lz"); +const u32 gItemIcon_LevelBall[] = INCBIN_U32("graphics/items/icons/level_ball.4bpp.lz"); +const u32 gItemIconPalette_LevelBall[] = INCBIN_U32("graphics/items/icon_palettes/level_ball.gbapal.lz"); + +const u32 gItemIcon_LureBall[] = INCBIN_U32("graphics/items/icons/lure_ball.4bpp.lz"); +const u32 gItemIconPalette_LureBall[] = INCBIN_U32("graphics/items/icon_palettes/lure_ball.gbapal.lz"); + +const u32 gItemIcon_MoonBall[] = INCBIN_U32("graphics/items/icons/moon_ball.4bpp.lz"); +const u32 gItemIconPalette_MoonBall[] = INCBIN_U32("graphics/items/icon_palettes/moon_ball.gbapal.lz"); + +const u32 gItemIcon_FriendBall[] = INCBIN_U32("graphics/items/icons/friend_ball.4bpp.lz"); +const u32 gItemIconPalette_FriendBall[] = INCBIN_U32("graphics/items/icon_palettes/friend_ball.gbapal.lz"); + +const u32 gItemIcon_LoveBall[] = INCBIN_U32("graphics/items/icons/love_ball.4bpp.lz"); +const u32 gItemIconPalette_LoveBall[] = INCBIN_U32("graphics/items/icon_palettes/love_ball.gbapal.lz"); + +const u32 gItemIcon_HeavyBall[] = INCBIN_U32("graphics/items/icons/heavy_ball.4bpp.lz"); +const u32 gItemIconPalette_HeavyBall[] = INCBIN_U32("graphics/items/icon_palettes/heavy_ball.gbapal.lz"); + +const u32 gItemIcon_FastBall[] = INCBIN_U32("graphics/items/icons/fast_ball.4bpp.lz"); +const u32 gItemIconPalette_FastBall[] = INCBIN_U32("graphics/items/icon_palettes/fast_ball.gbapal.lz"); + +const u32 gItemIcon_SportBall[] = INCBIN_U32("graphics/items/icons/sport_ball.4bpp.lz"); +const u32 gItemIconPalette_SportBall[] = INCBIN_U32("graphics/items/icon_palettes/sport_ball.gbapal.lz"); + +const u32 gItemIcon_DuskBall[] = INCBIN_U32("graphics/items/icons/dusk_ball.4bpp.lz"); +const u32 gItemIconPalette_DuskBall[] = INCBIN_U32("graphics/items/icon_palettes/dusk_ball.gbapal.lz"); + +const u32 gItemIcon_QuickBall[] = INCBIN_U32("graphics/items/icons/quick_ball.4bpp.lz"); +const u32 gItemIconPalette_QuickBall[] = INCBIN_U32("graphics/items/icon_palettes/quick_ball.gbapal.lz"); + +const u32 gItemIcon_HealBall[] = INCBIN_U32("graphics/items/icons/heal_ball.4bpp.lz"); +const u32 gItemIconPalette_HealBall[] = INCBIN_U32("graphics/items/icon_palettes/heal_ball.gbapal.lz"); + +const u32 gItemIcon_CherishBall[] = INCBIN_U32("graphics/items/icons/cherish_ball.4bpp.lz"); +const u32 gItemIconPalette_CherishBall[] = INCBIN_U32("graphics/items/icon_palettes/cherish_ball.gbapal.lz"); + +const u32 gItemIcon_ParkBall[] = INCBIN_U32("graphics/items/icons/park_ball.4bpp.lz"); +const u32 gItemIconPalette_ParkBall[] = INCBIN_U32("graphics/items/icon_palettes/park_ball.gbapal.lz"); + +const u32 gItemIcon_DreamBall[] = INCBIN_U32("graphics/items/icons/dream_ball.4bpp.lz"); +const u32 gItemIconPalette_DreamBall[] = INCBIN_U32("graphics/items/icon_palettes/dream_ball.gbapal.lz"); + +const u32 gItemIcon_BeastBall[] = INCBIN_U32("graphics/items/icons/beast_ball.4bpp.lz"); +const u32 gItemIconPalette_BeastBall[] = INCBIN_U32("graphics/items/icon_palettes/beast_ball.gbapal.lz"); + // Medicine const u32 gItemIcon_Potion[] = INCBIN_U32("graphics/items/icons/potion.4bpp.lz"); @@ -736,3 +781,740 @@ const u32 gItemIconPalette_MagmaEmblem[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_OldSeaMap[] = INCBIN_U32("graphics/items/icons/old_sea_map.4bpp.lz"); const u32 gItemIconPalette_OldSeaMap[] = INCBIN_U32("graphics/items/icon_palettes/old_sea_map.gbapal.lz"); + +// Gen 4 Items + +const u32 gItemIcon_WideLens[] = INCBIN_U32("graphics/items/icons/wide_lens.4bpp.lz"); +const u32 gItemIconPalette_WideLens[] = INCBIN_U32("graphics/items/icon_palettes/wide_lens.gbapal.lz"); + +const u32 gItemIcon_MuscleBand[] = INCBIN_U32("graphics/items/icons/muscle_band.4bpp.lz"); +const u32 gItemIconPalette_MuscleBand[] = INCBIN_U32("graphics/items/icon_palettes/muscle_band.gbapal.lz"); + +const u32 gItemIcon_WiseGlasses[] = INCBIN_U32("graphics/items/icons/wise_glasses.4bpp.lz"); +const u32 gItemIconPalette_WiseGlasses[] = INCBIN_U32("graphics/items/icon_palettes/wise_glasses.gbapal.lz"); + +const u32 gItemIcon_ExpertBelt[] = INCBIN_U32("graphics/items/icons/expert_belt.4bpp.lz"); +const u32 gItemIconPalette_ExpertBelt[] = INCBIN_U32("graphics/items/icon_palettes/expert_belt.gbapal.lz"); + +const u32 gItemIcon_LightClay[] = INCBIN_U32("graphics/items/icons/light_clay.4bpp.lz"); +const u32 gItemIconPalette_LightClay[] = INCBIN_U32("graphics/items/icon_palettes/light_clay.gbapal.lz"); + +const u32 gItemIcon_LifeOrb[] = INCBIN_U32("graphics/items/icons/life_orb.4bpp.lz"); +const u32 gItemIconPalette_LifeOrb[] = INCBIN_U32("graphics/items/icon_palettes/life_orb.gbapal.lz"); + +const u32 gItemIcon_PowerHerb[] = INCBIN_U32("graphics/items/icons/power_herb.4bpp.lz"); +const u32 gItemIconPalette_PowerHerb[] = INCBIN_U32("graphics/items/icon_palettes/power_herb.gbapal.lz"); + +const u32 gItemIcon_ToxicOrb[] = INCBIN_U32("graphics/items/icons/toxic_orb.4bpp.lz"); +const u32 gItemIconPalette_ToxicOrb[] = INCBIN_U32("graphics/items/icon_palettes/toxic_orb.gbapal.lz"); + +const u32 gItemIcon_FlameOrb[] = INCBIN_U32("graphics/items/icons/flame_orb.4bpp.lz"); +const u32 gItemIconPalette_FlameOrb[] = INCBIN_U32("graphics/items/icon_palettes/flame_orb.gbapal.lz"); + +const u32 gItemIcon_QuickPowder[] = INCBIN_U32("graphics/items/icons/quick_powder.4bpp.lz"); +const u32 gItemIconPalette_QuickPowder[] = INCBIN_U32("graphics/items/icon_palettes/quick_powder.gbapal.lz"); + +const u32 gItemIcon_FocusSash[] = INCBIN_U32("graphics/items/icons/focus_sash.4bpp.lz"); +const u32 gItemIconPalette_FocusSash[] = INCBIN_U32("graphics/items/icon_palettes/focus_sash.gbapal.lz"); + +const u32 gItemIcon_ZoomLens[] = INCBIN_U32("graphics/items/icons/zoom_lens.4bpp.lz"); +const u32 gItemIconPalette_ZoomLens[] = INCBIN_U32("graphics/items/icon_palettes/zoom_lens.gbapal.lz"); + +const u32 gItemIcon_Metronome[] = INCBIN_U32("graphics/items/icons/metronome.4bpp.lz"); +const u32 gItemIconPalette_Metronome[] = INCBIN_U32("graphics/items/icon_palettes/metronome.gbapal.lz"); + +const u32 gItemIcon_IronBall[] = INCBIN_U32("graphics/items/icons/iron_ball.4bpp.lz"); +const u32 gItemIconPalette_IronBall[] = INCBIN_U32("graphics/items/icon_palettes/iron_ball.gbapal.lz"); + +const u32 gItemIcon_LaggingTail[] = INCBIN_U32("graphics/items/icons/lagging_tail.4bpp.lz"); +const u32 gItemIconPalette_LaggingTail[] = INCBIN_U32("graphics/items/icon_palettes/lagging_tail.gbapal.lz"); + +const u32 gItemIcon_DestinyKnot[] = INCBIN_U32("graphics/items/icons/destiny_knot.4bpp.lz"); +const u32 gItemIconPalette_DestinyKnot[] = INCBIN_U32("graphics/items/icon_palettes/destiny_knot.gbapal.lz"); + +const u32 gItemIcon_BlackSludge[] = INCBIN_U32("graphics/items/icons/black_sludge.4bpp.lz"); +const u32 gItemIconPalette_BlackSludge[] = INCBIN_U32("graphics/items/icon_palettes/black_sludge.gbapal.lz"); + +const u32 gItemIcon_IcyRock[] = INCBIN_U32("graphics/items/icons/icy_rock.4bpp.lz"); +const u32 gItemIconPalette_IcyRock[] = INCBIN_U32("graphics/items/icon_palettes/icy_rock.gbapal.lz"); + +const u32 gItemIcon_SmoothRock[] = INCBIN_U32("graphics/items/icons/smooth_rock.4bpp.lz"); +const u32 gItemIconPalette_SmoothRock[] = INCBIN_U32("graphics/items/icon_palettes/smooth_rock.gbapal.lz"); + +const u32 gItemIcon_HeatRock[] = INCBIN_U32("graphics/items/icons/heat_rock.4bpp.lz"); +const u32 gItemIconPalette_HeatRock[] = INCBIN_U32("graphics/items/icon_palettes/heat_rock.gbapal.lz"); + +const u32 gItemIcon_DampRock[] = INCBIN_U32("graphics/items/icons/damp_rock.4bpp.lz"); +const u32 gItemIconPalette_DampRock[] = INCBIN_U32("graphics/items/icon_palettes/damp_rock.gbapal.lz"); + +const u32 gItemIcon_GripClaw[] = INCBIN_U32("graphics/items/icons/grip_claw.4bpp.lz"); +const u32 gItemIconPalette_GripClaw[] = INCBIN_U32("graphics/items/icon_palettes/grip_claw.gbapal.lz"); + +const u32 gItemIcon_ChoiceScarf[] = INCBIN_U32("graphics/items/icons/choice_scarf.4bpp.lz"); +const u32 gItemIconPalette_ChoiceScarf[] = INCBIN_U32("graphics/items/icon_palettes/choice_scarf.gbapal.lz"); + +const u32 gItemIcon_StickyBarb[] = INCBIN_U32("graphics/items/icons/sticky_barb.4bpp.lz"); +const u32 gItemIconPalette_StickyBarb[] = INCBIN_U32("graphics/items/icon_palettes/sticky_barb.gbapal.lz"); + +const u32 gItemIcon_ShedShell[] = INCBIN_U32("graphics/items/icons/shed_shell.4bpp.lz"); +const u32 gItemIconPalette_ShedShell[] = INCBIN_U32("graphics/items/icon_palettes/shed_shell.gbapal.lz"); + +const u32 gItemIcon_BigRoot[] = INCBIN_U32("graphics/items/icons/big_root.4bpp.lz"); +const u32 gItemIconPalette_BigRoot[] = INCBIN_U32("graphics/items/icon_palettes/big_root.gbapal.lz"); + +const u32 gItemIcon_ChoiceSpecs[] = INCBIN_U32("graphics/items/icons/choice_specs.4bpp.lz"); +const u32 gItemIconPalette_ChoiceSpecs[] = INCBIN_U32("graphics/items/icon_palettes/choice_specs.gbapal.lz"); + +const u32 gItemIcon_AdamantOrb[] = INCBIN_U32("graphics/items/icons/adamant_orb.4bpp.lz"); +const u32 gItemIconPalette_AdamantOrb[] = INCBIN_U32("graphics/items/icon_palettes/adamant_orb.gbapal.lz"); + +const u32 gItemIcon_LustrousOrb[] = INCBIN_U32("graphics/items/icons/lustrous_orb.4bpp.lz"); +const u32 gItemIconPalette_LustrousOrb[] = INCBIN_U32("graphics/items/icon_palettes/lustrous_orb.gbapal.lz"); + +const u32 gItemIcon_GriseousOrb[] = INCBIN_U32("graphics/items/icons/griseous_orb.4bpp.lz"); +const u32 gItemIconPalette_GriseousOrb[] = INCBIN_U32("graphics/items/icon_palettes/griseous_orb.gbapal.lz"); + +const u32 gItemIcon_FlamePlate[] = INCBIN_U32("graphics/items/icons/flame_plate.4bpp.lz"); +const u32 gItemIconPalette_FlamePlate[] = INCBIN_U32("graphics/items/icon_palettes/flame_plate.gbapal.lz"); + +const u32 gItemIcon_SplashPlate[] = INCBIN_U32("graphics/items/icons/splash_plate.4bpp.lz"); +const u32 gItemIconPalette_SplashPlate[] = INCBIN_U32("graphics/items/icon_palettes/splash_plate.gbapal.lz"); + +const u32 gItemIcon_ZapPlate[] = INCBIN_U32("graphics/items/icons/zap_plate.4bpp.lz"); +const u32 gItemIconPalette_ZapPlate[] = INCBIN_U32("graphics/items/icon_palettes/zap_plate.gbapal.lz"); + +const u32 gItemIcon_MeadowPlate[] = INCBIN_U32("graphics/items/icons/meadow_plate.4bpp.lz"); +const u32 gItemIconPalette_MeadowPlate[] = INCBIN_U32("graphics/items/icon_palettes/meadow_plate.gbapal.lz"); + +const u32 gItemIcon_IciclePlate[] = INCBIN_U32("graphics/items/icons/icicle_plate.4bpp.lz"); +const u32 gItemIconPalette_IciclePlate[] = INCBIN_U32("graphics/items/icon_palettes/icicle_plate.gbapal.lz"); + +const u32 gItemIcon_FistPlate[] = INCBIN_U32("graphics/items/icons/fist_plate.4bpp.lz"); +const u32 gItemIconPalette_FistPlate[] = INCBIN_U32("graphics/items/icon_palettes/fist_plate.gbapal.lz"); + +const u32 gItemIcon_ToxicPlate[] = INCBIN_U32("graphics/items/icons/toxic_plate.4bpp.lz"); +const u32 gItemIconPalette_ToxicPlate[] = INCBIN_U32("graphics/items/icon_palettes/toxic_plate.gbapal.lz"); + +const u32 gItemIcon_EarthPlate[] = INCBIN_U32("graphics/items/icons/earth_plate.4bpp.lz"); +const u32 gItemIconPalette_EarthPlate[] = INCBIN_U32("graphics/items/icon_palettes/earth_plate.gbapal.lz"); + +const u32 gItemIcon_SkyPlate[] = INCBIN_U32("graphics/items/icons/sky_plate.4bpp.lz"); +const u32 gItemIconPalette_SkyPlate[] = INCBIN_U32("graphics/items/icon_palettes/sky_plate.gbapal.lz"); + +const u32 gItemIcon_MindPlate[] = INCBIN_U32("graphics/items/icons/mind_plate.4bpp.lz"); +const u32 gItemIconPalette_MindPlate[] = INCBIN_U32("graphics/items/icon_palettes/mind_plate.gbapal.lz"); + +const u32 gItemIcon_InsectPlate[] = INCBIN_U32("graphics/items/icons/insect_plate.4bpp.lz"); +const u32 gItemIconPalette_InsectPlate[] = INCBIN_U32("graphics/items/icon_palettes/insect_plate.gbapal.lz"); + +const u32 gItemIcon_StonePlate[] = INCBIN_U32("graphics/items/icons/stone_plate.4bpp.lz"); +const u32 gItemIconPalette_StonePlate[] = INCBIN_U32("graphics/items/icon_palettes/stone_plate.gbapal.lz"); + +const u32 gItemIcon_SpookyPlate[] = INCBIN_U32("graphics/items/icons/spooky_plate.4bpp.lz"); +const u32 gItemIconPalette_SpookyPlate[] = INCBIN_U32("graphics/items/icon_palettes/spooky_plate.gbapal.lz"); + +const u32 gItemIcon_DracoPlate[] = INCBIN_U32("graphics/items/icons/draco_plate.4bpp.lz"); +const u32 gItemIconPalette_DracoPlate[] = INCBIN_U32("graphics/items/icon_palettes/draco_plate.gbapal.lz"); + +const u32 gItemIcon_DreadPlate[] = INCBIN_U32("graphics/items/icons/dread_plate.4bpp.lz"); +const u32 gItemIconPalette_DreadPlate[] = INCBIN_U32("graphics/items/icon_palettes/dread_plate.gbapal.lz"); + +const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.lz"); +const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/iron_plate.gbapal.lz"); + +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"); +const u32 gItemIconPalette_Eviolite[] = INCBIN_U32("graphics/items/icon_palettes/eviolite.gbapal.lz"); + +const u32 gItemIcon_FloatStone[] = INCBIN_U32("graphics/items/icons/float_stone.4bpp.lz"); +const u32 gItemIconPalette_FloatStone[] = INCBIN_U32("graphics/items/icon_palettes/float_stone.gbapal.lz"); + +const u32 gItemIcon_BindingBand[] = INCBIN_U32("graphics/items/icons/binding_band.4bpp.lz"); +const u32 gItemIconPalette_BindingBand[] = INCBIN_U32("graphics/items/icon_palettes/binding_band.gbapal.lz"); + +const u32 gItemIcon_DouseDrive[] = INCBIN_U32("graphics/items/icons/douse_drive.4bpp.lz"); +const u32 gItemIconPalette_DouseDrive[] = INCBIN_U32("graphics/items/icon_palettes/douse_drive.gbapal.lz"); + +const u32 gItemIcon_ShockDrive[] = INCBIN_U32("graphics/items/icons/shock_drive.4bpp.lz"); +const u32 gItemIconPalette_ShockDrive[] = INCBIN_U32("graphics/items/icon_palettes/shock_drive.gbapal.lz"); + +const u32 gItemIcon_BurnDrive[] = INCBIN_U32("graphics/items/icons/burn_drive.4bpp.lz"); +const u32 gItemIconPalette_BurnDrive[] = INCBIN_U32("graphics/items/icon_palettes/burn_drive.gbapal.lz"); + +const u32 gItemIcon_ChillDrive[] = INCBIN_U32("graphics/items/icons/chill_drive.4bpp.lz"); +const u32 gItemIconPalette_ChillDrive[] = INCBIN_U32("graphics/items/icon_palettes/chill_drive.gbapal.lz"); + +const u32 gItemIcon_FireGem[] = INCBIN_U32("graphics/items/icons/fire_gem.4bpp.lz"); +const u32 gItemIconPalette_FireGem[] = INCBIN_U32("graphics/items/icon_palettes/fire_gem.gbapal.lz"); + +const u32 gItemIcon_WaterGem[] = INCBIN_U32("graphics/items/icons/water_gem.4bpp.lz"); +const u32 gItemIconPalette_WaterGem[] = INCBIN_U32("graphics/items/icon_palettes/water_gem.gbapal.lz"); + +const u32 gItemIcon_ElectricGem[] = INCBIN_U32("graphics/items/icons/electric_gem.4bpp.lz"); +const u32 gItemIconPalette_ElectricGem[] = INCBIN_U32("graphics/items/icon_palettes/electric_gem.gbapal.lz"); + +const u32 gItemIcon_GrassGem[] = INCBIN_U32("graphics/items/icons/grass_gem.4bpp.lz"); +const u32 gItemIconPalette_GrassGem[] = INCBIN_U32("graphics/items/icon_palettes/grass_gem.gbapal.lz"); + +const u32 gItemIcon_IceGem[] = INCBIN_U32("graphics/items/icons/ice_gem.4bpp.lz"); +const u32 gItemIconPalette_IceGem[] = INCBIN_U32("graphics/items/icon_palettes/ice_gem.gbapal.lz"); + +const u32 gItemIcon_FightingGem[] = INCBIN_U32("graphics/items/icons/fighting_gem.4bpp.lz"); +const u32 gItemIconPalette_FightingGem[] = INCBIN_U32("graphics/items/icon_palettes/fighting_gem.gbapal.lz"); + +const u32 gItemIcon_PoisonGem[] = INCBIN_U32("graphics/items/icons/poison_gem.4bpp.lz"); +const u32 gItemIconPalette_PoisonGem[] = INCBIN_U32("graphics/items/icon_palettes/poison_gem.gbapal.lz"); + +const u32 gItemIcon_GroundGem[] = INCBIN_U32("graphics/items/icons/ground_gem.4bpp.lz"); +const u32 gItemIconPalette_GroundGem[] = INCBIN_U32("graphics/items/icon_palettes/ground_gem.gbapal.lz"); + +const u32 gItemIcon_FlyingGem[] = INCBIN_U32("graphics/items/icons/flying_gem.4bpp.lz"); +const u32 gItemIconPalette_FlyingGem[] = INCBIN_U32("graphics/items/icon_palettes/flying_gem.gbapal.lz"); + +const u32 gItemIcon_PsychicGem[] = INCBIN_U32("graphics/items/icons/psychic_gem.4bpp.lz"); +const u32 gItemIconPalette_PsychicGem[] = INCBIN_U32("graphics/items/icon_palettes/psychic_gem.gbapal.lz"); + +const u32 gItemIcon_BugGem[] = INCBIN_U32("graphics/items/icons/bug_gem.4bpp.lz"); +const u32 gItemIconPalette_BugGem[] = INCBIN_U32("graphics/items/icon_palettes/bug_gem.gbapal.lz"); + +const u32 gItemIcon_RockGem[] = INCBIN_U32("graphics/items/icons/rock_gem.4bpp.lz"); +const u32 gItemIconPalette_RockGem[] = INCBIN_U32("graphics/items/icon_palettes/rock_gem.gbapal.lz"); + +const u32 gItemIcon_GhostGem[] = INCBIN_U32("graphics/items/icons/ghost_gem.4bpp.lz"); +const u32 gItemIconPalette_GhostGem[] = INCBIN_U32("graphics/items/icon_palettes/ghost_gem.gbapal.lz"); + +const u32 gItemIcon_DragonGem[] = INCBIN_U32("graphics/items/icons/dragon_gem.4bpp.lz"); +const u32 gItemIconPalette_DragonGem[] = INCBIN_U32("graphics/items/icon_palettes/dragon_gem.gbapal.lz"); + +const u32 gItemIcon_DarkGem[] = INCBIN_U32("graphics/items/icons/dark_gem.4bpp.lz"); +const u32 gItemIconPalette_DarkGem[] = INCBIN_U32("graphics/items/icon_palettes/dark_gem.gbapal.lz"); + +const u32 gItemIcon_SteelGem[] = INCBIN_U32("graphics/items/icons/steel_gem.4bpp.lz"); +const u32 gItemIconPalette_SteelGem[] = INCBIN_U32("graphics/items/icon_palettes/steel_gem.gbapal.lz"); + +const u32 gItemIcon_NormalGem[] = INCBIN_U32("graphics/items/icons/normal_gem.4bpp.lz"); +const u32 gItemIconPalette_NormalGem[] = INCBIN_U32("graphics/items/icon_palettes/normal_gem.gbapal.lz"); + +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"); + +// Gen 6 Items + +const u32 gItemIcon_AssaultVest[] = INCBIN_U32("graphics/items/icons/assault_vest.4bpp.lz"); +const u32 gItemIconPalette_AssaultVest[] = INCBIN_U32("graphics/items/icon_palettes/assault_vest.gbapal.lz"); + +const u32 gItemIcon_PixiePlate[] = INCBIN_U32("graphics/items/icons/pixie_plate.4bpp.lz"); +const u32 gItemIconPalette_PixiePlate[] = INCBIN_U32("graphics/items/icon_palettes/pixie_plate.gbapal.lz"); + +const u32 gItemIcon_SafetyGoggles[] = INCBIN_U32("graphics/items/icons/safety_goggles.4bpp.lz"); +const u32 gItemIconPalette_SafetyGoggles[] = INCBIN_U32("graphics/items/icon_palettes/safety_goggles.gbapal.lz"); + +const u32 gItemIcon_Gengarite[] = INCBIN_U32("graphics/items/icons/gengarite.4bpp.lz"); +const u32 gItemIconPalette_Gengarite[] = INCBIN_U32("graphics/items/icon_palettes/gengarite.gbapal.lz"); + +const u32 gItemIcon_Gardevoirite[] = INCBIN_U32("graphics/items/icons/gardevoirite.4bpp.lz"); +const u32 gItemIconPalette_Gardevoirite[] = INCBIN_U32("graphics/items/icon_palettes/gardevoirite.gbapal.lz"); + +const u32 gItemIcon_Ampharosite[] = INCBIN_U32("graphics/items/icons/ampharosite.4bpp.lz"); +const u32 gItemIconPalette_Ampharosite[] = INCBIN_U32("graphics/items/icon_palettes/ampharosite.gbapal.lz"); + +const u32 gItemIcon_Venusaurite[] = INCBIN_U32("graphics/items/icons/venusaurite.4bpp.lz"); +const u32 gItemIconPalette_Venusaurite[] = INCBIN_U32("graphics/items/icon_palettes/venusaurite.gbapal.lz"); + +const u32 gItemIcon_CharizarditeX[] = INCBIN_U32("graphics/items/icons/charizardite_x.4bpp.lz"); +const u32 gItemIconPalette_CharizarditeX[] = INCBIN_U32("graphics/items/icon_palettes/charizardite_x.gbapal.lz"); + +const u32 gItemIcon_Blastoisinite[] = INCBIN_U32("graphics/items/icons/blastoisinite.4bpp.lz"); +const u32 gItemIconPalette_Blastoisinite[] = INCBIN_U32("graphics/items/icon_palettes/blastoisinite.gbapal.lz"); + +const u32 gItemIcon_MewtwoniteX[] = INCBIN_U32("graphics/items/icons/mewtwonite_x.4bpp.lz"); +const u32 gItemIconPalette_MewtwoniteX[] = INCBIN_U32("graphics/items/icon_palettes/mewtwonite_x.gbapal.lz"); + +const u32 gItemIcon_MewtwoniteY[] = INCBIN_U32("graphics/items/icons/mewtwonite_y.4bpp.lz"); +const u32 gItemIconPalette_MewtwoniteY[] = INCBIN_U32("graphics/items/icon_palettes/mewtwonite_y.gbapal.lz"); + +const u32 gItemIcon_Blazikenite[] = INCBIN_U32("graphics/items/icons/blazikenite.4bpp.lz"); +const u32 gItemIconPalette_Blazikenite[] = INCBIN_U32("graphics/items/icon_palettes/blazikenite.gbapal.lz"); + +const u32 gItemIcon_Medichamite[] = INCBIN_U32("graphics/items/icons/medichamite.4bpp.lz"); +const u32 gItemIconPalette_Medichamite[] = INCBIN_U32("graphics/items/icon_palettes/medichamite.gbapal.lz"); + +const u32 gItemIcon_Houndoominite[] = INCBIN_U32("graphics/items/icons/houndoominite.4bpp.lz"); +const u32 gItemIconPalette_Houndoominite[] = INCBIN_U32("graphics/items/icon_palettes/houndoominite.gbapal.lz"); + +const u32 gItemIcon_Aggronite[] = INCBIN_U32("graphics/items/icons/aggronite.4bpp.lz"); +const u32 gItemIconPalette_Aggronite[] = INCBIN_U32("graphics/items/icon_palettes/aggronite.gbapal.lz"); + +const u32 gItemIcon_Banettite[] = INCBIN_U32("graphics/items/icons/banettite.4bpp.lz"); +const u32 gItemIconPalette_Banettite[] = INCBIN_U32("graphics/items/icon_palettes/banettite.gbapal.lz"); + +const u32 gItemIcon_Tyranitarite[] = INCBIN_U32("graphics/items/icons/tyranitarite.4bpp.lz"); +const u32 gItemIconPalette_Tyranitarite[] = INCBIN_U32("graphics/items/icon_palettes/tyranitarite.gbapal.lz"); + +const u32 gItemIcon_Scizorite[] = INCBIN_U32("graphics/items/icons/scizorite.4bpp.lz"); +const u32 gItemIconPalette_Scizorite[] = INCBIN_U32("graphics/items/icon_palettes/scizorite.gbapal.lz"); + +const u32 gItemIcon_Pinsirite[] = INCBIN_U32("graphics/items/icons/pinsirite.4bpp.lz"); +const u32 gItemIconPalette_Pinsirite[] = INCBIN_U32("graphics/items/icon_palettes/pinsirite.gbapal.lz"); + +const u32 gItemIcon_Aerodactylite[] = INCBIN_U32("graphics/items/icons/aerodactylite.4bpp.lz"); +const u32 gItemIconPalette_Aerodactylite[] = INCBIN_U32("graphics/items/icon_palettes/aerodactylite.gbapal.lz"); + +const u32 gItemIcon_Lucarionite[] = INCBIN_U32("graphics/items/icons/lucarionite.4bpp.lz"); +const u32 gItemIconPalette_Lucarionite[] = INCBIN_U32("graphics/items/icon_palettes/lucarionite.gbapal.lz"); + +const u32 gItemIcon_Abomasite[] = INCBIN_U32("graphics/items/icons/abomasite.4bpp.lz"); +const u32 gItemIconPalette_Abomasite[] = INCBIN_U32("graphics/items/icon_palettes/abomasite.gbapal.lz"); + +const u32 gItemIcon_Kangaskhanite[] = INCBIN_U32("graphics/items/icons/kangaskhanite.4bpp.lz"); +const u32 gItemIconPalette_Kangaskhanite[] = INCBIN_U32("graphics/items/icon_palettes/kangaskhanite.gbapal.lz"); + +const u32 gItemIcon_Gyaradosite[] = INCBIN_U32("graphics/items/icons/gyaradosite.4bpp.lz"); +const u32 gItemIconPalette_Gyaradosite[] = INCBIN_U32("graphics/items/icon_palettes/gyaradosite.gbapal.lz"); + +const u32 gItemIcon_Absolite[] = INCBIN_U32("graphics/items/icons/absolite.4bpp.lz"); +const u32 gItemIconPalette_Absolite[] = INCBIN_U32("graphics/items/icon_palettes/absolite.gbapal.lz"); + +const u32 gItemIcon_CharizarditeY[] = INCBIN_U32("graphics/items/icons/charizardite_y.4bpp.lz"); +const u32 gItemIconPalette_CharizarditeY[] = INCBIN_U32("graphics/items/icon_palettes/charizardite_y.gbapal.lz"); + +const u32 gItemIcon_Alakazite[] = INCBIN_U32("graphics/items/icons/alakazite.4bpp.lz"); +const u32 gItemIconPalette_Alakazite[] = INCBIN_U32("graphics/items/icon_palettes/alakazite.gbapal.lz"); + +const u32 gItemIcon_Heracronite[] = INCBIN_U32("graphics/items/icons/heracronite.4bpp.lz"); +const u32 gItemIconPalette_Heracronite[] = INCBIN_U32("graphics/items/icon_palettes/heracronite.gbapal.lz"); + +const u32 gItemIcon_Mawilite[] = INCBIN_U32("graphics/items/icons/mawilite.4bpp.lz"); +const u32 gItemIconPalette_Mawilite[] = INCBIN_U32("graphics/items/icon_palettes/mawilite.gbapal.lz"); + +const u32 gItemIcon_Manectite[] = INCBIN_U32("graphics/items/icons/manectite.4bpp.lz"); +const u32 gItemIconPalette_Manectite[] = INCBIN_U32("graphics/items/icon_palettes/manectite.gbapal.lz"); + +const u32 gItemIcon_Garchompite[] = INCBIN_U32("graphics/items/icons/garchompite.4bpp.lz"); +const u32 gItemIconPalette_Garchompite[] = INCBIN_U32("graphics/items/icon_palettes/garchompite.gbapal.lz"); + +const u32 gItemIcon_Latiasite[] = INCBIN_U32("graphics/items/icons/latiasite.4bpp.lz"); +const u32 gItemIconPalette_Latiasite[] = INCBIN_U32("graphics/items/icon_palettes/latiasite.gbapal.lz"); + +const u32 gItemIcon_Latiosite[] = INCBIN_U32("graphics/items/icons/latiosite.4bpp.lz"); +const u32 gItemIconPalette_Latiosite[] = INCBIN_U32("graphics/items/icon_palettes/latiosite.gbapal.lz"); + +const u32 gItemIcon_Swampertite[] = INCBIN_U32("graphics/items/icons/swampertite.4bpp.lz"); +const u32 gItemIconPalette_Swampertite[] = INCBIN_U32("graphics/items/icon_palettes/swampertite.gbapal.lz"); + +const u32 gItemIcon_Sceptilite[] = INCBIN_U32("graphics/items/icons/sceptilite.4bpp.lz"); +const u32 gItemIconPalette_Sceptilite[] = INCBIN_U32("graphics/items/icon_palettes/sceptilite.gbapal.lz"); + +const u32 gItemIcon_Sablenite[] = INCBIN_U32("graphics/items/icons/sablenite.4bpp.lz"); +const u32 gItemIconPalette_Sablenite[] = INCBIN_U32("graphics/items/icon_palettes/sablenite.gbapal.lz"); + +const u32 gItemIcon_Altarianite[] = INCBIN_U32("graphics/items/icons/altarianite.4bpp.lz"); +const u32 gItemIconPalette_Altarianite[] = INCBIN_U32("graphics/items/icon_palettes/altarianite.gbapal.lz"); + +const u32 gItemIcon_Galladite[] = INCBIN_U32("graphics/items/icons/galladite.4bpp.lz"); +const u32 gItemIconPalette_Galladite[] = INCBIN_U32("graphics/items/icon_palettes/galladite.gbapal.lz"); + +const u32 gItemIcon_Audinite[] = INCBIN_U32("graphics/items/icons/audinite.4bpp.lz"); +const u32 gItemIconPalette_Audinite[] = INCBIN_U32("graphics/items/icon_palettes/audinite.gbapal.lz"); + +const u32 gItemIcon_Metagrossite[] = INCBIN_U32("graphics/items/icons/metagrossite.4bpp.lz"); +const u32 gItemIconPalette_Metagrossite[] = INCBIN_U32("graphics/items/icon_palettes/metagrossite.gbapal.lz"); + +const u32 gItemIcon_Sharpedonite[] = INCBIN_U32("graphics/items/icons/sharpedonite.4bpp.lz"); +const u32 gItemIconPalette_Sharpedonite[] = INCBIN_U32("graphics/items/icon_palettes/sharpedonite.gbapal.lz"); + +const u32 gItemIcon_Slowbronite[] = INCBIN_U32("graphics/items/icons/slowbronite.4bpp.lz"); +const u32 gItemIconPalette_Slowbronite[] = INCBIN_U32("graphics/items/icon_palettes/slowbronite.gbapal.lz"); + +const u32 gItemIcon_Steelixite[] = INCBIN_U32("graphics/items/icons/steelixite.4bpp.lz"); +const u32 gItemIconPalette_Steelixite[] = INCBIN_U32("graphics/items/icon_palettes/steelixite.gbapal.lz"); + +const u32 gItemIcon_Pidgeotite[] = INCBIN_U32("graphics/items/icons/pidgeotite.4bpp.lz"); +const u32 gItemIconPalette_Pidgeotite[] = INCBIN_U32("graphics/items/icon_palettes/pidgeotite.gbapal.lz"); + +const u32 gItemIcon_Glalitite[] = INCBIN_U32("graphics/items/icons/glalitite.4bpp.lz"); +const u32 gItemIconPalette_Glalitite[] = INCBIN_U32("graphics/items/icon_palettes/glalitite.gbapal.lz"); + +const u32 gItemIcon_Diancite[] = INCBIN_U32("graphics/items/icons/diancite.4bpp.lz"); +const u32 gItemIconPalette_Diancite[] = INCBIN_U32("graphics/items/icon_palettes/diancite.gbapal.lz"); + +const u32 gItemIcon_Cameruptite[] = INCBIN_U32("graphics/items/icons/cameruptite.4bpp.lz"); +const u32 gItemIconPalette_Cameruptite[] = INCBIN_U32("graphics/items/icon_palettes/cameruptite.gbapal.lz"); + +const u32 gItemIcon_Lopunnite[] = INCBIN_U32("graphics/items/icons/lopunnite.4bpp.lz"); +const u32 gItemIconPalette_Lopunnite[] = INCBIN_U32("graphics/items/icon_palettes/lopunnite.gbapal.lz"); + +const u32 gItemIcon_Salamencite[] = INCBIN_U32("graphics/items/icons/salamencite.4bpp.lz"); +const u32 gItemIconPalette_Salamencite[] = INCBIN_U32("graphics/items/icon_palettes/salamencite.gbapal.lz"); + +const u32 gItemIcon_Beedrillite[] = INCBIN_U32("graphics/items/icons/beedrillite.4bpp.lz"); +const u32 gItemIconPalette_Beedrillite[] = INCBIN_U32("graphics/items/icon_palettes/beedrillite.gbapal.lz"); + +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"); +const u32 gItemIconPalette_ProtectivePads[] = INCBIN_U32("graphics/items/icon_palettes/protective_pads.gbapal.lz"); + +const u32 gItemIcon_TerrainExtender[] = INCBIN_U32("graphics/items/icons/terrain_extender.4bpp.lz"); +const u32 gItemIconPalette_TerrainExtender[] = INCBIN_U32("graphics/items/icon_palettes/terrain_extender.gbapal.lz"); + +const u32 gItemIcon_ElectricSeed[] = INCBIN_U32("graphics/items/icons/electric_seed.4bpp.lz"); +const u32 gItemIconPalette_ElectricSeed[] = INCBIN_U32("graphics/items/icon_palettes/electric_seed.gbapal.lz"); + +const u32 gItemIcon_GrassySeed[] = INCBIN_U32("graphics/items/icons/grassy_seed.4bpp.lz"); +const u32 gItemIconPalette_GrassySeed[] = INCBIN_U32("graphics/items/icon_palettes/grassy_seed.gbapal.lz"); + +const u32 gItemIcon_MistySeed[] = INCBIN_U32("graphics/items/icons/misty_seed.4bpp.lz"); +const u32 gItemIconPalette_MistySeed[] = INCBIN_U32("graphics/items/icon_palettes/misty_seed.gbapal.lz"); + +const u32 gItemIcon_PsychicSeed[] = INCBIN_U32("graphics/items/icons/psychic_seed.4bpp.lz"); +const u32 gItemIconPalette_PsychicSeed[] = INCBIN_U32("graphics/items/icon_palettes/psychic_seed.gbapal.lz"); + +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"); + +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_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_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_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 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"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index c36969ab5..b54f28405 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -14,6 +14,21 @@ const u32 *const gItemIconTable[][2] = [ITEM_TIMER_BALL] = {gItemIcon_TimerBall, gItemIconPalette_RepeatBall}, [ITEM_LUXURY_BALL] = {gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall}, [ITEM_PREMIER_BALL] = {gItemIcon_PremierBall, gItemIconPalette_LuxuryBall}, + [ITEM_LEVEL_BALL] = {gItemIcon_LevelBall, gItemIconPalette_LevelBall}, + [ITEM_LURE_BALL] = {gItemIcon_LureBall, gItemIconPalette_LureBall}, + [ITEM_MOON_BALL] = {gItemIcon_MoonBall, gItemIconPalette_MoonBall}, + [ITEM_FRIEND_BALL] = {gItemIcon_FriendBall, gItemIconPalette_FriendBall}, + [ITEM_LOVE_BALL] = {gItemIcon_LoveBall, gItemIconPalette_LoveBall}, + [ITEM_HEAVY_BALL] = {gItemIcon_HeavyBall, gItemIconPalette_HeavyBall}, + [ITEM_FAST_BALL] = {gItemIcon_FastBall, gItemIconPalette_FastBall}, + [ITEM_SPORT_BALL] = {gItemIcon_SportBall, gItemIconPalette_SportBall}, + [ITEM_DUSK_BALL] = {gItemIcon_DuskBall, gItemIconPalette_DuskBall}, + [ITEM_QUICK_BALL] = {gItemIcon_QuickBall, gItemIconPalette_QuickBall}, + [ITEM_HEAL_BALL] = {gItemIcon_HealBall, gItemIconPalette_HealBall}, + [ITEM_CHERISH_BALL] = {gItemIcon_CherishBall, gItemIconPalette_CherishBall}, + [ITEM_PARK_BALL] = {gItemIcon_ParkBall, gItemIconPalette_ParkBall}, + [ITEM_DREAM_BALL] = {gItemIcon_DreamBall, gItemIconPalette_DreamBall}, + [ITEM_BEAST_BALL] = {gItemIcon_BeastBall, gItemIconPalette_BeastBall}, // Medicine [ITEM_POTION] = {gItemIcon_Potion, gItemIconPalette_Potion}, [ITEM_ANTIDOTE] = {gItemIcon_Antidote, gItemIconPalette_Antidote}, @@ -55,18 +70,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 +80,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 +102,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 +168,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 +216,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}, @@ -288,7 +231,6 @@ const u32 *const gItemIconTable[][2] = [ITEM_SUPER_ROD] = {gItemIcon_SuperRod, gItemIconPalette_SuperRod}, [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket}, [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass}, - [ITEM_10B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, [ITEM_DEVON_GOODS] = {gItemIcon_DevonGoods, gItemIconPalette_DevonGoods}, [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, @@ -369,9 +311,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 +343,250 @@ 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}, + [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}, + [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}, + [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}, + [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}, + [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}, + [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}, + [ITEM_BIG_MALASADA] = {gItemIcon_BigMalasada, gItemIconPalette_BigMalasada}, + [ITEM_ICE_STONE] = {gItemIcon_IceStone, gItemIconPalette_IceStone}, + [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_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}, }; diff --git a/src/data/items.h b/src/data/items.h index 30beb5352..72af7f17c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -16,12 +16,13 @@ const struct Item gItems[] = [ITEM_MASTER_BALL] = { - .name = _("MASTER BALL"), + .name = _("Master Ball"), .itemId = ITEM_MASTER_BALL, .price = 0, .description = sMasterBallDesc, .pocket = POCKET_POKE_BALLS, .type = 0, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 0, @@ -29,12 +30,13 @@ const struct Item gItems[] = [ITEM_ULTRA_BALL] = { - .name = _("ULTRA BALL"), + .name = _("Ultra Ball"), .itemId = ITEM_ULTRA_BALL, .price = 1200, .description = sUltraBallDesc, .pocket = POCKET_POKE_BALLS, .type = 1, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 1, @@ -42,12 +44,13 @@ const struct Item gItems[] = [ITEM_GREAT_BALL] = { - .name = _("GREAT BALL"), + .name = _("Great Ball"), .itemId = ITEM_GREAT_BALL, .price = 600, .description = sGreatBallDesc, .pocket = POCKET_POKE_BALLS, .type = 2, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 2, @@ -55,12 +58,13 @@ const struct Item gItems[] = [ITEM_POKE_BALL] = { - .name = _("POKé BALL"), + .name = _("Poké Ball"), .itemId = ITEM_POKE_BALL, .price = 200, .description = sPokeBallDesc, .pocket = POCKET_POKE_BALLS, .type = 3, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 3, @@ -68,12 +72,13 @@ const struct Item gItems[] = [ITEM_SAFARI_BALL] = { - .name = _("SAFARI BALL"), + .name = _("Safari Ball"), .itemId = ITEM_SAFARI_BALL, .price = 0, .description = sSafariBallDesc, .pocket = POCKET_POKE_BALLS, .type = 4, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 4, @@ -81,12 +86,13 @@ const struct Item gItems[] = [ITEM_NET_BALL] = { - .name = _("NET BALL"), + .name = _("Net Ball"), .itemId = ITEM_NET_BALL, .price = 1000, .description = sNetBallDesc, .pocket = POCKET_POKE_BALLS, .type = 5, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 5, @@ -94,12 +100,13 @@ const struct Item gItems[] = [ITEM_DIVE_BALL] = { - .name = _("DIVE BALL"), + .name = _("Dive Ball"), .itemId = ITEM_DIVE_BALL, .price = 1000, .description = sDiveBallDesc, .pocket = POCKET_POKE_BALLS, .type = 6, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 6, @@ -107,12 +114,13 @@ const struct Item gItems[] = [ITEM_NEST_BALL] = { - .name = _("NEST BALL"), + .name = _("Nest Ball"), .itemId = ITEM_NEST_BALL, .price = 1000, .description = sNestBallDesc, .pocket = POCKET_POKE_BALLS, .type = 7, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 7, @@ -120,12 +128,13 @@ const struct Item gItems[] = [ITEM_REPEAT_BALL] = { - .name = _("REPEAT BALL"), + .name = _("Repeat Ball"), .itemId = ITEM_REPEAT_BALL, .price = 1000, .description = sRepeatBallDesc, .pocket = POCKET_POKE_BALLS, .type = 8, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 8, @@ -133,12 +142,13 @@ const struct Item gItems[] = [ITEM_TIMER_BALL] = { - .name = _("TIMER BALL"), + .name = _("Timer Ball"), .itemId = ITEM_TIMER_BALL, .price = 1000, .description = sTimerBallDesc, .pocket = POCKET_POKE_BALLS, .type = 9, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 9, @@ -146,12 +156,13 @@ const struct Item gItems[] = [ITEM_LUXURY_BALL] = { - .name = _("LUXURY BALL"), + .name = _("Luxury Ball"), .itemId = ITEM_LUXURY_BALL, .price = 1000, .description = sLuxuryBallDesc, .pocket = POCKET_POKE_BALLS, .type = 10, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 10, @@ -159,22 +170,233 @@ const struct Item gItems[] = [ITEM_PREMIER_BALL] = { - .name = _("PREMIER BALL"), + .name = _("Premier Ball"), .itemId = ITEM_PREMIER_BALL, .price = 200, .description = sPremierBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, + .fieldUseFunc = NULL, .battleUsage = 2, .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 11, }, + [ITEM_LEVEL_BALL] = + { + .name = _("Level Ball"), + .itemId = ITEM_LEVEL_BALL, + .price = 2000, + .description = sLevelBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 12, + }, + + [ITEM_LURE_BALL] = + { + .name = _("Lure Ball"), + .itemId = ITEM_LURE_BALL, + .price = 2000, + .description = sLureBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 13, + }, + + [ITEM_MOON_BALL] = + { + .name = _("Moon Ball"), + .itemId = ITEM_MOON_BALL, + .price = 2000, + .description = sMoonBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 14, + }, + + [ITEM_FRIEND_BALL] = + { + .name = _("Friend Ball"), + .itemId = ITEM_FRIEND_BALL, + .price = 2000, + .description = sFriendBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 15, + }, + + [ITEM_LOVE_BALL] = + { + .name = _("Love Ball"), + .itemId = ITEM_LOVE_BALL, + .price = 2000, + .description = sLoveBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 16, + }, + + [ITEM_HEAVY_BALL] = + { + .name = _("Heavy Ball"), + .itemId = ITEM_HEAVY_BALL, + .price = 2000, + .description = sHeavyBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 17, + }, + + [ITEM_FAST_BALL] = + { + .name = _("Fast Ball"), + .itemId = ITEM_FAST_BALL, + .price = 2000, + .description = sFastBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 18, + }, + + [ITEM_HEAL_BALL] = + { + .name = _("Heal Ball"), + .itemId = ITEM_HEAL_BALL, + .price = 300, + .description = sHealBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 19, + }, + + [ITEM_QUICK_BALL] = + { + .name = _("Quick Ball"), + .itemId = ITEM_QUICK_BALL, + .price = 3000, + .description = sQuickBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 20, + }, + + [ITEM_DUSK_BALL] = + { + .name = _("Dusk Ball"), + .itemId = ITEM_DUSK_BALL, + .price = 3000, + .description = sDuskBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 21, + }, + + [ITEM_CHERISH_BALL] = + { + .name = _("Cherish Ball"), + .itemId = ITEM_CHERISH_BALL, + .price = 10, + .description = sCherishBallDesc, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .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 = sDreamBallDesc, + .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] = { - .name = _("POTION"), + .name = _("Potion"), .itemId = ITEM_POTION, .price = 300, .holdEffectParam = 20, @@ -189,7 +411,7 @@ const struct Item gItems[] = [ITEM_ANTIDOTE] = { - .name = _("ANTIDOTE"), + .name = _("Antidote"), .itemId = ITEM_ANTIDOTE, .price = 100, .description = sAntidoteDesc, @@ -203,7 +425,7 @@ const struct Item gItems[] = [ITEM_BURN_HEAL] = { - .name = _("BURN HEAL"), + .name = _("Burn Heal"), .itemId = ITEM_BURN_HEAL, .price = 250, .description = sBurnHealDesc, @@ -217,7 +439,7 @@ const struct Item gItems[] = [ITEM_ICE_HEAL] = { - .name = _("ICE HEAL"), + .name = _("Ice Heal"), .itemId = ITEM_ICE_HEAL, .price = 250, .description = sIceHealDesc, @@ -231,7 +453,7 @@ const struct Item gItems[] = [ITEM_AWAKENING] = { - .name = _("AWAKENING"), + .name = _("Awakening"), .itemId = ITEM_AWAKENING, .price = 250, .description = sAwakeningDesc, @@ -245,7 +467,7 @@ const struct Item gItems[] = [ITEM_PARALYZE_HEAL] = { - .name = _("PARLYZ HEAL"), + .name = _("Parlyz Heal"), .itemId = ITEM_PARALYZE_HEAL, .price = 200, .description = sParalyzeHealDesc, @@ -259,7 +481,7 @@ const struct Item gItems[] = [ITEM_FULL_RESTORE] = { - .name = _("FULL RESTORE"), + .name = _("Full Restore"), .itemId = ITEM_FULL_RESTORE, .price = 3000, .holdEffectParam = 255, @@ -274,7 +496,7 @@ const struct Item gItems[] = [ITEM_MAX_POTION] = { - .name = _("MAX POTION"), + .name = _("Max Potion"), .itemId = ITEM_MAX_POTION, .price = 2500, .holdEffectParam = 255, @@ -289,7 +511,7 @@ const struct Item gItems[] = [ITEM_HYPER_POTION] = { - .name = _("HYPER POTION"), + .name = _("Hyper Potion"), .itemId = ITEM_HYPER_POTION, .price = 1200, .holdEffectParam = 200, @@ -304,7 +526,7 @@ const struct Item gItems[] = [ITEM_SUPER_POTION] = { - .name = _("SUPER POTION"), + .name = _("Super Potion"), .itemId = ITEM_SUPER_POTION, .price = 700, .holdEffectParam = 50, @@ -319,7 +541,7 @@ const struct Item gItems[] = [ITEM_FULL_HEAL] = { - .name = _("FULL HEAL"), + .name = _("Full Heal"), .itemId = ITEM_FULL_HEAL, .price = 600, .description = sFullHealDesc, @@ -333,7 +555,7 @@ const struct Item gItems[] = [ITEM_REVIVE] = { - .name = _("REVIVE"), + .name = _("Revive"), .itemId = ITEM_REVIVE, .price = 1500, .description = sReviveDesc, @@ -347,7 +569,7 @@ const struct Item gItems[] = [ITEM_MAX_REVIVE] = { - .name = _("MAX REVIVE"), + .name = _("Max Revive"), .itemId = ITEM_MAX_REVIVE, .price = 4000, .description = sMaxReviveDesc, @@ -361,7 +583,7 @@ const struct Item gItems[] = [ITEM_FRESH_WATER] = { - .name = _("FRESH WATER"), + .name = _("Fresh Water"), .itemId = ITEM_FRESH_WATER, .price = 200, .holdEffectParam = 50, @@ -376,7 +598,7 @@ const struct Item gItems[] = [ITEM_SODA_POP] = { - .name = _("SODA POP"), + .name = _("Soda Pop"), .itemId = ITEM_SODA_POP, .price = 300, .holdEffectParam = 60, @@ -391,7 +613,7 @@ const struct Item gItems[] = [ITEM_LEMONADE] = { - .name = _("LEMONADE"), + .name = _("Lemonade"), .itemId = ITEM_LEMONADE, .price = 350, .holdEffectParam = 80, @@ -406,7 +628,7 @@ const struct Item gItems[] = [ITEM_MOOMOO_MILK] = { - .name = _("MOOMOO MILK"), + .name = _("Moomoo Milk"), .itemId = ITEM_MOOMOO_MILK, .price = 500, .holdEffectParam = 100, @@ -421,7 +643,7 @@ const struct Item gItems[] = [ITEM_ENERGY_POWDER] = { - .name = _("ENERGYPOWDER"), + .name = _("Energypowder"), .itemId = ITEM_ENERGY_POWDER, .price = 500, .description = sEnergyPowderDesc, @@ -435,7 +657,7 @@ const struct Item gItems[] = [ITEM_ENERGY_ROOT] = { - .name = _("ENERGY ROOT"), + .name = _("Energy Root"), .itemId = ITEM_ENERGY_ROOT, .price = 800, .description = sEnergyRootDesc, @@ -449,7 +671,7 @@ const struct Item gItems[] = [ITEM_HEAL_POWDER] = { - .name = _("HEAL POWDER"), + .name = _("Heal Powder"), .itemId = ITEM_HEAL_POWDER, .price = 450, .description = sHealPowderDesc, @@ -463,7 +685,7 @@ const struct Item gItems[] = [ITEM_REVIVAL_HERB] = { - .name = _("REVIVAL HERB"), + .name = _("Revival Herb"), .itemId = ITEM_REVIVAL_HERB, .price = 2800, .description = sRevivalHerbDesc, @@ -477,7 +699,7 @@ const struct Item gItems[] = [ITEM_ETHER] = { - .name = _("ETHER"), + .name = _("Ether"), .itemId = ITEM_ETHER, .price = 1200, .holdEffectParam = 10, @@ -492,7 +714,7 @@ const struct Item gItems[] = [ITEM_MAX_ETHER] = { - .name = _("MAX ETHER"), + .name = _("Max Ether"), .itemId = ITEM_MAX_ETHER, .price = 2000, .holdEffectParam = 255, @@ -507,7 +729,7 @@ const struct Item gItems[] = [ITEM_ELIXIR] = { - .name = _("ELIXIR"), + .name = _("Elixir"), .itemId = ITEM_ELIXIR, .price = 3000, .holdEffectParam = 10, @@ -522,7 +744,7 @@ const struct Item gItems[] = [ITEM_MAX_ELIXIR] = { - .name = _("MAX ELIXIR"), + .name = _("Max Elixir"), .itemId = ITEM_MAX_ELIXIR, .price = 4500, .holdEffectParam = 255, @@ -537,7 +759,7 @@ const struct Item gItems[] = [ITEM_LAVA_COOKIE] = { - .name = _("LAVA COOKIE"), + .name = _("Lava Cookie"), .itemId = ITEM_LAVA_COOKIE, .price = 200, .description = sLavaCookieDesc, @@ -551,7 +773,7 @@ const struct Item gItems[] = [ITEM_BLUE_FLUTE] = { - .name = _("BLUE FLUTE"), + .name = _("Blue Flute"), .itemId = ITEM_BLUE_FLUTE, .price = 100, .description = sBlueFluteDesc, @@ -565,7 +787,7 @@ const struct Item gItems[] = [ITEM_YELLOW_FLUTE] = { - .name = _("YELLOW FLUTE"), + .name = _("Yellow Flute"), .itemId = ITEM_YELLOW_FLUTE, .price = 200, .description = sYellowFluteDesc, @@ -579,7 +801,7 @@ const struct Item gItems[] = [ITEM_RED_FLUTE] = { - .name = _("RED FLUTE"), + .name = _("Red Flute"), .itemId = ITEM_RED_FLUTE, .price = 300, .description = sRedFluteDesc, @@ -593,7 +815,7 @@ const struct Item gItems[] = [ITEM_BLACK_FLUTE] = { - .name = _("BLACK FLUTE"), + .name = _("Black Flute"), .itemId = ITEM_BLACK_FLUTE, .price = 400, .holdEffectParam = 50, @@ -606,7 +828,7 @@ const struct Item gItems[] = [ITEM_WHITE_FLUTE] = { - .name = _("WHITE FLUTE"), + .name = _("White Flute"), .itemId = ITEM_WHITE_FLUTE, .price = 500, .holdEffectParam = 150, @@ -619,7 +841,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, @@ -633,9 +855,52 @@ 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_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"), + .name = _("Sacred Ash"), .itemId = ITEM_SACRED_ASH, .price = 200, .description = sSacredAshDesc, @@ -649,7 +914,7 @@ const struct Item gItems[] = [ITEM_SHOAL_SALT] = { - .name = _("SHOAL SALT"), + .name = _("Shoal Salt"), .itemId = ITEM_SHOAL_SALT, .price = 20, .description = sShoalSaltDesc, @@ -661,7 +926,7 @@ const struct Item gItems[] = [ITEM_SHOAL_SHELL] = { - .name = _("SHOAL SHELL"), + .name = _("Shoal Shell"), .itemId = ITEM_SHOAL_SHELL, .price = 20, .description = sShoalShellDesc, @@ -673,7 +938,7 @@ const struct Item gItems[] = [ITEM_RED_SHARD] = { - .name = _("RED SHARD"), + .name = _("Red Shard"), .itemId = ITEM_RED_SHARD, .price = 200, .description = sRedShardDesc, @@ -685,7 +950,7 @@ const struct Item gItems[] = [ITEM_BLUE_SHARD] = { - .name = _("BLUE SHARD"), + .name = _("Blue Shard"), .itemId = ITEM_BLUE_SHARD, .price = 200, .description = sBlueShardDesc, @@ -697,7 +962,7 @@ const struct Item gItems[] = [ITEM_YELLOW_SHARD] = { - .name = _("YELLOW SHARD"), + .name = _("Yellow Shard"), .itemId = ITEM_YELLOW_SHARD, .price = 200, .description = sYellowShardDesc, @@ -709,7 +974,7 @@ const struct Item gItems[] = [ITEM_GREEN_SHARD] = { - .name = _("GREEN SHARD"), + .name = _("Green Shard"), .itemId = ITEM_GREEN_SHARD, .price = 200, .description = sGreenShardDesc, @@ -719,143 +984,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_034] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_035] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_036] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_037] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_038] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_039] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_03A] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_03B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_03C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_03D] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_03E] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - // Vitamins [ITEM_HP_UP] = { - .name = _("HP UP"), + .name = _("HP Up"), .itemId = ITEM_HP_UP, .price = 9800, .description = sHPUpDesc, @@ -867,7 +1000,7 @@ const struct Item gItems[] = [ITEM_PROTEIN] = { - .name = _("PROTEIN"), + .name = _("Protein"), .itemId = ITEM_PROTEIN, .price = 9800, .description = sProteinDesc, @@ -879,7 +1012,7 @@ const struct Item gItems[] = [ITEM_IRON] = { - .name = _("IRON"), + .name = _("Iron"), .itemId = ITEM_IRON, .price = 9800, .description = sIronDesc, @@ -891,7 +1024,7 @@ const struct Item gItems[] = [ITEM_CARBOS] = { - .name = _("CARBOS"), + .name = _("Carbos"), .itemId = ITEM_CARBOS, .price = 9800, .description = sCarbosDesc, @@ -903,7 +1036,7 @@ const struct Item gItems[] = [ITEM_CALCIUM] = { - .name = _("CALCIUM"), + .name = _("Calcium"), .itemId = ITEM_CALCIUM, .price = 9800, .description = sCalciumDesc, @@ -915,7 +1048,7 @@ const struct Item gItems[] = [ITEM_RARE_CANDY] = { - .name = _("RARE CANDY"), + .name = _("Rare Candy"), .itemId = ITEM_RARE_CANDY, .price = 4800, .description = sRareCandyDesc, @@ -927,7 +1060,7 @@ const struct Item gItems[] = [ITEM_PP_UP] = { - .name = _("PP UP"), + .name = _("PP Up"), .itemId = ITEM_PP_UP, .price = 9800, .description = sPPUpDesc, @@ -939,7 +1072,7 @@ const struct Item gItems[] = [ITEM_ZINC] = { - .name = _("ZINC"), + .name = _("Zinc"), .itemId = ITEM_ZINC, .price = 9800, .description = sZincDesc, @@ -951,7 +1084,7 @@ const struct Item gItems[] = [ITEM_PP_MAX] = { - .name = _("PP MAX"), + .name = _("PP Max"), .itemId = ITEM_PP_MAX, .price = 9800, .description = sPPMaxDesc, @@ -961,23 +1094,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_048] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - // Battle items [ITEM_GUARD_SPEC] = { - .name = _("GUARD SPEC."), + .name = _("Guard Spec."), .itemId = ITEM_GUARD_SPEC, .price = 700, .description = sGuardSpecDesc, @@ -991,7 +1112,7 @@ const struct Item gItems[] = [ITEM_DIRE_HIT] = { - .name = _("DIRE HIT"), + .name = _("Dire Hit"), .itemId = ITEM_DIRE_HIT, .price = 650, .description = sDireHitDesc, @@ -1005,9 +1126,9 @@ const struct Item gItems[] = [ITEM_X_ATTACK] = { - .name = _("X ATTACK"), + .name = _("X Attack"), .itemId = ITEM_X_ATTACK, - .price = 500, + .price = 1000, .description = sXAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1017,11 +1138,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_X_DEFEND] = + [ITEM_X_DEFENSE] = { - .name = _("X DEFEND"), - .itemId = ITEM_X_DEFEND, - .price = 550, + .name = _("X Defend"), + .itemId = ITEM_X_DEFENSE, + .price = 2000, .description = sXDefendDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1033,9 +1154,9 @@ const struct Item gItems[] = [ITEM_X_SPEED] = { - .name = _("X SPEED"), + .name = _("X Speed"), .itemId = ITEM_X_SPEED, - .price = 350, + .price = 1000, .description = sXSpeedDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1047,9 +1168,9 @@ const struct Item gItems[] = [ITEM_X_ACCURACY] = { - .name = _("X ACCURACY"), + .name = _("X Accuracy"), .itemId = ITEM_X_ACCURACY, - .price = 950, + .price = 1000, .description = sXAccuracyDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1059,12 +1180,26 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_X_SPECIAL] = + [ITEM_X_SP_ATK] = { - .name = _("X SPECIAL"), - .itemId = ITEM_X_SPECIAL, - .price = 350, - .description = sXSpecialDesc, + .name = _("X Sp. Atk."), + .itemId = ITEM_X_SP_ATK, + .price = 1000, + .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, @@ -1075,7 +1210,7 @@ const struct Item gItems[] = [ITEM_POKE_DOLL] = { - .name = _("POKé DOLL"), + .name = _("Poké Doll"), .itemId = ITEM_POKE_DOLL, .price = 1000, .description = sPokeDollDesc, @@ -1089,7 +1224,7 @@ const struct Item gItems[] = [ITEM_FLUFFY_TAIL] = { - .name = _("FLUFFY TAIL"), + .name = _("Fluffy Tail"), .itemId = ITEM_FLUFFY_TAIL, .price = 1000, .description = sFluffyTailDesc, @@ -1101,23 +1236,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_052] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - // Field items [ITEM_SUPER_REPEL] = { - .name = _("SUPER REPEL"), + .name = _("Super Repel"), .itemId = ITEM_SUPER_REPEL, .price = 500, .holdEffectParam = 200, @@ -1130,7 +1253,7 @@ const struct Item gItems[] = [ITEM_MAX_REPEL] = { - .name = _("MAX REPEL"), + .name = _("Max Repel"), .itemId = ITEM_MAX_REPEL, .price = 700, .holdEffectParam = 250, @@ -1141,9 +1264,22 @@ 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 = 1, + .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, + .secondaryId = 0, + }, + [ITEM_ESCAPE_ROPE] = { - .name = _("ESCAPE ROPE"), + .name = _("Escape Rope"), .itemId = ITEM_ESCAPE_ROPE, .price = 550, .description = sEscapeRopeDesc, @@ -1155,7 +1291,7 @@ const struct Item gItems[] = [ITEM_REPEL] = { - .name = _("REPEL"), + .name = _("Repel"), .itemId = ITEM_REPEL, .price = 350, .holdEffectParam = 100, @@ -1166,83 +1302,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_057] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_058] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_059] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_05A] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_05B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_05C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - // Evolution stones [ITEM_SUN_STONE] = { - .name = _("SUN STONE"), + .name = _("Sun Stone"), .itemId = ITEM_SUN_STONE, .price = 2100, .description = sSunStoneDesc, @@ -1254,7 +1318,7 @@ const struct Item gItems[] = [ITEM_MOON_STONE] = { - .name = _("MOON STONE"), + .name = _("Moon Stone"), .itemId = ITEM_MOON_STONE, .price = 0, .description = sMoonStoneDesc, @@ -1266,7 +1330,7 @@ const struct Item gItems[] = [ITEM_FIRE_STONE] = { - .name = _("FIRE STONE"), + .name = _("Fire Stone"), .itemId = ITEM_FIRE_STONE, .price = 2100, .description = sFireStoneDesc, @@ -1278,7 +1342,7 @@ const struct Item gItems[] = [ITEM_THUNDER_STONE] = { - .name = _("THUNDERSTONE"), + .name = _("ThunderStone"), .itemId = ITEM_THUNDER_STONE, .price = 2100, .description = sThunderStoneDesc, @@ -1290,7 +1354,7 @@ const struct Item gItems[] = [ITEM_WATER_STONE] = { - .name = _("WATER STONE"), + .name = _("Water Stone"), .itemId = ITEM_WATER_STONE, .price = 2100, .description = sWaterStoneDesc, @@ -1302,7 +1366,7 @@ const struct Item gItems[] = [ITEM_LEAF_STONE] = { - .name = _("LEAF STONE"), + .name = _("Leaf Stone"), .itemId = ITEM_LEAF_STONE, .price = 2100, .description = sLeafStoneDesc, @@ -1312,59 +1376,143 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_063] = + [ITEM_DAWN_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Dawn Stone"), + .itemId = ITEM_DAWN_STONE, + .price = 2100, + .description = sDawnStoneDesc, .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .secondaryId = 0, }, - [ITEM_064] = + [ITEM_DUSK_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Dusk Stone"), + .itemId = ITEM_DUSK_STONE, + .price = 2100, + .description = sDuskStoneDesc, .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .secondaryId = 0, }, - [ITEM_065] = + [ITEM_SHINY_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Shiny Stone"), + .itemId = ITEM_SHINY_STONE, + .price = 2100, + .description = sShinyStoneDesc, .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .secondaryId = 0, }, - [ITEM_066] = + [ITEM_ICE_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Ice Stone"), + .itemId = ITEM_ICE_STONE, + .price = 2100, + .description = sIceStoneDesc, .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .secondaryId = 0, }, // 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"), + .name = _("TinyMushroom"), .itemId = ITEM_TINY_MUSHROOM, .price = 500, .description = sTinyMushroomDesc, @@ -1376,7 +1524,7 @@ const struct Item gItems[] = [ITEM_BIG_MUSHROOM] = { - .name = _("BIG MUSHROOM"), + .name = _("Big Mushroom"), .itemId = ITEM_BIG_MUSHROOM, .price = 5000, .description = sBigMushroomDesc, @@ -1386,21 +1534,9 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_069] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - [ITEM_PEARL] = { - .name = _("PEARL"), + .name = _("Pearl"), .itemId = ITEM_PEARL, .price = 1400, .description = sPearlDesc, @@ -1412,7 +1548,7 @@ const struct Item gItems[] = [ITEM_BIG_PEARL] = { - .name = _("BIG PEARL"), + .name = _("Big Pearl"), .itemId = ITEM_BIG_PEARL, .price = 7500, .description = sBigPearlDesc, @@ -1424,7 +1560,7 @@ const struct Item gItems[] = [ITEM_STARDUST] = { - .name = _("STARDUST"), + .name = _("Stardust"), .itemId = ITEM_STARDUST, .price = 2000, .description = sStardustDesc, @@ -1436,7 +1572,7 @@ const struct Item gItems[] = [ITEM_STAR_PIECE] = { - .name = _("STAR PIECE"), + .name = _("Star Piece"), .itemId = ITEM_STAR_PIECE, .price = 9800, .description = sStarPieceDesc, @@ -1448,7 +1584,7 @@ const struct Item gItems[] = [ITEM_NUGGET] = { - .name = _("NUGGET"), + .name = _("Nugget"), .itemId = ITEM_NUGGET, .price = 10000, .description = sNuggetDesc, @@ -1460,7 +1596,7 @@ const struct Item gItems[] = [ITEM_HEART_SCALE] = { - .name = _("HEART SCALE"), + .name = _("Heart Scale"), .itemId = ITEM_HEART_SCALE, .price = 100, .description = sHeartScaleDesc, @@ -1470,108 +1606,64 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_070] = + [ITEM_RED_NECTAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Red Nectar"), + .itemId = ITEM_RED_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sRedNectarDesc, .pocket = POCKET_ITEMS, .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder .secondaryId = 0, }, - [ITEM_071] = + [ITEM_YELLOW_NECTAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Yellow Nectar"), + .itemId = ITEM_YELLOW_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sYellowNectarDesc, .pocket = POCKET_ITEMS, .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder .secondaryId = 0, }, - [ITEM_072] = + [ITEM_PINK_NECTAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Pink Nectar"), + .itemId = ITEM_PINK_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sPinkNectarDesc, .pocket = POCKET_ITEMS, .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder .secondaryId = 0, }, - [ITEM_073] = + [ITEM_PURPLE_NECTAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Purple Nectar"), + .itemId = ITEM_PURPLE_NECTAR, + .price = 300, + .holdEffectParam = 0, + .description = sPurpleNectarDesc, .pocket = POCKET_ITEMS, .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder .secondaryId = 0, }, - [ITEM_074] = + [ITEM_RARE_BONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_075] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_076] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_077] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_078] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Rare Bone"), + .itemId = ITEM_RARE_BONE, + .price = 5000, + .description = sRareBoneDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1581,7 +1673,7 @@ const struct Item gItems[] = // Mail [ITEM_ORANGE_MAIL] = { - .name = _("ORANGE MAIL"), + .name = _("Orange Mail"), .itemId = ITEM_ORANGE_MAIL, .price = 50, .description = sOrangeMailDesc, @@ -1593,7 +1685,7 @@ const struct Item gItems[] = [ITEM_HARBOR_MAIL] = { - .name = _("HARBOR MAIL"), + .name = _("Harbor Mail"), .itemId = ITEM_HARBOR_MAIL, .price = 50, .description = sHarborMailDesc, @@ -1605,7 +1697,7 @@ const struct Item gItems[] = [ITEM_GLITTER_MAIL] = { - .name = _("GLITTER MAIL"), + .name = _("Glitter Mail"), .itemId = ITEM_GLITTER_MAIL, .price = 50, .description = sGlitterMailDesc, @@ -1617,7 +1709,7 @@ const struct Item gItems[] = [ITEM_MECH_MAIL] = { - .name = _("MECH MAIL"), + .name = _("Mech Mail"), .itemId = ITEM_MECH_MAIL, .price = 50, .description = sMechMailDesc, @@ -1629,7 +1721,7 @@ const struct Item gItems[] = [ITEM_WOOD_MAIL] = { - .name = _("WOOD MAIL"), + .name = _("Wood Mail"), .itemId = ITEM_WOOD_MAIL, .price = 50, .description = sWoodMailDesc, @@ -1641,7 +1733,7 @@ const struct Item gItems[] = [ITEM_WAVE_MAIL] = { - .name = _("WAVE MAIL"), + .name = _("Wave Mail"), .itemId = ITEM_WAVE_MAIL, .price = 50, .description = sWaveMailDesc, @@ -1653,7 +1745,7 @@ const struct Item gItems[] = [ITEM_BEAD_MAIL] = { - .name = _("BEAD MAIL"), + .name = _("Bead Mail"), .itemId = ITEM_BEAD_MAIL, .price = 50, .description = sBeadMailDesc, @@ -1665,7 +1757,7 @@ const struct Item gItems[] = [ITEM_SHADOW_MAIL] = { - .name = _("SHADOW MAIL"), + .name = _("Shadow Mail"), .itemId = ITEM_SHADOW_MAIL, .price = 50, .description = sShadowMailDesc, @@ -1677,7 +1769,7 @@ const struct Item gItems[] = [ITEM_TROPIC_MAIL] = { - .name = _("TROPIC MAIL"), + .name = _("Tropic Mail"), .itemId = ITEM_TROPIC_MAIL, .price = 50, .description = sTropicMailDesc, @@ -1689,7 +1781,7 @@ const struct Item gItems[] = [ITEM_DREAM_MAIL] = { - .name = _("DREAM MAIL"), + .name = _("Dream Mail"), .itemId = ITEM_DREAM_MAIL, .price = 50, .description = sDreamMailDesc, @@ -1701,7 +1793,7 @@ const struct Item gItems[] = [ITEM_FAB_MAIL] = { - .name = _("FAB MAIL"), + .name = _("Fab Mail"), .itemId = ITEM_FAB_MAIL, .price = 50, .description = sFabMailDesc, @@ -1713,7 +1805,7 @@ const struct Item gItems[] = [ITEM_RETRO_MAIL] = { - .name = _("RETRO MAIL"), + .name = _("Retro Mail"), .itemId = ITEM_RETRO_MAIL, .price = 0, .description = sRetroMailDesc, @@ -1727,7 +1819,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, @@ -1742,7 +1834,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, @@ -1757,7 +1849,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, @@ -1772,7 +1864,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, @@ -1787,7 +1879,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, @@ -1802,7 +1894,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, @@ -1818,7 +1910,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, @@ -1834,7 +1926,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, @@ -1849,7 +1941,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, @@ -1864,7 +1956,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, @@ -1880,7 +1972,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, @@ -1894,7 +1986,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, @@ -1908,7 +2000,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, @@ -1922,7 +2014,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, @@ -1936,7 +2028,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, @@ -1950,7 +2042,7 @@ const struct Item gItems[] = [ITEM_RAZZ_BERRY] = { - .name = _("RAZZ BERRY"), + .name = _("Razz Berry"), .itemId = ITEM_RAZZ_BERRY, .price = 20, .description = sRazzBerryDesc, @@ -1962,7 +2054,7 @@ const struct Item gItems[] = [ITEM_BLUK_BERRY] = { - .name = _("BLUK BERRY"), + .name = _("Bluk Berry"), .itemId = ITEM_BLUK_BERRY, .price = 20, .description = sBlukBerryDesc, @@ -1974,7 +2066,7 @@ const struct Item gItems[] = [ITEM_NANAB_BERRY] = { - .name = _("NANAB BERRY"), + .name = _("Nanab Berry"), .itemId = ITEM_NANAB_BERRY, .price = 20, .description = sNanabBerryDesc, @@ -1986,7 +2078,7 @@ const struct Item gItems[] = [ITEM_WEPEAR_BERRY] = { - .name = _("WEPEAR BERRY"), + .name = _("Wepear Berry"), .itemId = ITEM_WEPEAR_BERRY, .price = 20, .description = sWepearBerryDesc, @@ -1998,7 +2090,7 @@ const struct Item gItems[] = [ITEM_PINAP_BERRY] = { - .name = _("PINAP BERRY"), + .name = _("Pinap Berry"), .itemId = ITEM_PINAP_BERRY, .price = 20, .description = sPinapBerryDesc, @@ -2010,7 +2102,7 @@ const struct Item gItems[] = [ITEM_POMEG_BERRY] = { - .name = _("POMEG BERRY"), + .name = _("Pomeg Berry"), .itemId = ITEM_POMEG_BERRY, .price = 20, .description = sPomegBerryDesc, @@ -2022,7 +2114,7 @@ const struct Item gItems[] = [ITEM_KELPSY_BERRY] = { - .name = _("KELPSY BERRY"), + .name = _("Kelpsy Berry"), .itemId = ITEM_KELPSY_BERRY, .price = 20, .description = sKelpsyBerryDesc, @@ -2034,7 +2126,7 @@ const struct Item gItems[] = [ITEM_QUALOT_BERRY] = { - .name = _("QUALOT BERRY"), + .name = _("Qualot Berry"), .itemId = ITEM_QUALOT_BERRY, .price = 20, .description = sQualotBerryDesc, @@ -2046,7 +2138,7 @@ const struct Item gItems[] = [ITEM_HONDEW_BERRY] = { - .name = _("HONDEW BERRY"), + .name = _("Hondew Berry"), .itemId = ITEM_HONDEW_BERRY, .price = 20, .description = sHondewBerryDesc, @@ -2058,7 +2150,7 @@ const struct Item gItems[] = [ITEM_GREPA_BERRY] = { - .name = _("GREPA BERRY"), + .name = _("Grepa Berry"), .itemId = ITEM_GREPA_BERRY, .price = 20, .description = sGrepaBerryDesc, @@ -2070,7 +2162,7 @@ const struct Item gItems[] = [ITEM_TAMATO_BERRY] = { - .name = _("TAMATO BERRY"), + .name = _("Tamato Berry"), .itemId = ITEM_TAMATO_BERRY, .price = 20, .description = sTamatoBerryDesc, @@ -2082,7 +2174,7 @@ const struct Item gItems[] = [ITEM_CORNN_BERRY] = { - .name = _("CORNN BERRY"), + .name = _("Cornn Berry"), .itemId = ITEM_CORNN_BERRY, .price = 20, .description = sCornnBerryDesc, @@ -2094,7 +2186,7 @@ const struct Item gItems[] = [ITEM_MAGOST_BERRY] = { - .name = _("MAGOST BERRY"), + .name = _("Magost Berry"), .itemId = ITEM_MAGOST_BERRY, .price = 20, .description = sMagostBerryDesc, @@ -2106,7 +2198,7 @@ const struct Item gItems[] = [ITEM_RABUTA_BERRY] = { - .name = _("RABUTA BERRY"), + .name = _("Rabuta Berry"), .itemId = ITEM_RABUTA_BERRY, .price = 20, .description = sRabutaBerryDesc, @@ -2118,7 +2210,7 @@ const struct Item gItems[] = [ITEM_NOMEL_BERRY] = { - .name = _("NOMEL BERRY"), + .name = _("Nomel Berry"), .itemId = ITEM_NOMEL_BERRY, .price = 20, .description = sNomelBerryDesc, @@ -2130,7 +2222,7 @@ const struct Item gItems[] = [ITEM_SPELON_BERRY] = { - .name = _("SPELON BERRY"), + .name = _("Spelon Berry"), .itemId = ITEM_SPELON_BERRY, .price = 20, .description = sSpelonBerryDesc, @@ -2142,7 +2234,7 @@ const struct Item gItems[] = [ITEM_PAMTRE_BERRY] = { - .name = _("PAMTRE BERRY"), + .name = _("Pamtre Berry"), .itemId = ITEM_PAMTRE_BERRY, .price = 20, .description = sPamtreBerryDesc, @@ -2154,7 +2246,7 @@ const struct Item gItems[] = [ITEM_WATMEL_BERRY] = { - .name = _("WATMEL BERRY"), + .name = _("Watmel Berry"), .itemId = ITEM_WATMEL_BERRY, .price = 20, .description = sWatmelBerryDesc, @@ -2166,7 +2258,7 @@ const struct Item gItems[] = [ITEM_DURIN_BERRY] = { - .name = _("DURIN BERRY"), + .name = _("Durin Berry"), .itemId = ITEM_DURIN_BERRY, .price = 20, .description = sDurinBerryDesc, @@ -2178,7 +2270,7 @@ const struct Item gItems[] = [ITEM_BELUE_BERRY] = { - .name = _("BELUE BERRY"), + .name = _("Belue Berry"), .itemId = ITEM_BELUE_BERRY, .price = 20, .description = sBelueBerryDesc, @@ -2190,7 +2282,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, @@ -2204,7 +2296,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, @@ -2218,7 +2310,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, @@ -2232,7 +2324,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, @@ -2246,7 +2338,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, @@ -2260,7 +2352,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, @@ -2274,7 +2366,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, @@ -2286,9 +2378,23 @@ 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"), + .name = _("Enigma Berry"), .itemId = ITEM_ENIGMA_BERRY, .price = 20, .description = sEnigmaBerryDesc, @@ -2300,37 +2406,253 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_0B0] = + [ITEM_OCCA_BERRY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .name = _("Occa Berry"), + .itemId = ITEM_OCCA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_FIRE, + .description = sOccaBerryDesc, + .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, }, - [ITEM_0B1] = + [ITEM_PASSHO_BERRY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .name = _("Passho Berry"), + .itemId = ITEM_PASSHO_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_WATER, + .description = sPasshoBerryDesc, + .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, }, - [ITEM_0B2] = + [ITEM_WACAN_BERRY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .name = _("Wacan Berry"), + .itemId = ITEM_WACAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_ELECTRIC, + .description = sWacanBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RINDO_BERRY] = + { + .name = _("Rindo Berry"), + .itemId = ITEM_RINDO_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_GRASS, + .description = sRindoBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_YACHE_BERRY] = + { + .name = _("Yache Berry"), + .itemId = ITEM_YACHE_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_ICE, + .description = sYacheBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHOPLE_BERRY] = + { + .name = _("Chople Berry"), + .itemId = ITEM_CHOPLE_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_FIGHTING, + .description = sChopleBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_KEBIA_BERRY] = + { + .name = _("Kebia Berry"), + .itemId = ITEM_KEBIA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_POISON, + .description = sKebiaBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SHUCA_BERRY] = + { + .name = _("Shuca Berry"), + .itemId = ITEM_SHUCA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_GROUND, + .description = sShucaBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_COBA_BERRY] = + { + .name = _("Coba Berry"), + .itemId = ITEM_COBA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_FIGHTING, + .description = sCobaBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PAYAPA_BERRY] = + { + .name = _("Payapa Berry"), + .itemId = ITEM_PAYAPA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_PSYCHIC, + .description = sPayapaBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TANGA_BERRY] = + { + .name = _("Tanga Berry"), + .itemId = ITEM_TANGA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_BUG, + .description = sTangaBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHARTI_BERRY] = + { + .name = _("Charti Berry"), + .itemId = ITEM_CHARTI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_ROCK, + .description = sChartiBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_KASIB_BERRY] = + { + .name = _("Kasib Berry"), + .itemId = ITEM_KASIB_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_GHOST, + .description = sKasibBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HABAN_BERRY] = + { + .name = _("Haban Berry"), + .itemId = ITEM_HABAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_DRAGON, + .description = sHabanBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_COLBUR_BERRY] = + { + .name = _("Colbur Berry"), + .itemId = ITEM_COLBUR_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_DARK, + .description = sColburBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BABIRI_BERRY] = + { + .name = _("Babiri Berry"), + .itemId = ITEM_BABIRI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_STEEL, + .description = sBabiriBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHILAN_BERRY] = + { + .name = _("Chilan Berry"), + .itemId = ITEM_CHILAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_NORMAL, + .description = sChilanBerryDesc, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROSELI_BERRY] = + { + .name = _("Roseli Berry"), + .itemId = ITEM_ROSELI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_FAIRY, + .description = sRoseliBerryDesc, + .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, @@ -2340,7 +2662,7 @@ const struct Item gItems[] = [ITEM_BRIGHT_POWDER] = { - .name = _("BRIGHTPOWDER"), + .name = _("BrightPowder"), .itemId = ITEM_BRIGHT_POWDER, .price = 10, .holdEffect = HOLD_EFFECT_EVASION_UP, @@ -2354,7 +2676,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, @@ -2367,7 +2689,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, @@ -2380,7 +2702,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, @@ -2393,7 +2715,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, @@ -2407,7 +2729,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, @@ -2420,7 +2742,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, @@ -2433,7 +2755,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, @@ -2446,7 +2768,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, @@ -2460,7 +2782,7 @@ const struct Item gItems[] = [ITEM_SILVER_POWDER] = { - .name = _("SILVERPOWDER"), + .name = _("SilverPowder"), .itemId = ITEM_SILVER_POWDER, .price = 100, .holdEffect = HOLD_EFFECT_BUG_POWER, @@ -2474,7 +2796,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, @@ -2488,7 +2810,7 @@ const struct Item gItems[] = [ITEM_CLEANSE_TAG] = { - .name = _("CLEANSE TAG"), + .name = _("Cleanse Tag"), .itemId = ITEM_CLEANSE_TAG, .price = 200, .holdEffect = HOLD_EFFECT_REPEL, @@ -2501,7 +2823,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, @@ -2514,7 +2836,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, @@ -2527,7 +2849,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, @@ -2540,7 +2862,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, @@ -2553,7 +2875,7 @@ const struct Item gItems[] = [ITEM_EVERSTONE] = { - .name = _("EVERSTONE"), + .name = _("Everstone"), .itemId = ITEM_EVERSTONE, .price = 200, .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE, @@ -2566,7 +2888,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, @@ -2580,7 +2902,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, @@ -2593,7 +2915,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, @@ -2606,7 +2928,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, @@ -2620,7 +2942,7 @@ const struct Item gItems[] = [ITEM_LEFTOVERS] = { - .name = _("LEFTOVERS"), + .name = _("Leftovers"), .itemId = ITEM_LEFTOVERS, .price = 200, .holdEffect = HOLD_EFFECT_LEFTOVERS, @@ -2634,7 +2956,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, @@ -2646,9 +2968,144 @@ 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_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_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"), + .name = _("Light Ball"), .itemId = ITEM_LIGHT_BALL, .price = 100, .holdEffect = HOLD_EFFECT_LIGHT_BALL, @@ -2661,7 +3118,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, @@ -2675,7 +3132,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, @@ -2689,7 +3146,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, @@ -2703,7 +3160,7 @@ const struct Item gItems[] = [ITEM_BLACK_GLASSES] = { - .name = _("BLACKGLASSES"), + .name = _("BlackGlasses"), .itemId = ITEM_BLACK_GLASSES, .price = 100, .holdEffect = HOLD_EFFECT_DARK_POWER, @@ -2717,7 +3174,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, @@ -2731,7 +3188,7 @@ const struct Item gItems[] = [ITEM_MAGNET] = { - .name = _("MAGNET"), + .name = _("Magnet"), .itemId = ITEM_MAGNET, .price = 100, .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, @@ -2745,7 +3202,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, @@ -2759,7 +3216,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, @@ -2773,7 +3230,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, @@ -2787,7 +3244,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, @@ -2801,7 +3258,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, @@ -2815,7 +3272,7 @@ const struct Item gItems[] = [ITEM_TWISTED_SPOON] = { - .name = _("TWISTEDSPOON"), + .name = _("Twistedspoon"), .itemId = ITEM_TWISTED_SPOON, .price = 100, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, @@ -2829,7 +3286,7 @@ const struct Item gItems[] = [ITEM_CHARCOAL] = { - .name = _("CHARCOAL"), + .name = _("Charcoal"), .itemId = ITEM_CHARCOAL, .price = 9800, .holdEffect = HOLD_EFFECT_FIRE_POWER, @@ -2843,7 +3300,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, @@ -2857,7 +3314,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, @@ -2871,7 +3328,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, @@ -2884,7 +3341,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, @@ -2896,13 +3353,97 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_POWER_BRACER] = + { + .name = _("Power Bracer"), + .itemId = ITEM_POWER_BRACER, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerBracerDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_ATK, + }, + + [ITEM_POWER_BELT] = + { + .name = _("Power Belt"), + .itemId = ITEM_POWER_BELT, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerBeltDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_DEF, + }, + + [ITEM_POWER_LENS] = + { + .name = _("Power Lens"), + .itemId = ITEM_POWER_LENS, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerLensDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPATK, + }, + + [ITEM_POWER_BAND] = + { + .name = _("Power Band"), + .itemId = ITEM_POWER_BAND, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerBandDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPDEF, + }, + + [ITEM_POWER_ANKLET] = + { + .name = _("Power Anklet"), + .itemId = ITEM_POWER_ANKLET, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerAnkletDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPEED, + }, + + [ITEM_POWER_WEIGHT] = + { + .name = _("Power Weight"), + .itemId = ITEM_POWER_WEIGHT, + .price = 3000, + .holdEffect = HOLD_EFFECT_EV_BOOST, + .holdEffectParam = 4, + .description = sPowerWeightDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_HP, + }, + [ITEM_SEA_INCENSE] = { - .name = _("SEA INCENSE"), + .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, @@ -2912,11 +3453,11 @@ const struct Item gItems[] = [ITEM_LAX_INCENSE] = { - .name = _("LAX INCENSE"), + .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, @@ -2924,9 +3465,106 @@ 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"), + .name = _("Lucky Punch"), .itemId = ITEM_LUCKY_PUNCH, .price = 10, .holdEffect = HOLD_EFFECT_LUCKY_PUNCH, @@ -2939,7 +3577,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, @@ -2952,7 +3590,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, @@ -2965,7 +3603,7 @@ const struct Item gItems[] = [ITEM_STICK] = { - .name = _("STICK"), + .name = _("Stick"), .itemId = ITEM_STICK, .price = 200, .holdEffect = HOLD_EFFECT_STICK, @@ -2976,345 +3614,9 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_0E2] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E3] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E4] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E5] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E6] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E7] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E8] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0E9] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0EA] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0EB] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0EC] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0ED] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0EE] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0EF] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F0] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F1] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F2] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F3] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F4] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F5] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F6] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F7] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F8] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0F9] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0FA] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0FB] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0FC] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_0FD] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - [ITEM_RED_SCARF] = { - .name = _("RED SCARF"), + .name = _("Red Scarf"), .itemId = ITEM_RED_SCARF, .price = 100, .description = sRedScarfDesc, @@ -3326,7 +3628,7 @@ const struct Item gItems[] = [ITEM_BLUE_SCARF] = { - .name = _("BLUE SCARF"), + .name = _("Blue Scarf"), .itemId = ITEM_BLUE_SCARF, .price = 100, .description = sBlueScarfDesc, @@ -3338,7 +3640,7 @@ const struct Item gItems[] = [ITEM_PINK_SCARF] = { - .name = _("PINK SCARF"), + .name = _("Pink Scarf"), .itemId = ITEM_PINK_SCARF, .price = 100, .description = sPinkScarfDesc, @@ -3350,7 +3652,7 @@ const struct Item gItems[] = [ITEM_GREEN_SCARF] = { - .name = _("GREEN SCARF"), + .name = _("Green Scarf"), .itemId = ITEM_GREEN_SCARF, .price = 100, .description = sGreenScarfDesc, @@ -3362,7 +3664,7 @@ const struct Item gItems[] = [ITEM_YELLOW_SCARF] = { - .name = _("YELLOW SCARF"), + .name = _("Yellow Scarf"), .itemId = ITEM_YELLOW_SCARF, .price = 100, .description = sYellowScarfDesc, @@ -3376,7 +3678,7 @@ const struct Item gItems[] = [ITEM_MACH_BIKE] = { - .name = _("MACH BIKE"), + .name = _("Mach Bike"), .itemId = ITEM_MACH_BIKE, .price = 0, .description = sMachBikeDesc, @@ -3390,7 +3692,7 @@ const struct Item gItems[] = [ITEM_COIN_CASE] = { - .name = _("COIN CASE"), + .name = _("Coin Case"), .itemId = ITEM_COIN_CASE, .price = 0, .description = sCoinCaseDesc, @@ -3403,7 +3705,7 @@ const struct Item gItems[] = [ITEM_ITEMFINDER] = { - .name = _("ITEMFINDER"), + .name = _("Itemfinder"), .itemId = ITEM_ITEMFINDER, .price = 0, .description = sItemfinderDesc, @@ -3417,7 +3719,7 @@ const struct Item gItems[] = [ITEM_OLD_ROD] = { - .name = _("OLD ROD"), + .name = _("Old Rod"), .itemId = ITEM_OLD_ROD, .price = 0, .description = sOldRodDesc, @@ -3426,12 +3728,12 @@ const struct Item gItems[] = .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .secondaryId = OLD_ROD, + .secondaryId = 0, }, [ITEM_GOOD_ROD] = { - .name = _("GOOD ROD"), + .name = _("Good Rod"), .itemId = ITEM_GOOD_ROD, .price = 0, .description = sGoodRodDesc, @@ -3440,12 +3742,12 @@ const struct Item gItems[] = .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .secondaryId = GOOD_ROD, + .secondaryId = 1, }, [ITEM_SUPER_ROD] = { - .name = _("SUPER ROD"), + .name = _("Super Rod"), .itemId = ITEM_SUPER_ROD, .price = 0, .description = sSuperRodDesc, @@ -3459,7 +3761,7 @@ const struct Item gItems[] = [ITEM_SS_TICKET] = { - .name = _("S.S. TICKET"), + .name = _("S.S. Ticket"), .itemId = ITEM_SS_TICKET, .price = 0, .description = sSSTicketDesc, @@ -3472,7 +3774,7 @@ const struct Item gItems[] = [ITEM_CONTEST_PASS] = { - .name = _("CONTEST PASS"), + .name = _("Contest Pass"), .itemId = ITEM_CONTEST_PASS, .price = 0, .description = sContestPassDesc, @@ -3483,21 +3785,9 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_10B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - [ITEM_WAILMER_PAIL] = { - .name = _("WAILMER PAIL"), + .name = _("Wailmer Pail"), .itemId = ITEM_WAILMER_PAIL, .price = 0, .description = sWailmerPailDesc, @@ -3510,7 +3800,7 @@ const struct Item gItems[] = [ITEM_DEVON_GOODS] = { - .name = _("DEVON GOODS"), + .name = _("Devon Goods"), .itemId = ITEM_DEVON_GOODS, .price = 0, .description = sDevonGoodsDesc, @@ -3523,7 +3813,7 @@ const struct Item gItems[] = [ITEM_SOOT_SACK] = { - .name = _("SOOT SACK"), + .name = _("Soot Sack"), .itemId = ITEM_SOOT_SACK, .price = 0, .description = sSootSackDesc, @@ -3536,7 +3826,7 @@ const struct Item gItems[] = [ITEM_BASEMENT_KEY] = { - .name = _("BASEMENT KEY"), + .name = _("Basement Key"), .itemId = ITEM_BASEMENT_KEY, .price = 0, .description = sBasementKeyDesc, @@ -3549,7 +3839,7 @@ const struct Item gItems[] = [ITEM_ACRO_BIKE] = { - .name = _("ACRO BIKE"), + .name = _("Acro Bike"), .itemId = ITEM_ACRO_BIKE, .price = 0, .description = sAcroBikeDesc, @@ -3577,7 +3867,7 @@ const struct Item gItems[] = [ITEM_LETTER] = { - .name = _("LETTER"), + .name = _("Letter"), .itemId = ITEM_LETTER, .price = 0, .description = sLetterDesc, @@ -3590,7 +3880,7 @@ const struct Item gItems[] = [ITEM_EON_TICKET] = { - .name = _("EON TICKET"), + .name = _("Eon Ticket"), .itemId = ITEM_EON_TICKET, .price = 0, .description = sEonTicketDesc, @@ -3603,7 +3893,7 @@ const struct Item gItems[] = [ITEM_RED_ORB] = { - .name = _("RED ORB"), + .name = _("Red Orb"), .itemId = ITEM_RED_ORB, .price = 0, .description = sRedOrbDesc, @@ -3616,7 +3906,7 @@ const struct Item gItems[] = [ITEM_BLUE_ORB] = { - .name = _("BLUE ORB"), + .name = _("Blue Orb"), .itemId = ITEM_BLUE_ORB, .price = 0, .description = sBlueOrbDesc, @@ -3629,7 +3919,7 @@ const struct Item gItems[] = [ITEM_SCANNER] = { - .name = _("SCANNER"), + .name = _("Scanner"), .itemId = ITEM_SCANNER, .price = 0, .description = sScannerDesc, @@ -3642,7 +3932,7 @@ const struct Item gItems[] = [ITEM_GO_GOGGLES] = { - .name = _("GO-GOGGLES"), + .name = _("Go-Goggles"), .itemId = ITEM_GO_GOGGLES, .price = 0, .description = sGoGogglesDesc, @@ -3655,7 +3945,7 @@ const struct Item gItems[] = [ITEM_METEORITE] = { - .name = _("METEORITE"), + .name = _("Meteorite"), .itemId = ITEM_METEORITE, .price = 0, .description = sMeteoriteDesc, @@ -3668,7 +3958,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 = sRoom1KeyDesc, @@ -3681,7 +3971,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 = sRoom2KeyDesc, @@ -3694,7 +3984,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 = sRoom4KeyDesc, @@ -3707,7 +3997,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 = sRoom6KeyDesc, @@ -3720,7 +4010,7 @@ const struct Item gItems[] = [ITEM_STORAGE_KEY] = { - .name = _("STORAGE KEY"), + .name = _("Storage Key"), .itemId = ITEM_STORAGE_KEY, .price = 0, .description = sStorageKeyDesc, @@ -3731,35 +4021,9 @@ 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"), + .name = _("Devon Scope"), .itemId = ITEM_DEVON_SCOPE, .price = 0, .description = sDevonScopeDesc, @@ -4476,35 +4740,11 @@ const struct Item gItems[] = .secondaryId = 0, }, - [ITEM_15B] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - - [ITEM_15C] = - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = 4, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, - }, - // FireRed/LeafGreen key items [ITEM_OAKS_PARCEL] = { - .name = _("OAK'S PARCEL"), + .name = _("Oak's Parcel"), .itemId = ITEM_OAKS_PARCEL, .price = 0, .description = sOaksParcelDesc, @@ -4517,7 +4757,7 @@ const struct Item gItems[] = [ITEM_POKE_FLUTE] = { - .name = _("POKé FLUTE"), + .name = _("Poké Flute"), .itemId = ITEM_POKE_FLUTE, .price = 0, .description = sPokeFluteDesc, @@ -4530,7 +4770,7 @@ const struct Item gItems[] = [ITEM_SECRET_KEY] = { - .name = _("SECRET KEY"), + .name = _("Secret Key"), .itemId = ITEM_SECRET_KEY, .price = 0, .description = sSecretKeyDesc, @@ -4543,7 +4783,7 @@ const struct Item gItems[] = [ITEM_BIKE_VOUCHER] = { - .name = _("BIKE VOUCHER"), + .name = _("Bike Voucher"), .itemId = ITEM_BIKE_VOUCHER, .price = 0, .description = sBikeVoucherDesc, @@ -4556,7 +4796,7 @@ const struct Item gItems[] = [ITEM_GOLD_TEETH] = { - .name = _("GOLD TEETH"), + .name = _("Gold Teeth"), .itemId = ITEM_GOLD_TEETH, .price = 0, .description = sGoldTeethDesc, @@ -4569,7 +4809,7 @@ const struct Item gItems[] = [ITEM_OLD_AMBER] = { - .name = _("OLD AMBER"), + .name = _("Old Amber"), .itemId = ITEM_OLD_AMBER, .price = 0, .description = sOldAmberDesc, @@ -4582,7 +4822,7 @@ const struct Item gItems[] = [ITEM_CARD_KEY] = { - .name = _("CARD KEY"), + .name = _("Card Key"), .itemId = ITEM_CARD_KEY, .price = 0, .description = sCardKeyDesc, @@ -4595,7 +4835,7 @@ const struct Item gItems[] = [ITEM_LIFT_KEY] = { - .name = _("LIFT KEY"), + .name = _("Lift Key"), .itemId = ITEM_LIFT_KEY, .price = 0, .description = sLiftKeyDesc, @@ -4606,14 +4846,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"), + .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, @@ -4621,12 +4887,90 @@ const struct Item gItems[] = [ITEM_DOME_FOSSIL] = { - .name = _("DOME FOSSIL"), + .name = _("Dome Fossil"), .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 = _("Cover 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, @@ -4634,7 +4978,7 @@ const struct Item gItems[] = [ITEM_SILPH_SCOPE] = { - .name = _("SILPH SCOPE"), + .name = _("Silph Scope"), .itemId = ITEM_SILPH_SCOPE, .price = 0, .description = sSilphScopeDesc, @@ -4647,7 +4991,7 @@ const struct Item gItems[] = [ITEM_BICYCLE] = { - .name = _("BICYCLE"), + .name = _("Bicycle"), .itemId = ITEM_BICYCLE, .price = 0, .description = sBicycleDesc, @@ -4661,7 +5005,7 @@ const struct Item gItems[] = [ITEM_TOWN_MAP] = { - .name = _("TOWN MAP"), + .name = _("Town Map"), .itemId = ITEM_TOWN_MAP, .price = 0, .description = sTownMapDesc, @@ -4675,7 +5019,7 @@ const struct Item gItems[] = [ITEM_VS_SEEKER] = { - .name = _("VS SEEKER"), + .name = _("Vs Seeker"), .itemId = ITEM_VS_SEEKER, .price = 0, .description = sVSSeekerDesc, @@ -4689,7 +5033,7 @@ const struct Item gItems[] = [ITEM_FAME_CHECKER] = { - .name = _("FAME CHECKER"), + .name = _("Fame Checker"), .itemId = ITEM_FAME_CHECKER, .price = 0, .description = sFameCheckerDesc, @@ -4703,7 +5047,7 @@ const struct Item gItems[] = [ITEM_TM_CASE] = { - .name = _("TM CASE"), + .name = _("TM Case"), .itemId = ITEM_TM_CASE, .price = 0, .description = sTMCaseDesc, @@ -4717,7 +5061,7 @@ const struct Item gItems[] = [ITEM_BERRY_POUCH] = { - .name = _("BERRY POUCH"), + .name = _("Berry Pouch"), .itemId = ITEM_BERRY_POUCH, .price = 0, .description = sBerryPouchDesc, @@ -4731,7 +5075,7 @@ const struct Item gItems[] = [ITEM_TEACHY_TV] = { - .name = _("TEACHY TV"), + .name = _("Teachy TV"), .itemId = ITEM_TEACHY_TV, .price = 0, .description = sTeachyTVDesc, @@ -4745,7 +5089,7 @@ const struct Item gItems[] = [ITEM_TRI_PASS] = { - .name = _("TRI-PASS"), + .name = _("Tri-Pass"), .itemId = ITEM_TRI_PASS, .price = 0, .description = sTriPassDesc, @@ -4759,7 +5103,7 @@ const struct Item gItems[] = [ITEM_RAINBOW_PASS] = { - .name = _("RAINBOW PASS"), + .name = _("Rainbow Pass"), .itemId = ITEM_RAINBOW_PASS, .price = 0, .description = sRainbowPassDesc, @@ -4773,7 +5117,7 @@ const struct Item gItems[] = [ITEM_TEA] = { - .name = _("TEA"), + .name = _("Tea"), .itemId = ITEM_TEA, .price = 0, .description = sTeaDesc, @@ -4787,7 +5131,7 @@ const struct Item gItems[] = [ITEM_MYSTIC_TICKET] = { - .name = _("MYSTICTICKET"), + .name = _("MysticTicket"), .itemId = ITEM_MYSTIC_TICKET, .price = 0, .description = sMysticTicketDesc, @@ -4801,7 +5145,7 @@ const struct Item gItems[] = [ITEM_AURORA_TICKET] = { - .name = _("AURORATICKET"), + .name = _("AuroraTicket"), .itemId = ITEM_AURORA_TICKET, .price = 0, .description = sAuroraTicketDesc, @@ -4815,7 +5159,7 @@ const struct Item gItems[] = [ITEM_POWDER_JAR] = { - .name = _("POWDER JAR"), + .name = _("Powder Jar"), .itemId = ITEM_POWDER_JAR, .price = 0, .description = sPowderJarDesc, @@ -4829,7 +5173,7 @@ const struct Item gItems[] = [ITEM_RUBY] = { - .name = _("RUBY"), + .name = _("Ruby"), .itemId = ITEM_RUBY, .price = 0, .description = sRubyDesc, @@ -4843,7 +5187,7 @@ const struct Item gItems[] = [ITEM_SAPPHIRE] = { - .name = _("SAPPHIRE"), + .name = _("Sapphire"), .itemId = ITEM_SAPPHIRE, .price = 0, .description = sSapphireDesc, @@ -4859,7 +5203,7 @@ const struct Item gItems[] = [ITEM_MAGMA_EMBLEM] = { - .name = _("MAGMA EMBLEM"), + .name = _("Magma Emblem"), .itemId = ITEM_MAGMA_EMBLEM, .price = 0, .description = sMagmaEmblemDesc, @@ -4873,7 +5217,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 = sOldSeaMapDesc, @@ -4884,4 +5228,2237 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 0, }, + +// New items + + [ITEM_WIDE_LENS] = + { + .name = _("Wide Lens"), + .itemId = ITEM_WIDE_LENS, + .price = 200, + .holdEffect = HOLD_EFFECT_WIDE_LENS, + .holdEffectParam = 10, + .description = sWideLensDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MUSCLE_BAND] = + { + .name = _("Muscle Band"), + .itemId = ITEM_MUSCLE_BAND, + .price = 200, + .holdEffect = HOLD_EFFECT_MUSCLE_BAND, + .holdEffectParam = 10, + .description = sMuscleBandDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WISE_GLASSES] = + { + .name = _("Wise Glasses"), + .itemId = ITEM_WISE_GLASSES, + .price = 200, + .holdEffect = HOLD_EFFECT_WISE_GLASSES, + .holdEffectParam = 10, + .description = sWiseGlassesDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_EXPERT_BELT] = + { + .name = _("Expert Belt"), + .itemId = ITEM_EXPERT_BELT, + .price = 200, + .holdEffect = HOLD_EFFECT_EXPERT_BELT, + .holdEffectParam = 20, + .description = sExpertBeltDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LIGHT_CLAY] = + { + .name = _("Light Clay"), + .itemId = ITEM_LIGHT_CLAY, + .price = 200, + .holdEffect = HOLD_EFFECT_LIGHT_CLAY, + .description = sLightClayDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LIFE_ORB] = + { + .name = _("Life Orb"), + .itemId = ITEM_LIFE_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_LIFE_ORB, + .description = sLifeOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_POWER_HERB] = + { + .name = _("Power Herb"), + .itemId = ITEM_POWER_HERB, + .price = 200, + .holdEffect = HOLD_EFFECT_POWER_HERB, + .description = sPowerHerbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TOXIC_ORB] = + { + .name = _("Toxic Orb"), + .itemId = ITEM_TOXIC_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_TOXIC_ORB, + .description = sToxicOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FLAME_ORB] = + { + .name = _("Flame Orb"), + .itemId = ITEM_FLAME_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_FLAME_ORB, + .description = sFlameOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_QUICK_POWDER] = + { + .name = _("Quick Powder"), + .itemId = ITEM_QUICK_POWDER, + .price = 200, + .holdEffect = HOLD_EFFECT_QUICK_POWDER, + .description = sQuickPowderDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FOCUS_SASH] = + { + .name = _("Focus Sash"), + .itemId = ITEM_FOCUS_SASH, + .price = 200, + .holdEffect = HOLD_EFFECT_FOCUS_SASH, + .description = sFocusSashDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ZOOM_LENS] = + { + .name = _("Zoom Lens"), + .itemId = ITEM_ZOOM_LENS, + .price = 200, + .holdEffect = HOLD_EFFECT_ZOOM_LENS, + .holdEffectParam = 20, + .description = sZoomLensDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_METRONOME] = + { + .name = _("Metronome"), + .itemId = ITEM_METRONOME, + .price = 200, + .holdEffect = HOLD_EFFECT_METRONOME, + .holdEffectParam = 20, + .description = sMetronomeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_IRON_BALL] = + { + .name = _("Iron Ball"), + .itemId = ITEM_IRON_BALL, + .price = 200, + .holdEffect = HOLD_EFFECT_IRON_BALL, + .description = sIronBallDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LAGGING_TAIL] = + { + .name = _("Lagging Tail"), + .itemId = ITEM_LAGGING_TAIL, + .price = 200, + .holdEffect = HOLD_EFFECT_LAGGING_TAIL, + .description = sLaggingTailDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DESTINY_KNOT] = + { + .name = _("Destiny Knot"), + .itemId = ITEM_DESTINY_KNOT, + .price = 200, + .holdEffect = HOLD_EFFECT_DESTINY_KNOT, + .description = sDestinyKnotDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLACK_SLUDGE] = + { + .name = _("Black Sludge"), + .itemId = ITEM_BLACK_SLUDGE, + .price = 200, + .holdEffect = HOLD_EFFECT_BLACK_SLUDGE, + .description = sBlackSludgeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ICY_ROCK] = + { + .name = _("Icy Rock"), + .itemId = ITEM_ICY_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_ICY_ROCK, + .description = sIcyRockDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SMOOTH_ROCK] = + { + .name = _("Smooth Rock"), + .itemId = ITEM_SMOOTH_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_SMOOTH_ROCK, + .description = sSmoothRockDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HEAT_ROCK] = + { + .name = _("Heat Rock"), + .itemId = ITEM_HEAT_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_HEAT_ROCK, + .description = sHeatRockDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DAMP_ROCK] = + { + .name = _("Damp Rock"), + .itemId = ITEM_DAMP_ROCK, + .price = 200, + .holdEffect = HOLD_EFFECT_DAMP_ROCK, + .description = sDampRockDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GRIP_CLAW] = + { + .name = _("Grip Claw"), + .itemId = ITEM_GRIP_CLAW, + .price = 200, + .holdEffect = HOLD_EFFECT_GRIP_CLAW, + .description = sGripClawDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHOICE_SCARF] = + { + .name = _("Choice Scarf"), + .itemId = ITEM_CHOICE_SCARF, + .price = 200, + .holdEffect = HOLD_EFFECT_CHOICE_SCARF, + .description = sChoiceScarfDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_STICKY_BARB] = + { + .name = _("Sticky Barb"), + .itemId = ITEM_STICKY_BARB, + .price = 200, + .holdEffect = HOLD_EFFECT_STICKY_BARB, + .description = sStickyBarbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SHED_SHELL] = + { + .name = _("Shed Shell"), + .itemId = ITEM_SHED_SHELL, + .price = 200, + .holdEffect = HOLD_EFFECT_SHED_SHELL, + .description = sShedShellDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BIG_ROOT] = + { + .name = _("Big Root"), + .itemId = ITEM_BIG_ROOT, + .price = 200, + .holdEffect = HOLD_EFFECT_BIG_ROOT, + .holdEffectParam = 30, + .description = sBigRootDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHOICE_SPECS] = + { + .name = _("Choice Specs"), + .itemId = ITEM_CHOICE_SPECS, + .price = 200, + .holdEffect = HOLD_EFFECT_CHOICE_SPECS, + .description = sChoiceSpecsDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ADAMANT_ORB] = + { + .name = _("Adamant Orb"), + .itemId = ITEM_ADAMANT_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_ADAMANT_ORB, + .description = sAdamantOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LUSTROUS_ORB] = + { + .name = _("Lustrous Orb"), + .itemId = ITEM_LUSTROUS_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_LUSTROUS_ORB, + .description = sLustrousOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GRISEOUS_ORB] = + { + .name = _("Griseous Orb"), + .itemId = ITEM_GRISEOUS_ORB, + .price = 200, + .holdEffect = HOLD_EFFECT_GRISEOUS_ORB, + .description = sGriseousOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .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_MEMORY, + .holdEffectParam = 0, + .description = sBugMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_BUG, + }, + + [ITEM_DARK_MEMORY] = + { + .name = _("Dark Memory"), + .itemId = ITEM_DARK_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sDarkMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_DARK, + }, + + [ITEM_DRAGON_MEMORY] = + { + .name = _("Dragon Memory"), + .itemId = ITEM_DRAGON_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sDragonMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_DRAGON, + }, + + [ITEM_ELECTRIC_MEMORY] = + { + .name = _("Elec. Memory"), + .itemId = ITEM_ELECTRIC_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sElectricMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ELECTRIC, + }, + + [ITEM_FAIRY_MEMORY] = + { + .name = _("Fairy Memory"), + .itemId = ITEM_FAIRY_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sFairyMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FAIRY, + }, + + [ITEM_FIGHTING_MEMORY] = + { + .name = _("Fight Memory"), + .itemId = ITEM_FIGHTING_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sFightingMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FIGHTING, + }, + + [ITEM_FIRE_MEMORY] = + { + .name = _("Fire Memory"), + .itemId = ITEM_FIRE_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sFireMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FIRE, + }, + + [ITEM_FLYING_MEMORY] = + { + .name = _("Flying Memory"), + .itemId = ITEM_FLYING_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sFlyingMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FLYING, + }, + + [ITEM_GHOST_MEMORY] = + { + .name = _("Ghost Memory"), + .itemId = ITEM_GHOST_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sGhostMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GHOST, + }, + + [ITEM_GRASS_MEMORY] = + { + .name = _("Grass Memory"), + .itemId = ITEM_GRASS_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sGrassMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GRASS, + }, + + [ITEM_GROUND_MEMORY] = + { + .name = _("Ground Memory"), + .itemId = ITEM_GROUND_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sGroundMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GROUND, + }, + + [ITEM_ICE_MEMORY] = + { + .name = _("Ice Memory"), + .itemId = ITEM_ICE_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sIceMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ICE, + }, + + [ITEM_POISON_MEMORY] = + { + .name = _("Poison Memory"), + .itemId = ITEM_POISON_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sPoisonMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_POISON, + }, + + [ITEM_PSYCHIC_MEMORY] = + { + .name = _("PsychicMemory"), + .itemId = ITEM_PSYCHIC_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sPsychicMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_PSYCHIC, + }, + + [ITEM_ROCK_MEMORY] = + { + .name = _("Rock Memory"), + .itemId = ITEM_ROCK_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sRockMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ROCK, + }, + + [ITEM_STEEL_MEMORY] = + { + .name = _("Steel Memory"), + .itemId = ITEM_STEEL_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sSteelMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_STEEL, + }, + + [ITEM_WATER_MEMORY] = + { + .name = _("Water Memory"), + .itemId = ITEM_WATER_MEMORY, + .price = 1000, + .holdEffect = HOLD_EFFECT_MEMORY, + .holdEffectParam = 0, + .description = sWaterMemoryDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_WATER, + }, + + [ITEM_FLAME_PLATE] = + { + .name = _("Flame Plate"), + .itemId = ITEM_FLAME_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FIRE_POWER, + .holdEffectParam = 20, + .description = sFlamePlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SPLASH_PLATE] = + { + .name = _("Splash Plate"), + .itemId = ITEM_SPLASH_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_WATER_POWER, + .holdEffectParam = 20, + .description = sSplashPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ZAP_PLATE] = + { + .name = _("Zap Plate"), + .itemId = ITEM_ZAP_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, + .holdEffectParam = 20, + .description = sZapPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MEADOW_PLATE] = + { + .name = _("Meadow Plate"), + .itemId = ITEM_MEADOW_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GRASS_POWER, + .holdEffectParam = 20, + .description = sMeadowPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ICICLE_PLATE] = + { + .name = _("Icicle Plate"), + .itemId = ITEM_ICICLE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ICE_POWER, + .holdEffectParam = 20, + .description = sIciclePlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FIST_PLATE] = + { + .name = _("Fist Plate"), + .itemId = ITEM_FIST_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FIGHTING_POWER, + .holdEffectParam = 20, + .description = sFistPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TOXIC_PLATE] = + { + .name = _("Toxic Plate"), + .itemId = ITEM_TOXIC_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_POISON_POWER, + .holdEffectParam = 20, + .description = sToxicPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_EARTH_PLATE] = + { + .name = _("Earth Plate"), + .itemId = ITEM_EARTH_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GROUND_POWER, + .holdEffectParam = 20, + .description = sEarthPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SKY_PLATE] = + { + .name = _("Sky Plate"), + .itemId = ITEM_SKY_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FLYING_POWER, + .holdEffectParam = 20, + .description = sSkyPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MIND_PLATE] = + { + .name = _("Mind Plate"), + .itemId = ITEM_MIND_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, + .holdEffectParam = 20, + .description = sMindPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_INSECT_PLATE] = + { + .name = _("Insect Plate"), + .itemId = ITEM_INSECT_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_BUG_POWER, + .holdEffectParam = 20, + .description = sInsectPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_STONE_PLATE] = + { + .name = _("Stone Plate"), + .itemId = ITEM_STONE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_ROCK_POWER, + .holdEffectParam = 20, + .description = sStonePlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SPOOKY_PLATE] = + { + .name = _("Spooky Plate"), + .itemId = ITEM_SPOOKY_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_GHOST_POWER, + .holdEffectParam = 20, + .description = sSpookyPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DRACO_PLATE] = + { + .name = _("Draco Plate"), + .itemId = ITEM_DRACO_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRAGON_POWER, + .holdEffectParam = 20, + .description = sDracoPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DREAD_PLATE] = + { + .name = _("Dread Plate"), + .itemId = ITEM_DREAD_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_DARK_POWER, + .holdEffectParam = 20, + .description = sDreadPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_IRON_PLATE] = + { + .name = _("Iron Plate"), + .itemId = ITEM_IRON_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_STEEL_POWER, + .holdEffectParam = 20, + .description = sIronPlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_EVIOLITE] = + { + .name = _("Eviolite"), + .itemId = ITEM_EVIOLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_EVIOLITE, + .holdEffectParam = 50, + .description = sEvioliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_FLOAT_STONE] = + { + .name = _("Float Stone"), + .itemId = ITEM_FLOAT_STONE, + .price = 200, + .holdEffect = HOLD_EFFECT_FLOAT_STONE, + .description = sFloatStoneDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .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 = 2000, + .holdEffect = HOLD_EFFECT_BINDING_BAND, + .description = sBindingBandDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .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"), + .itemId = ITEM_DOUSE_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .description = sDouseDriveDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_WATER, + }, + + [ITEM_SHOCK_DRIVE] = + { + .name = _("Shock Drive"), + .itemId = ITEM_SHOCK_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .description = sShockDriveDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ELECTRIC, + }, + + [ITEM_BURN_DRIVE] = + { + .name = _("Burn Drive"), + .itemId = ITEM_BURN_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .description = sBurnDriveDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FIRE, + }, + + [ITEM_CHILL_DRIVE] = + { + .name = _("Chill Drive"), + .itemId = ITEM_CHILL_DRIVE, + .price = 200, + .holdEffect = HOLD_EFFECT_DRIVE, + .description = sChillDriveDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ICE, + }, + + [ITEM_FIRE_GEM] = + { + .name = _("Fire Gem"), + .itemId = ITEM_FIRE_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sFireGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FIRE, + }, + + [ITEM_WATER_GEM] = + { + .name = _("Water Gem"), + .itemId = ITEM_WATER_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sWaterGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_WATER, + }, + + [ITEM_ELECTRIC_GEM] = + { + .name = _("Electric Gem"), + .itemId = ITEM_ELECTRIC_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sElectricGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ELECTRIC, + }, + + [ITEM_GRASS_GEM] = + { + .name = _("Grass Gem"), + .itemId = ITEM_GRASS_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sGrassGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GRASS, + }, + + [ITEM_ICE_GEM] = + { + .name = _("Ice Gem"), + .itemId = ITEM_ICE_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sIceGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ICE, + }, + + [ITEM_FIGHTING_GEM] = + { + .name = _("Fighting Gem"), + .itemId = ITEM_FIGHTING_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sFightingGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FIGHTING, + }, + + [ITEM_POISON_GEM] = + { + .name = _("Poison Gem"), + .itemId = ITEM_POISON_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sPoisonGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_POISON, + }, + + [ITEM_GROUND_GEM] = + { + .name = _("Ground Gem"), + .itemId = ITEM_GROUND_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sGroundGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GROUND, + }, + + [ITEM_FLYING_GEM] = + { + .name = _("Flying Gem"), + .itemId = ITEM_FLYING_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sFlyingGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FLYING, + }, + + [ITEM_PSYCHIC_GEM] = + { + .name = _("Psychic Gem"), + .itemId = ITEM_PSYCHIC_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sPsychicGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_PSYCHIC, + }, + + [ITEM_BUG_GEM] = + { + .name = _("Bug Gem"), + .itemId = ITEM_BUG_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sBugGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_BUG, + }, + + [ITEM_ROCK_GEM] = + { + .name = _("Rock Gem"), + .itemId = ITEM_ROCK_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sRockGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_ROCK, + }, + + [ITEM_GHOST_GEM] = + { + .name = _("Ghost Gem"), + .itemId = ITEM_GHOST_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sGhostGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_GHOST, + }, + + [ITEM_DRAGON_GEM] = + { + .name = _("Dragon Gem"), + .itemId = ITEM_DRAGON_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sDragonGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_DRAGON, + }, + + [ITEM_DARK_GEM] = + { + .name = _("Dark Gem"), + .itemId = ITEM_DARK_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sDarkGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_DARK, + }, + + [ITEM_STEEL_GEM] = + { + .name = _("Steel Gem"), + .itemId = ITEM_STEEL_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sSteelGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_STEEL, + }, + + [ITEM_NORMAL_GEM] = + { + .name = _("Normal Gem"), + .itemId = ITEM_NORMAL_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sNormalGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_NORMAL, + }, + + [ITEM_FAIRY_GEM] = + { + .name = _("Fairy Gem"), + .itemId = ITEM_FAIRY_GEM, + .price = 200, + .holdEffect = HOLD_EFFECT_GEMS, + .holdEffectParam = 30, + .description = sFairyGemDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = TYPE_FAIRY, + }, + + [ITEM_ASSAULT_VEST] = + { + .name = _("Assault Vest"), + .itemId = ITEM_ASSAULT_VEST, + .price = 200, + .holdEffect = HOLD_EFFECT_ASSAULT_VEST, + .holdEffectParam = 50, + .description = sAssaultVestDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PIXIE_PLATE] = + { + .name = _("Pixie Plate"), + .itemId = ITEM_PIXIE_PLATE, + .price = 200, + .holdEffect = HOLD_EFFECT_FAIRY_POWER, + .holdEffectParam = 20, + .description = sPixiePlateDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SAFETY_GOGGLES] = + { + .name = _("SafetyGoggles"), + .itemId = ITEM_SAFETY_GOGGLES, + .price = 4000, + .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES, + .description = sSafetyGogglesDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GENGARITE] = + { + .name = _("Gengarite"), + .itemId = ITEM_GENGARITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGengariteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GARDEVOIRITE] = + { + .name = _("Gardevoirite"), + .itemId = ITEM_GARDEVOIRITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGardevoiriteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_AMPHAROSITE] = + { + .name = _("Ampharosite"), + .itemId = ITEM_AMPHAROSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAmpharositeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_VENUSAURITE] = + { + .name = _("Venusaurite"), + .itemId = ITEM_VENUSAURITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sVenusauriteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHARIZARDITE_X] = + { + .name = _("CharizarditeX"), + .itemId = ITEM_CHARIZARDITE_X, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sCharizarditeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLASTOISINITE] = + { + .name = _("Blastoisinite"), + .itemId = ITEM_BLASTOISINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sBlastoisiniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MEWTWONITE_X] = + { + .name = _("Mewtwonite X"), + .itemId = ITEM_MEWTWONITE_X, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sMewtwoniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MEWTWONITE_Y] = + { + .name = _("Mewtwonite Y"), + .itemId = ITEM_MEWTWONITE_Y, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sMewtwoniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLAZIKENITE] = + { + .name = _("Blazikenite"), + .itemId = ITEM_BLAZIKENITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sBlazikeniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MEDICHAMITE] = + { + .name = _("Medichamite"), + .itemId = ITEM_MEDICHAMITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sMedichamiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HOUNDOOMINITE] = + { + .name = _("Houndoominite"), + .itemId = ITEM_HOUNDOOMINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sHoundoominiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_AGGRONITE] = + { + .name = _("Aggronite"), + .itemId = ITEM_AGGRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAggroniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BANETTITE] = + { + .name = _("Banettite"), + .itemId = ITEM_BANETTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sBanettiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TYRANITARITE] = + { + .name = _("Tyranitarite"), + .itemId = ITEM_TYRANITARITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sTyranitariteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SCIZORITE] = + { + .name = _("Scizorite"), + .itemId = ITEM_SCIZORITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sScizoriteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PINSIRITE] = + { + .name = _("Pinsirite"), + .itemId = ITEM_PINSIRITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sPinsiriteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_AERODACTYLITE] = + { + .name = _("Aerodactylite"), + .itemId = ITEM_AERODACTYLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAerodactyliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LUCARIONITE] = + { + .name = _("Lucarionite"), + .itemId = ITEM_LUCARIONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sLucarioniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ABOMASITE] = + { + .name = _("Abomasite"), + .itemId = ITEM_ABOMASITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAbomasiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_KANGASKHANITE] = + { + .name = _("Kangaskhanite"), + .itemId = ITEM_KANGASKHANITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sKangaskhaniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GYARADOSITE] = + { + .name = _("Gyaradosite"), + .itemId = ITEM_GYARADOSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGyaradositeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ABSOLITE] = + { + .name = _("Absolite"), + .itemId = ITEM_ABSOLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAbsoliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHARIZARDITE_Y] = + { + .name = _("CharizarditeY"), + .itemId = ITEM_CHARIZARDITE_Y, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sCharizarditeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ALAKAZITE] = + { + .name = _("Alakazite"), + .itemId = ITEM_ALAKAZITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAlakaziteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HERACRONITE] = + { + .name = _("Heracronite"), + .itemId = ITEM_HERACRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sHeracroniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MAWILITE] = + { + .name = _("Mawilite"), + .itemId = ITEM_MAWILITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sMawiliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MANECTITE] = + { + .name = _("Manectite"), + .itemId = ITEM_MANECTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sManectiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GARCHOMPITE] = + { + .name = _("Garchompite"), + .itemId = ITEM_GARCHOMPITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGarchompiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LATIASITE] = + { + .name = _("Latiasite"), + .itemId = ITEM_LATIASITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sLatiasiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LATIOSITE] = + { + .name = _("Latiosite"), + .itemId = ITEM_LATIOSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sLatiositeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SWAMPERTITE] = + { + .name = _("Swampertite"), + .itemId = ITEM_SWAMPERTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSwampertiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SCEPTILITE] = + { + .name = _("Sceptilite"), + .itemId = ITEM_SCEPTILITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSceptiliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SABLENITE] = + { + .name = _("Sablenite"), + .itemId = ITEM_SABLENITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSableniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ALTARIANITE] = + { + .name = _("Altarianite"), + .itemId = ITEM_ALTARIANITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAltarianiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GALLADITE] = + { + .name = _("Galladite"), + .itemId = ITEM_GALLADITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGalladiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_AUDINITE] = + { + .name = _("Audinite"), + .itemId = ITEM_AUDINITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sAudiniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_METAGROSSITE] = + { + .name = _("Metagrossite"), + .itemId = ITEM_METAGROSSITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sMetagrossiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SHARPEDONITE] = + { + .name = _("Sharpedonite"), + .itemId = ITEM_SHARPEDONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSharpedoniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SLOWBRONITE] = + { + .name = _("Slowbronite"), + .itemId = ITEM_SLOWBRONITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSlowbroniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_STEELIXITE] = + { + .name = _("Steelixite"), + .itemId = ITEM_STEELIXITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSteelixiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PIDGEOTITE] = + { + .name = _("Pidgeotite"), + .itemId = ITEM_PIDGEOTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sPidgeotiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GLALITITE] = + { + .name = _("Glalitite"), + .itemId = ITEM_GLALITITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sGlalititeDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_DIANCITE] = + { + .name = _("Diancite"), + .itemId = ITEM_DIANCITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sDianciteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CAMERUPTITE] = + { + .name = _("Cameruptite"), + .itemId = ITEM_CAMERUPTITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sCameruptiteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_LOPUNNITE] = + { + .name = _("Lopunnite"), + .itemId = ITEM_LOPUNNITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sLopunniteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SALAMENCITE] = + { + .name = _("Salamencite"), + .itemId = ITEM_SALAMENCITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sSalamenciteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BEEDRILLITE] = + { + .name = _("Beedrillite"), + .itemId = ITEM_BEEDRILLITE, + .price = 200, + .holdEffect = HOLD_EFFECT_MEGA_STONE, + .description = sBeedrilliteDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MEGA_BRACELET] = + { + .name = _("Mega Bracelet"), + .itemId = ITEM_MEGA_BRACELET, + .price = 200, + .description = sMegaBraceletDesc, + .pocket = POCKET_KEY_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PROTECTIVE_PADS] = + { + .name = _("Protect Pads"), // Shortened name from Protective Pads + .itemId = ITEM_PROTECTIVE_PADS, + .price = 4000, + .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS, + .description = sProtectPadsDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TERRAIN_EXTENDER] = + { + .name = _("Terrain Exte."), + .itemId = ITEM_TERRAIN_EXTENDER, + .price = 4000, + .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER, + .description = sTerrainExtenderDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ELECTRIC_SEED] = + { + .name = _("Electric Seed"), + .itemId = ITEM_ELECTRIC_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .description = sElectricSeedDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GRASSY_SEED] = + { + .name = _("Grassy Seed"), + .itemId = ITEM_GRASSY_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .description = sGrassySeedDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_MISTY_SEED] = + { + .name = _("Misty Seed"), + .itemId = ITEM_MISTY_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .description = sMistySeedDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PSYCHIC_SEED] = + { + .name = _("Psychic Seed"), + .itemId = ITEM_PSYCHIC_SEED, + .price = 4000, + .holdEffect = HOLD_EFFECT_SEEDS, + .description = sPsychicSeedDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ADRENALINE_ORB] = + { + .name = _("AdrenalineOrb"), + .itemId = ITEM_ADRENALINE_ORB, + .price = 300, + .holdEffect = HOLD_EFFECT_ADRENALINE_ORB, + .description = sAdrenalineOrbDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HONEY] = + { + .name = _("Honey"), + .itemId = ITEM_HONEY, + .price = 100, + .description = sHoneyDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HEALTH_WING] = + { + .name = _("Health Wing"), + .itemId = ITEM_HEALTH_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sHealthWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_HP, + }, + + [ITEM_MUSCLE_WING] = + { + .name = _("Muscle Wing"), + .itemId = ITEM_MUSCLE_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sMuscleWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_ATK, + }, + + [ITEM_RESIST_WING] = + { + .name = _("Resist Wing"), + .itemId = ITEM_RESIST_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sResistWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_DEF, + }, + + [ITEM_GENIUS_WING] = + { + .name = _("Genius Wing"), + .itemId = ITEM_GENIUS_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sGeniusWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPATK, + }, + + [ITEM_CLEVER_WING] = + { + .name = _("Clever Wing"), + .itemId = ITEM_CLEVER_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sCleverWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPDEF, + }, + + [ITEM_SWIFT_WING] = + { + .name = _("Swift Wing"), + .itemId = ITEM_SWIFT_WING, + .price = 300, + .holdEffect = 0, + .holdEffectParam = 4, + .description = sSwiftWingDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = STAT_SPEED, + }, + + [ITEM_PRETTY_WING] = + { + .name = _("Pretty Wing"), + .itemId = ITEM_PRETTY_WING, + .price = 1000, + .description = sPrettyWingDesc, + .pocket = POCKET_ITEMS, + .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/lilycove_lady.h b/src/data/lilycove_lady.h index cf6c0c648..69434ac45 100644 --- a/src/data/lilycove_lady.h +++ b/src/data/lilycove_lady.h @@ -35,7 +35,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, @@ -118,7 +118,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 @@ -361,7 +361,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, diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h index d558b583f..8bebc69c2 100755 --- a/src/data/object_events/berry_tree_graphics_tables.h +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -418,6 +418,160 @@ const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; +const struct SpriteFrameImage gObjectEventPicTable_OccaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Occa[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_YacheBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Yache[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_ChopleBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Chople[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_KebiaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Kebia[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_ShucaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Shuca[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_PayapaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Payapa[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_TangaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Tanga[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_KasibBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Kasib[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_HabanBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Haban[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_ColburBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Colbur[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_RoseliBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4}; + const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; @@ -466,6 +620,30 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_OccaBerryTree, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TamatoBerryTree, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_YacheBerryTree, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ChopleBerryTree, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KebiaBerryTree, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ShucaBerryTree, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RawstBerryTree, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PayapaBerryTree, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TangaBerryTree, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KasibBerryTree, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HabanBerryTree, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ColburBerryTree, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LiechiBerryTree, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RoseliBerryTree, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL, }; const u8 *const gBerryTreePaletteSlotTablePointers[] = { @@ -512,6 +690,30 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Yache, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chople, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kebia, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Shuca, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Payapa, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tanga, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kasib, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Haban, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Colbur, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL, }; const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { @@ -558,8 +760,28 @@ const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - // 3 unused berries. - [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, }; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 50fc6715c..d49858ea8 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -285,6 +285,17 @@ const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/ const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); +const u32 gObjectEventPic_OccaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/occa.4bpp"); +const u32 gObjectEventPic_YacheBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/yache.4bpp"); +const u32 gObjectEventPic_ChopleBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chople.4bpp"); +const u32 gObjectEventPic_KebiaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kebia.4bpp"); +const u32 gObjectEventPic_ShucaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/shuca.4bpp"); +const u32 gObjectEventPic_PayapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/payapa.4bpp"); +const u32 gObjectEventPic_TangaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tanga.4bpp"); +const u32 gObjectEventPic_KasibBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kasib.4bpp"); +const u32 gObjectEventPic_HabanBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/haban.4bpp"); +const u32 gObjectEventPic_ColburBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/colbur.4bpp"); +const u32 gObjectEventPic_RoseliBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/roseli.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 698d97a43..0d8b9d70a 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -154,52 +154,135 @@ 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_OldGateau[6] = { + [3] = ITEM3_STATUS_ALL, +}; + const u8 gItemEffect_SacredAsh[7] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [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] = ITEM10_IS_VITAMIN, }; -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] = ITEM10_IS_VITAMIN, }; -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] = ITEM10_IS_VITAMIN, }; -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] = ITEM10_IS_VITAMIN, }; -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] = ITEM10_IS_VITAMIN, +}; + +const u8 gItemEffect_Zinc[11] = { + [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, + [6] = 10, + [7] = 5, + [8] = 3, + [9] = 2, + [10] = ITEM10_IS_VITAMIN, +}; + +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] = { @@ -220,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, @@ -277,34 +352,21 @@ 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_SunStone[6] = { - [4] = ITEM4_EVO_STONE, +const u8 gItemEffect_XSpecialDefense[8] = { + [2] = 1, + [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, + [6] = 1, + [7] = 1, }; -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, }; @@ -433,6 +495,9 @@ 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_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, @@ -442,20 +507,31 @@ 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, [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack, - [ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend, + [ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefend, [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, - [ITEM_X_SPECIAL - 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_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, + [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, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 5f79efc57..a6d0ade8c 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -62,6 +62,79 @@ static const u8 sPremierBallDesc[] = _( "in commemoration\n" "of some event."); +static const u8 sLevelBallDesc[] = _( + "A Ball that works\n" + "well on lower\n" + "level POKéMON."); + +static const u8 sLureBallDesc[] = _( + "A Ball that works\n" + "well on fished\n" + "up POKéMON."); + +static const u8 sMoonBallDesc[] = _( + "A Ball that works\n" + "well on Moon\n" + "Stone users."); + +static const u8 sFriendBallDesc[] = _( + "A Ball that makes\n" + "a POKéMON friendly\n" + "when caught."); + +static const u8 sLoveBallDesc[] = _( + "Works well on\n" + "POKéMON of the\n" + "opposite gender."); + +static const u8 sHeavyBallDesc[] = _( + "Works well on\n" + "very heavy\n" + "POKéMON."); + +static const u8 sFastBallDesc[] = _( + "Works well on\n" + "very fast\n" + "POKéMON."); + +static const u8 sHealBallDesc[] = _( + "A remedial Ball\n" + "that restores\n" + "caught POKéMON."); + +static const u8 sQuickBallDesc[] = _( + "Works well if\n" + "used on the\n" + "first turn."); + +static const u8 sDuskBallDesc[] = _( + "Works well if\n" + "used in a\n" + "dark place."); + +static const u8 sCherishBallDesc[] = _( + "A rare Ball made\n" + "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" @@ -215,6 +288,21 @@ 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 sOldGateauDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one POKéMON."); + static const u8 sSacredAshDesc[] = _( "Fully revives and\n" "restores all\n" @@ -327,11 +415,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" @@ -353,6 +446,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" @@ -394,7 +491,63 @@ 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 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" @@ -435,6 +588,31 @@ 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."); + +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" @@ -707,11 +885,106 @@ 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" "to grow a mystery."); +static const u8 sOccaBerryDesc[] = _( + "A hold item that\n" + "weakens a Fire\n" + "move if weak to it."); + +static const u8 sPasshoBerryDesc[] = _( + "A hold item that\n" + "weakens a Water\n" + "move if weak to it."); + +static const u8 sWacanBerryDesc[] = _( + "A hold item that\n" + "weakens a Electric\n" + "move if weak to it."); + +static const u8 sRindoBerryDesc[] = _( + "A hold item that\n" + "weakens a Grass\n" + "move if weak to it."); + +static const u8 sYacheBerryDesc[] = _( + "A hold item that\n" + "weakens a Ice\n" + "move if weak to it."); + +static const u8 sChopleBerryDesc[] = _( + "A hold item that\n" + "weakens a Fighting\n" + "move if weak to it."); + +static const u8 sKebiaBerryDesc[] = _( + "A hold item that\n" + "weakens a Poison\n" + "move if weak to it."); + +static const u8 sShucaBerryDesc[] = _( + "A hold item that\n" + "weakens a Ground\n" + "move if weak to it."); + +static const u8 sCobaBerryDesc[] = _( + "A hold item that\n" + "weakens a Flying\n" + "move if weak to it."); + +static const u8 sPayapaBerryDesc[] = _( + "A hold item that\n" + "weakens a Psychic\n" + "move if weak to it."); + +static const u8 sTangaBerryDesc[] = _( + "A hold item that\n" + "weakens a Bug\n" + "move if weak to it."); + +static const u8 sChartiBerryDesc[] = _( + "A hold item that\n" + "weakens a Rock\n" + "move if weak to it."); + +static const u8 sKasibBerryDesc[] = _( + "A hold item that\n" + "weakens a Ghost\n" + "move if weak to it."); + +static const u8 sHabanBerryDesc[] = _( + "A hold item that\n" + "weakens a Dragon\n" + "move if weak to it."); + +static const u8 sColburBerryDesc[] = _( + "A hold item that\n" + "weakens a Dark\n" + "move if weak to it."); + +static const u8 sBabiriBerryDesc[] = _( + "A hold item that\n" + "weakens a Steel\n" + "move if weak to it."); + +static const u8 sChilanBerryDesc[] = _( + "A hold item that\n" + "weakens a Normal\n" + "move."); + +static const u8 sRoseliBerryDesc[] = _( + "A hold item that\n" + "weakens a Fairy\n" + "move if weak to it."); + // Hold items static const u8 sBrightPowderDesc[] = _( "A hold item that\n" @@ -828,6 +1101,61 @@ 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 sDubiousDiscDesc[] = _( + "A certain POKéMON\n" + "loves it. It's over-\n" + "flowing with data."); + +static const u8 sReaperClothDesc[] = _( + "Loved by a certain\n" + "POKéMON. 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 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" @@ -917,6 +1245,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" @@ -927,6 +1285,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" @@ -1449,6 +1842,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" @@ -1459,6 +1862,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" @@ -1549,3 +1972,824 @@ static const u8 sOldSeaMapDesc[] = _( "A faded sea chart\n" "that shows the way\n" "to a certain island."); + + // New items +static const u8 sWideLensDesc[] = _( + "A magnifying lens\n" + "that boosts the\n" + "accuracy of moves."); + +static const u8 sMuscleBandDesc[] = _( + "A headband that\n" + "boosts the power of\n" + "physical moves."); + +static const u8 sWiseGlassesDesc[] = _( + "A pair of glasses\n" + "that boosts the power\n" + "of special moves."); + +static const u8 sExpertBeltDesc[] = _( + "A belt that boosts\n" + "the power of super\n" + "effective moves."); + +static const u8 sLightClayDesc[] = _( + "Extends the duration\n" + "of barrier moves\n" + "used by the holder."); + +static const u8 sLifeOrbDesc[] = _( + "Boosts the power of\n" + "moves at the cost\n" + "of some HP per turn."); + +static const u8 sPowerHerbDesc[] = _( + "Allows the immediate\n" + "use of a move that\n" + "charges first."); + +static const u8 sToxicOrbDesc[] = _( + "A bizarre orb that\n" + "badly poisons the\n" + "holder in battle."); + +static const u8 sFlameOrbDesc[] = _( + "A bizarre orb that\n" + "inflicts a burn on\n" + "holder in battle."); + +static const u8 sQuickPowderDesc[] = _( + "An item to be held\n" + "by Ditto. This odd\n" + "powder boosts Speed."); + +static const u8 sFocusSashDesc[] = _( + "If the holder has\n" + "full HP, it endures\n" + "KO attacks with 1 HP."); + +static const u8 sZoomLensDesc[] = _( + "If the holder moves\n" + "after the foe, its\n" + "accuracy is boosted."); + +static const u8 sMetronomeDesc[] = _( + "A held item that\n" + "boosts a move used\n" + "consecutively."); + +static const u8 sIronBallDesc[] = _( + "Lowers Speed and\n" + "lets Flying-types be\n" + "hit by Ground moves."); + +static const u8 sLaggingTailDesc[] = _( + "A held item that\n" + "makes the holder\n" + "move slower."); + +static const u8 sDestinyKnotDesc[] = _( + "If the holder becomes\n" + "infatuated, the\n" + "foe does too."); + +static const u8 sBlackSludgeDesc[] = _( + "Gradually restores\n" + "HP of Poison-types.\n" + "Damages others."); + +static const u8 sIcyRockDesc[] = _( + "Extends the duration\n" + "of the move Hail\n" + "used by the holder."); + +static const u8 sSmoothRockDesc[] = _( + "Extends the duration\n" + "of Sandstorm if\n" + "used by the holder."); + +static const u8 sHeatRockDesc[] = _( + "Extends the duration\n" + "of Sunny Day if\n" + "used by the holder."); + +static const u8 sDampRockDesc[] = _( + "Extends the duration\n" + "of Rain Dance if\n" + "used by the holder."); + +static const u8 sGripClawDesc[] = _( + "Makes binding moves\n" + "used by the holder\n" + "go on for 7 turns."); + +static const u8 sChoiceScarfDesc[] = _( + "Boosts Speed, but\n" + "allows the use of\n" + "only one move."); + +static const u8 sStickyBarbDesc[] = _( + "Damages the holder\n" + "each turn. May latch\n" + "on to foes."); + +static const u8 sShedShellDesc[] = _( + "Enables the holder\n" + "to switch out of\n" + "battle without fail."); + +static const u8 sBigRootDesc[] = _( + "A held item that\n" + "boosts the power of\n" + "HP-stealing moves."); + +static const u8 sChoiceSpecsDesc[] = _( + "Boosts Sp. Atk, but\n" + "allows the use of\n" + "only one move."); + +static const u8 sAdamantOrbDesc[] = _( + "Boosts the power of\n" + "Dialga's Dragon and\n" + "Steel-type moves."); + +static const u8 sLustrousOrbDesc[] = _( + "Boosts the power of\n" + "Palkia's Dragon and\n" + "Water-type moves."); + +static const u8 sGriseousOrbDesc[] = _( + "Boosts the power of\n" + "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" + "Fire-type moves."); + +static const u8 sSplashPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Water-type moves."); + +static const u8 sZapPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Electric-type moves."); + +static const u8 sMeadowPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Grass-type moves."); + +static const u8 sIciclePlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Ice-type moves."); + +static const u8 sFistPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Fighting-type moves."); + +static const u8 sToxicPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Poison-type moves."); + +static const u8 sEarthPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Ground-type moves."); + +static const u8 sSkyPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Flying-type moves."); + +static const u8 sMindPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Psychic-type moves."); + +static const u8 sInsectPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Bug-type moves."); + +static const u8 sStonePlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Rock-type moves."); + +static const u8 sSpookyPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Ghost-type moves."); + +static const u8 sDracoPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Dragon-type moves."); + +static const u8 sDreadPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Dark-type moves."); + +static const u8 sIronPlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Steel-type moves."); + +static const u8 sEvioliteDesc[] = _( + "Raises the Def and\n" + "Sp. Def of Pokémon\n" + "that can evolve."); + +static const u8 sFloatStoneDesc[] = _( + "A light stone that\n" + "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[] = _( + "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" + "becomes Water type."); + +static const u8 sShockDriveDesc[] = _( + "Changes Genesect's\n" + "Techno Blast so it\n" + "becomes Electric type."); + +static const u8 sBurnDriveDesc[] = _( + "Changes Genesect's\n" + "Techno Blast so it\n" + "becomes Fire type."); + +static const u8 sChillDriveDesc[] = _( + "Changes Genesect's\n" + "Techno Blast so it\n" + "becomes Ice type."); + +static const u8 sFireGemDesc[] = _( + "Increases the\n" + "power of Fire\n" + "Type moves."); + +static const u8 sWaterGemDesc[] = _( + "Increases the\n" + "power of Water\n" + "Type moves."); + +static const u8 sElectricGemDesc[] = _( + "Increases the\n" + "power of Electric\n" + "Type moves."); + +static const u8 sGrassGemDesc[] = _( + "Increases the\n" + "power of Grass\n" + "Type moves."); + +static const u8 sIceGemDesc[] = _( + "Increases the\n" + "power of Ice\n" + "Type moves."); + +static const u8 sFightingGemDesc[] = _( + "Increases the\n" + "power of Fighting\n" + "Type moves."); + +static const u8 sPoisonGemDesc[] = _( + "Increases the\n" + "power of Poison\n" + "Type moves."); + +static const u8 sGroundGemDesc[] = _( + "Increases the\n" + "power of Ground\n" + "Type moves."); + +static const u8 sFlyingGemDesc[] = _( + "Increases the\n" + "power of Flying\n" + "Type moves."); + +static const u8 sPsychicGemDesc[] = _( + "Increases the\n" + "power of Psychic\n" + "Type moves."); + +static const u8 sBugGemDesc[] = _( + "Increases the\n" + "power of Bug\n" + "Type moves."); + +static const u8 sRockGemDesc[] = _( + "Increases the\n" + "power of Rock\n" + "Type moves."); + +static const u8 sGhostGemDesc[] = _( + "Increases the\n" + "power of Ghost\n" + "Type moves."); + +static const u8 sDragonGemDesc[] = _( + "Increases the\n" + "power of Dragon\n" + "Type moves."); + +static const u8 sDarkGemDesc[] = _( + "Increases the\n" + "power of Dark\n" + "Type moves."); + +static const u8 sSteelGemDesc[] = _( + "Increases the\n" + "power of Steel\n" + "Type moves."); + +static const u8 sNormalGemDesc[] = _( + "Increases the\n" + "power of Normal\n" + "Type moves."); + +static const u8 sFairyGemDesc[] = _( + "Increases the\n" + "power of Fairy\n" + "Type moves."); + +static const u8 sAssaultVestDesc[] = _( + "Raises Sp. Def but\n" + "prevents the use\n" + "of status moves."); + +static const u8 sPixiePlateDesc[] = _( + "A stone tablet that\n" + "boosts the power of\n" + "Fairy-type moves."); + +static const u8 sSafetyGogglesDesc[] = _( + "Protect from\n" + "weather damage and\n" + "powder moves."); + +static const u8 sGengariteDesc[] = _( + "This stone enables\n" + "Gengar to Mega\n" + "Evolve in battle."); + +static const u8 sGardevoiriteDesc[] = _( + "This stone enables\n" + "Gardevoir to Mega\n" + "Evolve in battle."); + +static const u8 sAmpharositeDesc[] = _( + "This stone enables\n" + "Ampharos to Mega\n" + "Evolve in battle."); + +static const u8 sVenusauriteDesc[] = _( + "This stone enables\n" + "Venusaur to Mega\n" + "Evolve in battle."); + +static const u8 sCharizarditeDesc[] = _( + "This stone enables\n" + "Charizard to Mega\n" + "Evolve in battle."); + +static const u8 sBlastoisiniteDesc[] = _( + "This stone enables\n" + "Blastoise to Mega\n" + "Evolve in battle."); + +static const u8 sMewtwoniteDesc[] = _( + "This stone enables\n" + "Mewtwo to Mega\n" + "Evolve in battle."); + +static const u8 sBlazikeniteDesc[] = _( + "This stone enables\n" + "Blaziken to Mega\n" + "Evolve in battle."); + +static const u8 sMedichamiteDesc[] = _( + "This stone enables\n" + "Medicham to Mega\n" + "Evolve in battle."); + +static const u8 sHoundoominiteDesc[] = _( + "This stone enables\n" + "Houndoom to Mega\n" + "Evolve in battle."); + +static const u8 sAggroniteDesc[] = _( + "This stone enables\n" + "Aggron to Mega\n" + "Evolve in battle."); + +static const u8 sBanettiteDesc[] = _( + "This stone enables\n" + "Banette to Mega\n" + "Evolve in battle."); + +static const u8 sTyranitariteDesc[] = _( + "This stone enables\n" + "Tyranitar to Mega\n" + "Evolve in battle."); + +static const u8 sScizoriteDesc[] = _( + "This stone enables\n" + "Scizor to Mega\n" + "Evolve in battle."); + +static const u8 sPinsiriteDesc[] = _( + "This stone enables\n" + "Pinsir to Mega\n" + "Evolve in battle."); + +static const u8 sAerodactyliteDesc[] = _( + "This stone enables\n" + "Aerodactyl to Mega\n" + "Evolve in battle."); + +static const u8 sLucarioniteDesc[] = _( + "This stone enables\n" + "Lucario to Mega\n" + "Evolve in battle."); + +static const u8 sAbomasiteDesc[] = _( + "This stone enables\n" + "Abomasnow to Mega\n" + "Evolve in battle."); + +static const u8 sKangaskhaniteDesc[] = _( + "This stone enables\n" + "Kangaskhan to Mega\n" + "Evolve in battle."); + +static const u8 sGyaradositeDesc[] = _( + "This stone enables\n" + "Gyarados to Mega\n" + "Evolve in battle."); + +static const u8 sAbsoliteDesc[] = _( + "This stone enables\n" + "Absol to Mega\n" + "Evolve in battle."); + +static const u8 sAlakaziteDesc[] = _( + "This stone enables\n" + "Alakazam to Mega\n" + "Evolve in battle."); + +static const u8 sHeracroniteDesc[] = _( + "This stone enables\n" + "Heracross to Mega\n" + "Evolve in battle."); + +static const u8 sMawiliteDesc[] = _( + "This stone enables\n" + "Mawile to Mega\n" + "Evolve in battle."); + +static const u8 sManectiteDesc[] = _( + "This stone enables\n" + "Manectric to Mega\n" + "Evolve in battle."); + +static const u8 sGarchompiteDesc[] = _( + "This stone enables\n" + "Garchomp to Mega\n" + "Evolve in battle."); + +static const u8 sLatiasiteDesc[] = _( + "This stone enables\n" + "Latias to Mega\n" + "Evolve in battle."); + +static const u8 sLatiositeDesc[] = _( + "This stone enables\n" + "Latios to Mega\n" + "Evolve in battle."); + +static const u8 sSwampertiteDesc[] = _( + "This stone enables\n" + "Swampert to Mega\n" + "Evolve in battle."); + +static const u8 sSceptiliteDesc[] = _( + "This stone enables\n" + "Sceptile to Mega\n" + "Evolve in battle."); + +static const u8 sSableniteDesc[] = _( + "This stone enables\n" + "Sableye to Mega\n" + "Evolve in battle."); + +static const u8 sAltarianiteDesc[] = _( + "This stone enables\n" + "Altaria to Mega\n" + "Evolve in battle."); + +static const u8 sGalladiteDesc[] = _( + "This stone enables\n" + "Gallade to Mega\n" + "Evolve in battle."); + +static const u8 sAudiniteDesc[] = _( + "This stone enables\n" + "Audino to Mega\n" + "Evolve in battle."); + +static const u8 sMetagrossiteDesc[] = _( + "This stone enables\n" + "Metagross to Mega\n" + "Evolve in battle."); + +static const u8 sSharpedoniteDesc[] = _( + "This stone enables\n" + "Sharpedo to Mega\n" + "Evolve in battle."); + +static const u8 sSlowbroniteDesc[] = _( + "This stone enables\n" + "Slowbro to Mega\n" + "Evolve in battle."); + +static const u8 sSteelixiteDesc[] = _( + "This stone enables\n" + "Steelix to Mega\n" + "Evolve in battle."); + +static const u8 sPidgeotiteDesc[] = _( + "This stone enables\n" + "Pidgeot to Mega\n" + "Evolve in battle."); + +static const u8 sGlalititeDesc[] = _( + "This stone enables\n" + "Glalie to Mega\n" + "Evolve in battle."); + +static const u8 sDianciteDesc[] = _( + "This stone enables\n" + "Diancie to Mega\n" + "Evolve in battle."); + +static const u8 sCameruptiteDesc[] = _( + "This stone enables\n" + "Camerupt to Mega\n" + "Evolve in battle."); + +static const u8 sLopunniteDesc[] = _( + "This stone enables\n" + "Lopunny to Mega\n" + "Evolve in battle."); + +static const u8 sSalamenciteDesc[] = _( + "This stone enables\n" + "Salamence to Mega\n" + "Evolve in battle."); + +static const u8 sBeedrilliteDesc[] = _( + "This stone enables\n" + "Beedrill to Mega\n" + "Evolve in battle."); + +static const u8 sMegaBraceletDesc[] = _( + "Allows Pokémon holding\n" + "a Mega Stone to Mega\n" + "Evolve in battle."); + +static const u8 sProtectPadsDesc[] = _( + "Guard the holder\n" + "from contact move\n" + "effects."); + +static const u8 sTerrainExtenderDesc[] = _( + "Extends the length\n" + "of the active\n" + "battle terrain."); + +static const u8 sElectricSeedDesc[] = _( + "Boosts Defense on\n" + "Electric Terrain,\n" + "but only one time."); + +static const u8 sGrassySeedDesc[] = _( + "Boosts Defense on\n" + "Grassy Terrain,\n" + "but only one time."); + +static const u8 sMistySeedDesc[] = _( + "Boosts Sp. Def. on\n" + "Misty Terrain,\n" + "but only one time."); + +static const u8 sPsychicSeedDesc[] = _( + "Boosts Sp. Def. on\n" + "Psychic Terrain,\n" + "but only one time."); + +static const u8 sAdrenalineOrbDesc[] = _( + "Boosts Speed if the\n" + "user is intimidated,\n" + "but only one time."); + +static const u8 sHoneyDesc[] = _( + "A sweet honey that\n" + "attracts wild Pokémon\n" + "in grass or on trees."); + +static const u8 sHealthWingDesc[] = _( + "An item that raises\n" + "the base HP of\n" + "a POKéMON."); + +static const u8 sMuscleWingDesc[] = _( + "An item that raises\n" + "the base ATTACK of\n" + "a POKéMON."); + +static const u8 sResistWingDesc[] = _( + "An item that raises\n" + "the base DEFENSE\n" + "of a POKéMON."); + +static const u8 sGeniusWingDesc[] = _( + "An item that raises\n" + "the base SP. ATK.\n" + "of a POKéMON."); + +static const u8 sCleverWingDesc[] = _( + "An item that raises\n" + "the base SP. DEF.\n" + "of a POKéMON."); + +static const u8 sSwiftWingDesc[] = _( + "An item that raises\n" + "the base SPEED of\n" + "a POKéMON."); + +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/item_menu_icons.c b/src/item_menu_icons.c index cc51236c8..7e9ce0bc5 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -355,6 +355,30 @@ static const struct CompressedTilesPal sBerryPicTable[] = [ITEM_TO_BERRY(ITEM_LANSAT_BERRY) - 1] = {gBerryPic_Lansat, gBerryPalette_Lansat}, [ITEM_TO_BERRY(ITEM_STARF_BERRY) - 1] = {gBerryPic_Starf, gBerryPalette_Starf}, [ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma}, + [ITEM_TO_BERRY(ITEM_OCCA_BERRY) - 1] = {gBerryPic_Occa, gBerryPalette_Occa}, + [ITEM_TO_BERRY(ITEM_PASSHO_BERRY) - 1] = {gBerryPic_Passho, gBerryPalette_Passho}, + [ITEM_TO_BERRY(ITEM_WACAN_BERRY) - 1] = {gBerryPic_Wacan, gBerryPalette_Wacan}, + [ITEM_TO_BERRY(ITEM_RINDO_BERRY) - 1] = {gBerryPic_Rindo, gBerryPalette_Rindo}, + [ITEM_TO_BERRY(ITEM_YACHE_BERRY) - 1] = {gBerryPic_Yache, gBerryPalette_Yache}, + [ITEM_TO_BERRY(ITEM_CHOPLE_BERRY) - 1] = {gBerryPic_Chople, gBerryPalette_Chople}, + [ITEM_TO_BERRY(ITEM_KEBIA_BERRY) - 1] = {gBerryPic_Kebia, gBerryPalette_Kebia}, + [ITEM_TO_BERRY(ITEM_SHUCA_BERRY) - 1] = {gBerryPic_Shuca, gBerryPalette_Shuca}, + [ITEM_TO_BERRY(ITEM_COBA_BERRY) - 1] = {gBerryPic_Coba, gBerryPalette_Coba}, + [ITEM_TO_BERRY(ITEM_PAYAPA_BERRY) - 1] = {gBerryPic_Payapa, gBerryPalette_Payapa}, + [ITEM_TO_BERRY(ITEM_TANGA_BERRY) - 1] = {gBerryPic_Tanga, gBerryPalette_Tanga}, + [ITEM_TO_BERRY(ITEM_CHARTI_BERRY) - 1] = {gBerryPic_Charti, gBerryPalette_Charti}, + [ITEM_TO_BERRY(ITEM_KASIB_BERRY) - 1] = {gBerryPic_Kasib, gBerryPalette_Kasib}, + [ITEM_TO_BERRY(ITEM_HABAN_BERRY) - 1] = {gBerryPic_Haban, gBerryPalette_Haban}, + [ITEM_TO_BERRY(ITEM_COLBUR_BERRY) - 1] = {gBerryPic_Colbur, gBerryPalette_Colbur}, + [ITEM_TO_BERRY(ITEM_BABIRI_BERRY) - 1] = {gBerryPic_Babiri, gBerryPalette_Babiri}, + [ITEM_TO_BERRY(ITEM_CHILAN_BERRY) - 1] = {gBerryPic_Chilan, gBerryPalette_Chilan}, + [ITEM_TO_BERRY(ITEM_ROSELI_BERRY) - 1] = {gBerryPic_Roseli, gBerryPalette_Roseli}, + [ITEM_TO_BERRY(ITEM_MICLE_BERRY) - 1] = {}, + [ITEM_TO_BERRY(ITEM_CUSTAP_BERRY) - 1] = {}, + [ITEM_TO_BERRY(ITEM_JABOCA_BERRY) - 1] = {}, + [ITEM_TO_BERRY(ITEM_ROWAP_BERRY) - 1] = {}, + [ITEM_TO_BERRY(ITEM_KEE_BERRY) - 1] = {}, + [ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {}, }; const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet = diff --git a/src/item_use.c b/src/item_use.c index f9d1ff824..1f223c627 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -746,6 +746,12 @@ void ItemUseOutOfBattle_Medicine(u8 taskId) SetUpItemUseCallback(taskId); } +void ItemUseOutOfBattle_AbilityCapsule(u8 taskId) +{ + gItemUseCB = ItemUseCB_AbilityCapsule; + SetUpItemUseCallback(taskId); +} + void ItemUseOutOfBattle_ReduceEV(u8 taskId) { gItemUseCB = ItemUseCB_ReduceEV; diff --git a/src/party_menu.c b/src/party_menu.c index 1d4952375..d5581cbd7 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4383,6 +4383,106 @@ 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) + { + gPartyMenuUseExitCallback = FALSE; + PlaySE(SE_SELECT); + DisplayPartyMenuMessage(gText_WontHaveEffect, 1); + ScheduleBgCopyTilemapToVram(2); + gTasks[taskId].func = Task_ClosePartyMenuAfterText; + return; + } + gPartyMenuUseExitCallback = TRUE; + GetMonNickname(&gPlayerParty[tMonId], gStringVar1); + StringCopy(gStringVar2, gAbilityNames[GetAbilityBySpecies(tSpecies, tAbilityNum)]); + StringExpandPlaceholders(gStringVar4, askText); + PlaySE(SE_SELECT); + DisplayPartyMenuMessage(gStringVar4, 1); + ScheduleBgCopyTilemapToVram(2); + tState++; + break; + case 1: + if (!IsPartyMenuTextPrinterActive()) + { + PartyMenuDisplayYesNoMenu(); + tState++; + } + break; + case 2: + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case 0: + tState++; + break; + case 1: + case MENU_B_PRESSED: + gPartyMenuUseExitCallback = FALSE; + PlaySE(SE_SELECT); + ScheduleBgCopyTilemapToVram(2); + // Don't exit party selections screen, return to choosing a mon. + ClearStdWindowAndFrameToTransparent(6, 0); + ClearWindowTilemap(6); + DisplayPartyMenuStdMessage(5); + gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tOldFunc); + return; + } + break; + case 3: + PlaySE(SE_USE_ITEM); + StringExpandPlaceholders(gStringVar4, doneText); + DisplayPartyMenuMessage(gStringVar4, 1); + ScheduleBgCopyTilemapToVram(2); + tState++; + break; + case 4: + if (!IsPartyMenuTextPrinterActive()) + tState++; + break; + case 5: + SetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, &tAbilityNum); + RemoveBagItem(gSpecialVar_ItemId, 1); + gTasks[taskId].func = Task_ClosePartyMenu; + break; + } +} + +void ItemUseCB_AbilityCapsule(u8 taskId, TaskFunc task) +{ + s16 *data = gTasks[taskId].data; + + tState = 0; + tMonId = gPartyMenu.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; +} + +#undef tState +#undef tSpecies +#undef tAbilityNum +#undef tMonId +#undef tOldFunc + static void Task_DisplayHPRestoredMessage(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); diff --git a/src/pokeball.c b/src/pokeball.c index 92081a296..65081cea2 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -58,6 +58,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] = { @@ -73,6 +88,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] = @@ -89,6 +119,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 = @@ -314,6 +359,141 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, + { + .tileTag = GFX_TAG_LEVELBALL, + .paletteTag = GFX_TAG_LEVELBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_LUREBALL, + .paletteTag = GFX_TAG_LUREBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_MOONBALL, + .paletteTag = GFX_TAG_MOONBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_FRIENDBALL, + .paletteTag = GFX_TAG_FRIENDBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_LOVEBALL, + .paletteTag = GFX_TAG_LOVEBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_HEAVYBALL, + .paletteTag = GFX_TAG_HEAVYBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_FASTBALL, + .paletteTag = GFX_TAG_FASTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_SPORTBALL, + .paletteTag = GFX_TAG_SPORTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_DUSKBALL, + .paletteTag = GFX_TAG_DUSKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_QUICKBALL, + .paletteTag = GFX_TAG_QUICKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_HEALBALL, + .paletteTag = GFX_TAG_HEALBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_CHERISHBALL, + .paletteTag = GFX_TAG_CHERISHBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_PARKBALL, + .paletteTag = GFX_TAG_PARKBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_DREAMBALL, + .paletteTag = GFX_TAG_DREAMBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, + { + .tileTag = GFX_TAG_BEASTBALL, + .paletteTag = GFX_TAG_BEASTBALL, + .oam = &sBallOamData, + .anims = sBallAnimSequences, + .images = NULL, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_TestBallThrow, + }, }; #define tFrames data[0] @@ -1249,11 +1429,13 @@ void LoadBallGfx(u8 ballId) LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); } + switch (ballId) { case BALL_DIVE: case BALL_LUXURY: case BALL_PREMIER: + case BALL_LEVEL ... POKEBALL_COUNT: break; default: var = GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag); diff --git a/src/pokemon.c b/src/pokemon.c index 7d384de3d..abc6e21c3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2203,8 +2203,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 { @@ -2225,8 +2223,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); @@ -3843,7 +3854,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; @@ -4217,7 +4228,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: @@ -4641,7 +4652,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; @@ -4849,11 +4860,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= EV_ITEM_RAISE_LIMIT) + + if (itemEffect[10] & ITEM10_IS_VITAMIN) + evCap = EV_ITEM_RAISE_LIMIT; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT) - r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2; @@ -5053,11 +5070,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= EV_ITEM_RAISE_LIMIT) + + if (itemEffect[10] & ITEM10_IS_VITAMIN) + evCap = EV_ITEM_RAISE_LIMIT; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT) - r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 9f81a3b3e..6ef4987f2 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" @@ -755,6 +756,7 @@ void FishingWildEncounter(u8 rod) } IncrementGameStat(GAME_STAT_FISHING_CAPTURES); SetPokemonAnglerSpecies(species); + gIsFishingEncounter = TRUE; BattleSetup_StartWildBattle(); }