diff --git a/graphics/items/icon_palettes/ability_patch.pal b/graphics/items/icon_palettes/ability_patch.pal new file mode 100644 index 0000000000..425bc27707 --- /dev/null +++ b/graphics/items/icon_palettes/ability_patch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +144 0 152 +49 49 49 +88 68 16 +100 112 104 +80 160 176 +131 183 183 +184 186 180 +192 192 120 +115 211 211 +139 226 255 +240 218 64 +222 224 217 +168 242 248 +246 242 246 +240 252 176 +255 255 255 diff --git a/graphics/items/icon_palettes/amaze_mulch.pal b/graphics/items/icon_palettes/amaze_mulch.pal new file mode 100644 index 0000000000..72ef8b7a9e --- /dev/null +++ b/graphics/items/icon_palettes/amaze_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 56 48 +248 144 104 +240 232 168 +240 240 240 +216 216 216 +184 184 184 +144 136 128 +48 48 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/armorite_ore.pal b/graphics/items/icon_palettes/armorite_ore.pal new file mode 100644 index 0000000000..e2b7be97a9 --- /dev/null +++ b/graphics/items/icon_palettes/armorite_ore.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 224 248 +248 184 248 +248 152 248 +224 120 248 +224 88 248 +176 88 200 +136 64 152 +48 48 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/balm_mushroom.pal b/graphics/items/icon_palettes/balm_mushroom.pal new file mode 100644 index 0000000000..7802b4b8d5 --- /dev/null +++ b/graphics/items/icon_palettes/balm_mushroom.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 248 248 +208 232 208 +152 200 152 +248 248 80 +224 200 8 +248 200 96 +240 152 40 +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/berry_sweet.pal b/graphics/items/icon_palettes/berry_sweet.pal new file mode 100644 index 0000000000..3b2f149013 --- /dev/null +++ b/graphics/items/icon_palettes/berry_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +144 200 224 +40 152 232 +0 104 184 +8 88 144 +0 72 128 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/big_nugget.pal b/graphics/items/icon_palettes/big_nugget.pal new file mode 100644 index 0000000000..5349531891 --- /dev/null +++ b/graphics/items/icon_palettes/big_nugget.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 232 96 +248 208 72 +208 172 72 +200 152 56 +152 112 16 +248 248 232 +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/blue_mint.pal b/graphics/items/icon_palettes/blue_mint.pal new file mode 100644 index 0000000000..6eb4f9b5b1 --- /dev/null +++ b/graphics/items/icon_palettes/blue_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +168 176 248 +128 144 248 +96 120 248 +64 88 240 +40 56 176 +16 40 200 +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 diff --git a/graphics/items/icon_palettes/blunder_policy.pal b/graphics/items/icon_palettes/blunder_policy.pal new file mode 100644 index 0000000000..9e29d88f54 --- /dev/null +++ b/graphics/items/icon_palettes/blunder_policy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 216 +216 216 104 +192 184 0 +232 152 152 +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 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/boost_mulch.pal b/graphics/items/icon_palettes/boost_mulch.pal new file mode 100644 index 0000000000..f116faf59d --- /dev/null +++ b/graphics/items/icon_palettes/boost_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +208 232 248 +160 160 248 +112 96 232 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/bottle_cap.pal b/graphics/items/icon_palettes/bottle_cap.pal new file mode 100644 index 0000000000..412b2967ba --- /dev/null +++ b/graphics/items/icon_palettes/bottle_cap.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +232 232 232 +216 216 224 +184 192 200 +144 152 176 +106 123 148 +88 96 120 +88 112 160 +72 88 120 +48 48 48 +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/casteliacone.pal b/graphics/items/icon_palettes/casteliacone.pal new file mode 100644 index 0000000000..438dff0441 --- /dev/null +++ b/graphics/items/icon_palettes/casteliacone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 248 +180 224 240 +96 192 224 +16 152 200 +248 208 72 +208 176 72 +184 112 0 +48 48 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/catching_charm.pal b/graphics/items/icon_palettes/catching_charm.pal new file mode 100644 index 0000000000..0f0db7606d --- /dev/null +++ b/graphics/items/icon_palettes/catching_charm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 128 +48 48 48 +232 232 248 +184 184 184 +104 176 248 +80 232 200 +60 172 150 +32 144 152 +40 112 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/clover_sweet.pal b/graphics/items/icon_palettes/clover_sweet.pal new file mode 100644 index 0000000000..31392277f9 --- /dev/null +++ b/graphics/items/icon_palettes/clover_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 0 +152 200 96 +112 152 72 +88 136 56 +72 104 56 +8 104 64 +8 72 48 +56 72 32 +48 48 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/comet_shard.pal b/graphics/items/icon_palettes/comet_shard.pal new file mode 100644 index 0000000000..fcd9d28040 --- /dev/null +++ b/graphics/items/icon_palettes/comet_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 248 248 +200 224 232 +128 176 232 +96 144 224 +72 80 184 +64 56 120 +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/damp_mulch.pal b/graphics/items/icon_palettes/damp_mulch.pal new file mode 100644 index 0000000000..97d72c330e --- /dev/null +++ b/graphics/items/icon_palettes/damp_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +200 224 224 +144 184 192 +64 152 200 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/dna_splicers.pal b/graphics/items/icon_palettes/dna_splicers.pal new file mode 100644 index 0000000000..3a6253c2df --- /dev/null +++ b/graphics/items/icon_palettes/dna_splicers.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 224 128 +168 152 72 +120 112 80 +248 248 248 +200 208 224 +176 184 208 +120 128 152 +88 96 112 +80 80 88 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dynamax_band.pal b/graphics/items/icon_palettes/dynamax_band.pal new file mode 100644 index 0000000000..ca35dc19e1 --- /dev/null +++ b/graphics/items/icon_palettes/dynamax_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 0 +248 248 224 +224 224 200 +192 192 168 +160 160 128 +96 104 96 +80 80 80 +172 224 248 +120 168 240 +48 96 176 +32 64 120 +248 96 96 +192 40 40 +40 40 40 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dynamax_candy.pal b/graphics/items/icon_palettes/dynamax_candy.pal new file mode 100644 index 0000000000..743ea9e6d1 --- /dev/null +++ b/graphics/items/icon_palettes/dynamax_candy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 248 +248 216 224 +248 176 192 +240 88 128 +192 16 56 +128 16 40 +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/dynite_ore.pal b/graphics/items/icon_palettes/dynite_ore.pal new file mode 100644 index 0000000000..6bf3b35bca --- /dev/null +++ b/graphics/items/icon_palettes/dynite_ore.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 224 224 +248 192 232 +248 160 152 +248 120 144 +248 80 96 +200 96 104 +160 64 72 +128 40 56 +48 24 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/eject_pack.pal b/graphics/items/icon_palettes/eject_pack.pal new file mode 100644 index 0000000000..36657d8642 --- /dev/null +++ b/graphics/items/icon_palettes/eject_pack.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +232 232 248 +200 216 216 +184 192 192 +128 136 136 +104 112 112 +80 80 80 +48 48 48 +224 144 144 +224 80 88 +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/exp_candies.pal b/graphics/items/icon_palettes/exp_candies.pal new file mode 100644 index 0000000000..7e669d6f43 --- /dev/null +++ b/graphics/items/icon_palettes/exp_candies.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 248 +240 248 248 +192 240 248 +144 240 248 +96 192 208 +80 112 120 +8 144 156 +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/exp_charm.pal b/graphics/items/icon_palettes/exp_charm.pal new file mode 100644 index 0000000000..f12330d366 --- /dev/null +++ b/graphics/items/icon_palettes/exp_charm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 192 +248 232 232 +248 160 160 +248 120 120 +136 216 248 +80 176 248 +104 136 160 +59 95 126 +48 48 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/flower_sweet.pal b/graphics/items/icon_palettes/flower_sweet.pal new file mode 100644 index 0000000000..983cbf3f1b --- /dev/null +++ b/graphics/items/icon_palettes/flower_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 174 201 +248 248 176 +248 232 88 +248 208 0 +240 120 40 +208 96 24 +192 80 8 +112 40 0 +48 48 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/fossilized_bird.pal b/graphics/items/icon_palettes/fossilized_bird.pal new file mode 100644 index 0000000000..8472a03732 --- /dev/null +++ b/graphics/items/icon_palettes/fossilized_bird.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 217 234 +248 224 184 +232 192 112 +200 144 36 +168 112 0 +152 96 24 +181 135 83 +128 80 64 +216 160 56 +96 48 32 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fossilized_dino.pal b/graphics/items/icon_palettes/fossilized_dino.pal new file mode 100644 index 0000000000..464586af96 --- /dev/null +++ b/graphics/items/icon_palettes/fossilized_dino.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +34 177 76 +216 216 248 +184 184 232 +144 144 232 +120 120 184 +80 80 152 +48 48 96 +96 88 144 +48 48 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/fossilized_drake.pal b/graphics/items/icon_palettes/fossilized_drake.pal new file mode 100644 index 0000000000..1c1eb5b536 --- /dev/null +++ b/graphics/items/icon_palettes/fossilized_drake.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 192 +152 216 248 +96 184 224 +72 168 216 +48 144 200 +40 104 136 +16 72 96 +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/fossilized_fish.pal b/graphics/items/icon_palettes/fossilized_fish.pal new file mode 100644 index 0000000000..d36dcaf061 --- /dev/null +++ b/graphics/items/icon_palettes/fossilized_fish.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 192 248 +192 224 160 +144 184 120 +104 136 80 +80 112 64 +56 80 48 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/galarica_item.pal b/graphics/items/icon_palettes/galarica_item.pal new file mode 100644 index 0000000000..6f003b1f86 --- /dev/null +++ b/graphics/items/icon_palettes/galarica_item.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +182 139 54 +160 115 65 +116 91 61 +86 68 43 +54 46 27 +205 184 24 +115 167 18 +39 128 20 +20 90 18 +255 153 104 +252 122 46 +221 83 27 +151 54 13 +48 48 48 +0 0 0 diff --git a/graphics/items/icon_palettes/gold_bottle_cap.pal b/graphics/items/icon_palettes/gold_bottle_cap.pal new file mode 100644 index 0000000000..2420b2d4c7 --- /dev/null +++ b/graphics/items/icon_palettes/gold_bottle_cap.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 240 176 +248 232 72 +220 192 80 +200 168 80 +184 128 72 +160 104 64 +168 120 72 +152 104 64 +48 48 48 +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/gooey_mulch.pal b/graphics/items/icon_palettes/gooey_mulch.pal new file mode 100644 index 0000000000..7750074477 --- /dev/null +++ b/graphics/items/icon_palettes/gooey_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +176 80 184 +200 152 200 +240 216 216 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/green_mint.pal b/graphics/items/icon_palettes/green_mint.pal new file mode 100644 index 0000000000..fe469885c3 --- /dev/null +++ b/graphics/items/icon_palettes/green_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +180 240 144 +152 240 128 +104 200 96 +72 144 64 +56 112 56 +32 68 32 +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 diff --git a/graphics/items/icon_palettes/growth_mulch.pal b/graphics/items/icon_palettes/growth_mulch.pal new file mode 100644 index 0000000000..f00cd93068 --- /dev/null +++ b/graphics/items/icon_palettes/growth_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 232 152 +168 216 120 +48 200 64 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/heavy_duty_boots.pal b/graphics/items/icon_palettes/heavy_duty_boots.pal new file mode 100644 index 0000000000..8ec7b2d4a5 --- /dev/null +++ b/graphics/items/icon_palettes/heavy_duty_boots.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 128 +216 216 216 +160 160 160 +128 128 128 +104 104 104 +96 96 96 +80 80 80 +64 64 64 +48 48 48 +232 176 176 +168 128 128 +136 96 96 +240 80 80 +176 80 80 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/jade_orb.pal b/graphics/items/icon_palettes/jade_orb.pal new file mode 100644 index 0000000000..6233744446 --- /dev/null +++ b/graphics/items/icon_palettes/jade_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 192 248 +232 248 232 +156 224 172 +104 192 128 +56 160 88 +24 120 64 +0 80 48 +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/key_stone.pal b/graphics/items/icon_palettes/key_stone.pal new file mode 100644 index 0000000000..3d1bbddb92 --- /dev/null +++ b/graphics/items/icon_palettes/key_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 224 24 +80 208 16 +48 156 8 +16 104 0 +96 232 248 +56 184 216 +56 152 240 +16 128 172 +32 104 200 +8 56 152 +248 248 248 +248 216 248 +248 160 240 +80 64 152 +48 48 48 diff --git a/graphics/items/icon_palettes/light_blue_mint.pal b/graphics/items/icon_palettes/light_blue_mint.pal new file mode 100644 index 0000000000..61fd696664 --- /dev/null +++ b/graphics/items/icon_palettes/light_blue_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +180 224 240 +136 208 232 +40 184 224 +0 168 224 +40 120 152 +0 64 104 +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 diff --git a/graphics/items/icon_palettes/love_sweet.pal b/graphics/items/icon_palettes/love_sweet.pal new file mode 100644 index 0000000000..a00aa2de97 --- /dev/null +++ b/graphics/items/icon_palettes/love_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 242 0 +248 216 224 +248 168 168 +248 136 136 +232 112 112 +216 88 88 +200 64 64 +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/lumiose_galette.pal b/graphics/items/icon_palettes/lumiose_galette.pal new file mode 100644 index 0000000000..512c889b0d --- /dev/null +++ b/graphics/items/icon_palettes/lumiose_galette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +48 48 48 +208 144 64 +176 120 56 +128 96 40 +164 80 32 +144 64 24 +120 56 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 diff --git a/graphics/items/icon_palettes/lure.pal b/graphics/items/icon_palettes/lure.pal new file mode 100644 index 0000000000..2ab68a6b0c --- /dev/null +++ b/graphics/items/icon_palettes/lure.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 128 +248 248 248 +240 240 248 +232 232 232 +192 200 216 +136 164 172 +88 120 136 +56 96 104 +216 248 200 +144 232 144 +88 216 88 +56 176 80 +48 128 64 +48 48 48 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/max_honey.pal b/graphics/items/icon_palettes/max_honey.pal new file mode 100644 index 0000000000..e0847c632c --- /dev/null +++ b/graphics/items/icon_palettes/max_honey.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 200 216 +248 40 96 +184 56 80 +248 216 200 +248 96 96 +248 96 128 +180 48 80 +48 48 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/max_lure.pal b/graphics/items/icon_palettes/max_lure.pal new file mode 100644 index 0000000000..fd954d5721 --- /dev/null +++ b/graphics/items/icon_palettes/max_lure.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 128 +248 248 248 +255 255 189 +255 230 65 +230 189 49 +197 139 41 +164 90 32 +139 57 24 +255 205 222 +238 139 172 +222 82 123 +205 57 57 +139 41 49 +48 48 48 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/max_mushrooms.pal b/graphics/items/icon_palettes/max_mushrooms.pal new file mode 100644 index 0000000000..143b1f12d2 --- /dev/null +++ b/graphics/items/icon_palettes/max_mushrooms.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 192 208 +248 184 200 +248 160 176 +232 112 152 +192 64 128 +48 48 48 +248 80 104 +248 48 56 +176 48 64 +176 24 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mega_ring.pal b/graphics/items/icon_palettes/mega_ring.pal new file mode 100644 index 0000000000..a45829d72d --- /dev/null +++ b/graphics/items/icon_palettes/mega_ring.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +157 187 97 +49 49 50 +131 137 137 +89 89 89 +65 65 66 +54 53 52 +113 113 121 +51 51 51 +89 89 105 +67 67 69 +57 55 53 +91 91 91 +67 67 67 +115 115 122 +91 91 107 +131 139 139 diff --git a/graphics/items/icon_palettes/n_lunarizer.pal b/graphics/items/icon_palettes/n_lunarizer.pal new file mode 100644 index 0000000000..a8c12d9751 --- /dev/null +++ b/graphics/items/icon_palettes/n_lunarizer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 232 232 +176 176 184 +128 128 128 +88 88 88 +48 48 48 +32 176 240 +16 120 200 +240 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/n_solarizer.pal b/graphics/items/icon_palettes/n_solarizer.pal new file mode 100644 index 0000000000..b7e5ef7b48 --- /dev/null +++ b/graphics/items/icon_palettes/n_solarizer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 232 232 +176 176 184 +128 128 128 +88 88 88 +48 48 48 +240 152 64 +32 176 240 +184 96 40 +240 104 64 +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/pearl_string.pal b/graphics/items/icon_palettes/pearl_string.pal new file mode 100644 index 0000000000..b754262ce7 --- /dev/null +++ b/graphics/items/icon_palettes/pearl_string.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 248 0 +248 248 248 +232 232 232 +192 192 192 +168 168 168 +248 248 200 +176 232 224 +152 208 200 +120 144 144 +216 172 172 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pewter_crunchies.pal b/graphics/items/icon_palettes/pewter_crunchies.pal new file mode 100644 index 0000000000..282a5cff3f --- /dev/null +++ b/graphics/items/icon_palettes/pewter_crunchies.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +192 248 248 +248 248 232 +248 240 192 +248 216 96 +216 164 48 +200 232 112 +144 216 40 +80 160 64 +72 104 72 +224 200 176 +192 176 144 +120 120 120 +176 144 72 +144 104 24 +72 48 0 +48 48 48 diff --git a/graphics/items/icon_palettes/pink_mint.pal b/graphics/items/icon_palettes/pink_mint.pal new file mode 100644 index 0000000000..64cc312e07 --- /dev/null +++ b/graphics/items/icon_palettes/pink_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +232 200 224 +248 168 208 +248 128 192 +232 80 168 +144 56 96 +120 40 80 +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 diff --git a/graphics/items/icon_palettes/poke_radar.pal b/graphics/items/icon_palettes/poke_radar.pal new file mode 100644 index 0000000000..0b64b89ffd --- /dev/null +++ b/graphics/items/icon_palettes/poke_radar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 126 0 +48 48 48 +112 232 120 +136 136 136 +80 80 80 +248 248 248 +168 168 168 +224 224 224 +64 64 64 +240 96 96 +240 128 128 +144 64 64 +40 136 232 +88 168 240 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poke_toy.pal b/graphics/items/icon_palettes/poke_toy.pal new file mode 100644 index 0000000000..4ee38edd34 --- /dev/null +++ b/graphics/items/icon_palettes/poke_toy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 248 0 +248 248 248 +200 200 200 +168 168 168 +248 240 144 +248 208 104 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/pokemon_box_link.pal b/graphics/items/icon_palettes/pokemon_box_link.pal new file mode 100644 index 0000000000..39367b6da0 --- /dev/null +++ b/graphics/items/icon_palettes/pokemon_box_link.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 248 +232 232 232 +216 216 216 +184 184 184 +160 160 160 +144 144 144 +96 232 248 +128 216 224 +88 184 224 +240 192 208 +240 96 104 +48 48 48 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pot.pal b/graphics/items/icon_palettes/pot.pal new file mode 100644 index 0000000000..1ea827fa3f --- /dev/null +++ b/graphics/items/icon_palettes/pot.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 0 +216 216 248 +176 184 184 +136 136 136 +80 80 80 +48 48 48 +80 208 200 +88 168 160 +248 216 120 +176 164 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/prison_bottle.pal b/graphics/items/icon_palettes/prison_bottle.pal new file mode 100644 index 0000000000..9845ade30e --- /dev/null +++ b/graphics/items/icon_palettes/prison_bottle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +208 232 248 +144 168 176 +56 96 104 +248 200 64 +176 128 64 +248 176 200 +216 96 144 +192 48 96 +144 24 64 +88 120 248 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rage_candy_bar.pal b/graphics/items/icon_palettes/rage_candy_bar.pal new file mode 100644 index 0000000000..985c80da69 --- /dev/null +++ b/graphics/items/icon_palettes/rage_candy_bar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 248 248 +176 208 144 +144 196 88 +104 152 64 +64 104 48 +176 112 80 +152 56 48 +168 144 80 +152 128 64 +224 232 208 +136 136 136 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_mint.pal b/graphics/items/icon_palettes/red_mint.pal new file mode 100644 index 0000000000..db15bad4f7 --- /dev/null +++ b/graphics/items/icon_palettes/red_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 160 152 +248 128 112 +248 72 64 +200 64 56 +144 56 56 +80 40 40 +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 diff --git a/graphics/items/icon_palettes/reins_of_unity.pal b/graphics/items/icon_palettes/reins_of_unity.pal new file mode 100644 index 0000000000..423943facd --- /dev/null +++ b/graphics/items/icon_palettes/reins_of_unity.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +64 144 248 +56 112 248 +48 96 224 +48 72 224 +48 40 224 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/relic_copper.pal b/graphics/items/icon_palettes/relic_copper.pal new file mode 100644 index 0000000000..8b7c45fd8e --- /dev/null +++ b/graphics/items/icon_palettes/relic_copper.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 200 128 +224 152 56 +208 144 48 +192 128 40 +160 120 40 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/relic_gold.pal b/graphics/items/icon_palettes/relic_gold.pal new file mode 100644 index 0000000000..2666ec5b88 --- /dev/null +++ b/graphics/items/icon_palettes/relic_gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 232 96 +248 208 72 +240 184 24 +216 152 24 +200 144 16 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/relic_silver.pal b/graphics/items/icon_palettes/relic_silver.pal new file mode 100644 index 0000000000..80a16b120f --- /dev/null +++ b/graphics/items/icon_palettes/relic_silver.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 248 +232 240 248 +200 208 216 +168 176 176 +152 152 152 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/relics.pal b/graphics/items/icon_palettes/relics.pal new file mode 100644 index 0000000000..b095aa950f --- /dev/null +++ b/graphics/items/icon_palettes/relics.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 0 +216 216 208 +200 200 192 +176 176 176 +144 152 152 +120 144 144 +88 120 120 +64 104 104 +56 96 96 +48 72 80 +72 72 72 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/reveal_glass.pal b/graphics/items/icon_palettes/reveal_glass.pal new file mode 100644 index 0000000000..b7cbcf3f40 --- /dev/null +++ b/graphics/items/icon_palettes/reveal_glass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 242 0 +208 216 224 +168 184 184 +224 224 216 +192 192 192 +160 160 160 +104 104 96 +88 144 96 +64 96 64 +184 128 112 +128 88 80 +96 144 176 +64 96 120 +72 72 72 +48 48 48 +0 0 0 diff --git a/graphics/items/icon_palettes/ribbon_sweet.pal b/graphics/items/icon_palettes/ribbon_sweet.pal new file mode 100644 index 0000000000..faea05e403 --- /dev/null +++ b/graphics/items/icon_palettes/ribbon_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 208 248 +208 160 208 +176 136 176 +144 96 168 +112 72 136 +88 64 96 +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/rich_mulch.pal b/graphics/items/icon_palettes/rich_mulch.pal new file mode 100644 index 0000000000..95616b559a --- /dev/null +++ b/graphics/items/icon_palettes/rich_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +24 192 40 +120 216 120 +224 232 208 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/room_service.pal b/graphics/items/icon_palettes/room_service.pal new file mode 100644 index 0000000000..53345c1a7d --- /dev/null +++ b/graphics/items/icon_palettes/room_service.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 248 +224 248 248 +208 216 216 +168 184 184 +144 152 152 +192 224 224 +168 192 192 +152 200 200 +96 96 96 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rotom_catalog.pal b/graphics/items/icon_palettes/rotom_catalog.pal new file mode 100644 index 0000000000..02313fedc3 --- /dev/null +++ b/graphics/items/icon_palettes/rotom_catalog.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 0 +232 248 248 +200 240 248 +160 216 240 +96 200 240 +48 152 208 +24 104 176 +224 176 144 +240 144 88 +232 120 72 +200 104 56 +184 184 184 +152 152 128 +48 48 48 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rusted_weapons.pal b/graphics/items/icon_palettes/rusted_weapons.pal new file mode 100644 index 0000000000..7d8f33d7c9 --- /dev/null +++ b/graphics/items/icon_palettes/rusted_weapons.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 248 128 +136 128 128 +112 112 112 +88 88 88 +64 64 64 +48 48 48 +200 96 96 +152 72 72 +120 56 56 +80 40 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/shalour_sable.pal b/graphics/items/icon_palettes/shalour_sable.pal new file mode 100644 index 0000000000..ae6f368a81 --- /dev/null +++ b/graphics/items/icon_palettes/shalour_sable.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +232 208 152 +216 184 104 +200 160 80 +184 128 64 +168 112 48 +152 88 32 +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/stable_mulch.pal b/graphics/items/icon_palettes/stable_mulch.pal new file mode 100644 index 0000000000..a0a98aabcb --- /dev/null +++ b/graphics/items/icon_palettes/stable_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 248 208 +152 224 200 +48 184 192 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/star_sweet.pal b/graphics/items/icon_palettes/star_sweet.pal new file mode 100644 index 0000000000..e94061aa97 --- /dev/null +++ b/graphics/items/icon_palettes/star_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 248 +248 248 176 +248 232 0 +216 184 8 +168 143 8 +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 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/strange_souvenir.pal b/graphics/items/icon_palettes/strange_souvenir.pal new file mode 100644 index 0000000000..16a1ddadb6 --- /dev/null +++ b/graphics/items/icon_palettes/strange_souvenir.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 232 176 +184 168 104 +152 128 64 +96 80 24 +72 56 48 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/strawberry_sweet.pal b/graphics/items/icon_palettes/strawberry_sweet.pal new file mode 100644 index 0000000000..90dd56390c --- /dev/null +++ b/graphics/items/icon_palettes/strawberry_sweet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 64 64 +48 48 48 +176 40 40 +248 160 160 +208 32 32 +240 104 104 +248 56 56 +248 192 200 +200 120 120 +248 96 96 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/super_lure.pal b/graphics/items/icon_palettes/super_lure.pal new file mode 100644 index 0000000000..8064ffc4e2 --- /dev/null +++ b/graphics/items/icon_palettes/super_lure.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 128 128 +248 248 248 +230 246 255 +189 213 213 +148 189 205 +115 156 172 +98 115 139 +65 82 98 +205 238 255 +139 197 238 +82 164 222 +57 106 205 +41 74 139 +48 48 48 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/surprise_mulch.pal b/graphics/items/icon_palettes/surprise_mulch.pal new file mode 100644 index 0000000000..a4c6db4eb7 --- /dev/null +++ b/graphics/items/icon_palettes/surprise_mulch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 208 248 +248 160 216 +232 104 176 +232 200 152 +216 184 104 +180 136 72 +128 96 56 +48 48 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/sweet_apple.pal b/graphics/items/icon_palettes/sweet_apple.pal new file mode 100644 index 0000000000..90465ef51d --- /dev/null +++ b/graphics/items/icon_palettes/sweet_apple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 242 0 +246 120 121 +246 84 83 +239 43 41 +205 26 30 +155 25 26 +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 +0 0 0 diff --git a/graphics/items/icon_palettes/tart_apple.pal b/graphics/items/icon_palettes/tart_apple.pal new file mode 100644 index 0000000000..92c8604edc --- /dev/null +++ b/graphics/items/icon_palettes/tart_apple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +192 248 248 +229 156 67 +244 121 39 +180 191 123 +123 175 69 +105 137 24 +248 87 80 +246 39 40 +200 34 31 +153 27 28 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/throat_spray.pal b/graphics/items/icon_palettes/throat_spray.pal new file mode 100644 index 0000000000..2b78e54403 --- /dev/null +++ b/graphics/items/icon_palettes/throat_spray.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +248 192 248 +248 248 248 +192 232 216 +160 200 184 +128 168 152 +80 120 104 +48 48 48 +128 168 200 +96 120 168 +56 64 128 +128 144 152 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/utility_umbrella.pal b/graphics/items/icon_palettes/utility_umbrella.pal new file mode 100644 index 0000000000..287da75374 --- /dev/null +++ b/graphics/items/icon_palettes/utility_umbrella.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +128 120 120 +104 104 104 +80 80 80 +64 64 64 +48 48 48 +208 208 208 +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/wishing_piece.pal b/graphics/items/icon_palettes/wishing_piece.pal new file mode 100644 index 0000000000..898b8b36a0 --- /dev/null +++ b/graphics/items/icon_palettes/wishing_piece.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +104 104 176 +76 88 160 +56 64 136 +40 48 120 +40 48 96 +48 48 72 +32 32 32 +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/yellow_mint.pal b/graphics/items/icon_palettes/yellow_mint.pal new file mode 100644 index 0000000000..c4692d9a3f --- /dev/null +++ b/graphics/items/icon_palettes/yellow_mint.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +248 248 232 +248 232 168 +224 208 136 +200 200 168 +136 120 80 +88 80 48 +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 diff --git a/graphics/items/icon_palettes/z_power_ring.pal b/graphics/items/icon_palettes/z_power_ring.pal new file mode 100644 index 0000000000..2c3b5951af --- /dev/null +++ b/graphics/items/icon_palettes/z_power_ring.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +240 248 248 +176 176 176 +136 136 136 +128 128 128 +104 104 104 +96 96 96 +80 80 80 +64 64 64 +48 48 48 +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/zygarde_cube.pal b/graphics/items/icon_palettes/zygarde_cube.pal new file mode 100644 index 0000000000..3358a67c8c --- /dev/null +++ b/graphics/items/icon_palettes/zygarde_cube.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +232 248 232 +152 216 48 +128 152 32 +104 120 48 +152 144 144 +120 104 104 +88 80 80 +64 56 56 +48 48 48 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icons/ability_patch.png b/graphics/items/icons/ability_patch.png new file mode 100644 index 0000000000..acbef74623 Binary files /dev/null and b/graphics/items/icons/ability_patch.png differ diff --git a/graphics/items/icons/armorite_ore.png b/graphics/items/icons/armorite_ore.png new file mode 100644 index 0000000000..c08372afc0 Binary files /dev/null and b/graphics/items/icons/armorite_ore.png differ diff --git a/graphics/items/icons/balm_mushroom.png b/graphics/items/icons/balm_mushroom.png new file mode 100644 index 0000000000..ba4373faad Binary files /dev/null and b/graphics/items/icons/balm_mushroom.png differ diff --git a/graphics/items/icons/berry_sweet.png b/graphics/items/icons/berry_sweet.png new file mode 100644 index 0000000000..0c0f11dabd Binary files /dev/null and b/graphics/items/icons/berry_sweet.png differ diff --git a/graphics/items/icons/big_nugget.png b/graphics/items/icons/big_nugget.png new file mode 100644 index 0000000000..3b30d2a7de Binary files /dev/null and b/graphics/items/icons/big_nugget.png differ diff --git a/graphics/items/icons/blunder_policy.png b/graphics/items/icons/blunder_policy.png new file mode 100644 index 0000000000..5004ecbcf9 Binary files /dev/null and b/graphics/items/icons/blunder_policy.png differ diff --git a/graphics/items/icons/bottle_cap.png b/graphics/items/icons/bottle_cap.png new file mode 100644 index 0000000000..b3f52c4221 Binary files /dev/null and b/graphics/items/icons/bottle_cap.png differ diff --git a/graphics/items/icons/casteliacone.png b/graphics/items/icons/casteliacone.png new file mode 100644 index 0000000000..47691d6238 Binary files /dev/null and b/graphics/items/icons/casteliacone.png differ diff --git a/graphics/items/icons/catching_charm.png b/graphics/items/icons/catching_charm.png new file mode 100644 index 0000000000..fbdf64be35 Binary files /dev/null and b/graphics/items/icons/catching_charm.png differ diff --git a/graphics/items/icons/chipped_pot.png b/graphics/items/icons/chipped_pot.png new file mode 100644 index 0000000000..c77c8b90b4 Binary files /dev/null and b/graphics/items/icons/chipped_pot.png differ diff --git a/graphics/items/icons/clover_sweet.png b/graphics/items/icons/clover_sweet.png new file mode 100644 index 0000000000..7b9e7f463f Binary files /dev/null and b/graphics/items/icons/clover_sweet.png differ diff --git a/graphics/items/icons/comet_shard.png b/graphics/items/icons/comet_shard.png new file mode 100644 index 0000000000..7d6788b614 Binary files /dev/null and b/graphics/items/icons/comet_shard.png differ diff --git a/graphics/items/icons/cracked_pot.png b/graphics/items/icons/cracked_pot.png new file mode 100644 index 0000000000..ffe570ad5c Binary files /dev/null and b/graphics/items/icons/cracked_pot.png differ diff --git a/graphics/items/icons/dna_splicers.png b/graphics/items/icons/dna_splicers.png new file mode 100644 index 0000000000..9fc055de33 Binary files /dev/null and b/graphics/items/icons/dna_splicers.png differ diff --git a/graphics/items/icons/dynamax_band.png b/graphics/items/icons/dynamax_band.png new file mode 100644 index 0000000000..726fd069b1 Binary files /dev/null and b/graphics/items/icons/dynamax_band.png differ diff --git a/graphics/items/icons/dynamax_candy.png b/graphics/items/icons/dynamax_candy.png new file mode 100644 index 0000000000..8c3c3edf11 Binary files /dev/null and b/graphics/items/icons/dynamax_candy.png differ diff --git a/graphics/items/icons/dynite_ore.png b/graphics/items/icons/dynite_ore.png new file mode 100644 index 0000000000..3599f6a476 Binary files /dev/null and b/graphics/items/icons/dynite_ore.png differ diff --git a/graphics/items/icons/eject_pack.png b/graphics/items/icons/eject_pack.png new file mode 100644 index 0000000000..54a590ed9c Binary files /dev/null and b/graphics/items/icons/eject_pack.png differ diff --git a/graphics/items/icons/exp_candy_l.png b/graphics/items/icons/exp_candy_l.png new file mode 100644 index 0000000000..e63abfeaf3 Binary files /dev/null and b/graphics/items/icons/exp_candy_l.png differ diff --git a/graphics/items/icons/exp_candy_m.png b/graphics/items/icons/exp_candy_m.png new file mode 100644 index 0000000000..74cd8a0841 Binary files /dev/null and b/graphics/items/icons/exp_candy_m.png differ diff --git a/graphics/items/icons/exp_candy_s.png b/graphics/items/icons/exp_candy_s.png new file mode 100644 index 0000000000..ae37524f8e Binary files /dev/null and b/graphics/items/icons/exp_candy_s.png differ diff --git a/graphics/items/icons/exp_candy_xl.png b/graphics/items/icons/exp_candy_xl.png new file mode 100644 index 0000000000..abc1541ed3 Binary files /dev/null and b/graphics/items/icons/exp_candy_xl.png differ diff --git a/graphics/items/icons/exp_candy_xs.png b/graphics/items/icons/exp_candy_xs.png new file mode 100644 index 0000000000..6faac9fc00 Binary files /dev/null and b/graphics/items/icons/exp_candy_xs.png differ diff --git a/graphics/items/icons/exp_charm.png b/graphics/items/icons/exp_charm.png new file mode 100644 index 0000000000..2b014c25e2 Binary files /dev/null and b/graphics/items/icons/exp_charm.png differ diff --git a/graphics/items/icons/flower_sweet.png b/graphics/items/icons/flower_sweet.png new file mode 100644 index 0000000000..97f6c4e443 Binary files /dev/null and b/graphics/items/icons/flower_sweet.png differ diff --git a/graphics/items/icons/fossilized_bird.png b/graphics/items/icons/fossilized_bird.png new file mode 100644 index 0000000000..725b5f891f Binary files /dev/null and b/graphics/items/icons/fossilized_bird.png differ diff --git a/graphics/items/icons/fossilized_dino.png b/graphics/items/icons/fossilized_dino.png new file mode 100644 index 0000000000..61b1907fdc Binary files /dev/null and b/graphics/items/icons/fossilized_dino.png differ diff --git a/graphics/items/icons/fossilized_drake.png b/graphics/items/icons/fossilized_drake.png new file mode 100644 index 0000000000..63adc30d88 Binary files /dev/null and b/graphics/items/icons/fossilized_drake.png differ diff --git a/graphics/items/icons/fossilized_fish.png b/graphics/items/icons/fossilized_fish.png new file mode 100644 index 0000000000..c2de7c009a Binary files /dev/null and b/graphics/items/icons/fossilized_fish.png differ diff --git a/graphics/items/icons/galarica_cuff.png b/graphics/items/icons/galarica_cuff.png new file mode 100644 index 0000000000..a99bedc6e2 Binary files /dev/null and b/graphics/items/icons/galarica_cuff.png differ diff --git a/graphics/items/icons/galarica_twig.png b/graphics/items/icons/galarica_twig.png new file mode 100644 index 0000000000..28fabf7be5 Binary files /dev/null and b/graphics/items/icons/galarica_twig.png differ diff --git a/graphics/items/icons/galarica_wreath.png b/graphics/items/icons/galarica_wreath.png new file mode 100644 index 0000000000..21c094d65b Binary files /dev/null and b/graphics/items/icons/galarica_wreath.png differ diff --git a/graphics/items/icons/heavy_duty_boots.png b/graphics/items/icons/heavy_duty_boots.png new file mode 100644 index 0000000000..a42596c458 Binary files /dev/null and b/graphics/items/icons/heavy_duty_boots.png differ diff --git a/graphics/items/icons/jade_orb.png b/graphics/items/icons/jade_orb.png new file mode 100644 index 0000000000..cc8468834d Binary files /dev/null and b/graphics/items/icons/jade_orb.png differ diff --git a/graphics/items/icons/key_stone.png b/graphics/items/icons/key_stone.png new file mode 100644 index 0000000000..efb07d80ee Binary files /dev/null and b/graphics/items/icons/key_stone.png differ diff --git a/graphics/items/icons/love_sweet.png b/graphics/items/icons/love_sweet.png new file mode 100644 index 0000000000..d2dba09da6 Binary files /dev/null and b/graphics/items/icons/love_sweet.png differ diff --git a/graphics/items/icons/lumiose_galette.png b/graphics/items/icons/lumiose_galette.png new file mode 100644 index 0000000000..fd3868ad5b Binary files /dev/null and b/graphics/items/icons/lumiose_galette.png differ diff --git a/graphics/items/icons/lure.png b/graphics/items/icons/lure.png new file mode 100644 index 0000000000..8cc742d63a Binary files /dev/null and b/graphics/items/icons/lure.png differ diff --git a/graphics/items/icons/max_honey.png b/graphics/items/icons/max_honey.png new file mode 100644 index 0000000000..aed9cc0d88 Binary files /dev/null and b/graphics/items/icons/max_honey.png differ diff --git a/graphics/items/icons/max_mushrooms.png b/graphics/items/icons/max_mushrooms.png new file mode 100644 index 0000000000..a5ebac8358 Binary files /dev/null and b/graphics/items/icons/max_mushrooms.png differ diff --git a/graphics/items/icons/mega_ring.png b/graphics/items/icons/mega_ring.png new file mode 100644 index 0000000000..ea253ccac9 Binary files /dev/null and b/graphics/items/icons/mega_ring.png differ diff --git a/graphics/items/icons/mint.png b/graphics/items/icons/mint.png new file mode 100644 index 0000000000..d879eab8b5 Binary files /dev/null and b/graphics/items/icons/mint.png differ diff --git a/graphics/items/icons/mulch.png b/graphics/items/icons/mulch.png new file mode 100644 index 0000000000..6e470a1086 Binary files /dev/null and b/graphics/items/icons/mulch.png differ diff --git a/graphics/items/icons/necrozma_fuser.png b/graphics/items/icons/necrozma_fuser.png new file mode 100644 index 0000000000..3218fd20e3 Binary files /dev/null and b/graphics/items/icons/necrozma_fuser.png differ diff --git a/graphics/items/icons/pearl_string.png b/graphics/items/icons/pearl_string.png new file mode 100644 index 0000000000..a61a9aa66b Binary files /dev/null and b/graphics/items/icons/pearl_string.png differ diff --git a/graphics/items/icons/pewter_crunchies.png b/graphics/items/icons/pewter_crunchies.png new file mode 100644 index 0000000000..d88acd95ec Binary files /dev/null and b/graphics/items/icons/pewter_crunchies.png differ diff --git a/graphics/items/icons/poke_radar.png b/graphics/items/icons/poke_radar.png new file mode 100644 index 0000000000..f0de8796ac Binary files /dev/null and b/graphics/items/icons/poke_radar.png differ diff --git a/graphics/items/icons/poke_toy.png b/graphics/items/icons/poke_toy.png new file mode 100644 index 0000000000..be6091d3f5 Binary files /dev/null and b/graphics/items/icons/poke_toy.png differ diff --git a/graphics/items/icons/pokemon_box_link.png b/graphics/items/icons/pokemon_box_link.png new file mode 100644 index 0000000000..8022e833ab Binary files /dev/null and b/graphics/items/icons/pokemon_box_link.png differ diff --git a/graphics/items/icons/prison_bottle.png b/graphics/items/icons/prison_bottle.png new file mode 100644 index 0000000000..3c20e771a3 Binary files /dev/null and b/graphics/items/icons/prison_bottle.png differ diff --git a/graphics/items/icons/rage_candy_bar.png b/graphics/items/icons/rage_candy_bar.png new file mode 100644 index 0000000000..feb5b82cce Binary files /dev/null and b/graphics/items/icons/rage_candy_bar.png differ diff --git a/graphics/items/icons/reins_of_unity.png b/graphics/items/icons/reins_of_unity.png new file mode 100644 index 0000000000..123cda9b92 Binary files /dev/null and b/graphics/items/icons/reins_of_unity.png differ diff --git a/graphics/items/icons/relic_band.png b/graphics/items/icons/relic_band.png new file mode 100644 index 0000000000..902e04f7cc Binary files /dev/null and b/graphics/items/icons/relic_band.png differ diff --git a/graphics/items/icons/relic_coin.png b/graphics/items/icons/relic_coin.png new file mode 100644 index 0000000000..b94e3eaa6e Binary files /dev/null and b/graphics/items/icons/relic_coin.png differ diff --git a/graphics/items/icons/relic_crown.png b/graphics/items/icons/relic_crown.png new file mode 100644 index 0000000000..7511a2e081 Binary files /dev/null and b/graphics/items/icons/relic_crown.png differ diff --git a/graphics/items/icons/relic_statue.png b/graphics/items/icons/relic_statue.png new file mode 100644 index 0000000000..927aa4b8b8 Binary files /dev/null and b/graphics/items/icons/relic_statue.png differ diff --git a/graphics/items/icons/relic_vase.png b/graphics/items/icons/relic_vase.png new file mode 100644 index 0000000000..aa8698c1a2 Binary files /dev/null and b/graphics/items/icons/relic_vase.png differ diff --git a/graphics/items/icons/reveal_glass.png b/graphics/items/icons/reveal_glass.png new file mode 100644 index 0000000000..dbb6b856c1 Binary files /dev/null and b/graphics/items/icons/reveal_glass.png differ diff --git a/graphics/items/icons/ribbon_sweet.png b/graphics/items/icons/ribbon_sweet.png new file mode 100644 index 0000000000..19711ae8cc Binary files /dev/null and b/graphics/items/icons/ribbon_sweet.png differ diff --git a/graphics/items/icons/room_service.png b/graphics/items/icons/room_service.png new file mode 100644 index 0000000000..e776b4e8a7 Binary files /dev/null and b/graphics/items/icons/room_service.png differ diff --git a/graphics/items/icons/rotom_catalog.png b/graphics/items/icons/rotom_catalog.png new file mode 100644 index 0000000000..ceea8e968a Binary files /dev/null and b/graphics/items/icons/rotom_catalog.png differ diff --git a/graphics/items/icons/rusted_shield.png b/graphics/items/icons/rusted_shield.png new file mode 100644 index 0000000000..a7d3de46d6 Binary files /dev/null and b/graphics/items/icons/rusted_shield.png differ diff --git a/graphics/items/icons/rusted_sword.png b/graphics/items/icons/rusted_sword.png new file mode 100644 index 0000000000..a05bac98be Binary files /dev/null and b/graphics/items/icons/rusted_sword.png differ diff --git a/graphics/items/icons/shalour_sable.png b/graphics/items/icons/shalour_sable.png new file mode 100644 index 0000000000..88982fb475 Binary files /dev/null and b/graphics/items/icons/shalour_sable.png differ diff --git a/graphics/items/icons/stable_mulch.png b/graphics/items/icons/stable_mulch.png new file mode 100644 index 0000000000..be4369d07c Binary files /dev/null and b/graphics/items/icons/stable_mulch.png differ diff --git a/graphics/items/icons/star_sweet.png b/graphics/items/icons/star_sweet.png new file mode 100644 index 0000000000..23bffe9cf7 Binary files /dev/null and b/graphics/items/icons/star_sweet.png differ diff --git a/graphics/items/icons/strange_souvenir.png b/graphics/items/icons/strange_souvenir.png new file mode 100644 index 0000000000..5cbc6e164c Binary files /dev/null and b/graphics/items/icons/strange_souvenir.png differ diff --git a/graphics/items/icons/strawberry_sweet.png b/graphics/items/icons/strawberry_sweet.png new file mode 100644 index 0000000000..40f6c7700a Binary files /dev/null and b/graphics/items/icons/strawberry_sweet.png differ diff --git a/graphics/items/icons/sweet_apple.png b/graphics/items/icons/sweet_apple.png new file mode 100644 index 0000000000..35e47e0768 Binary files /dev/null and b/graphics/items/icons/sweet_apple.png differ diff --git a/graphics/items/icons/tart_apple.png b/graphics/items/icons/tart_apple.png new file mode 100644 index 0000000000..b26b595da5 Binary files /dev/null and b/graphics/items/icons/tart_apple.png differ diff --git a/graphics/items/icons/throat_spray.png b/graphics/items/icons/throat_spray.png new file mode 100644 index 0000000000..2d75c4aad5 Binary files /dev/null and b/graphics/items/icons/throat_spray.png differ diff --git a/graphics/items/icons/utility_umbrella.png b/graphics/items/icons/utility_umbrella.png new file mode 100644 index 0000000000..a7dbb4e041 Binary files /dev/null and b/graphics/items/icons/utility_umbrella.png differ diff --git a/graphics/items/icons/wishing_piece.png b/graphics/items/icons/wishing_piece.png new file mode 100644 index 0000000000..324a0a646e Binary files /dev/null and b/graphics/items/icons/wishing_piece.png differ diff --git a/graphics/items/icons/z_power_ring.png b/graphics/items/icons/z_power_ring.png new file mode 100644 index 0000000000..addf901e15 Binary files /dev/null and b/graphics/items/icons/z_power_ring.png differ diff --git a/graphics/items/icons/zygarde_cube.png b/graphics/items/icons/zygarde_cube.png new file mode 100644 index 0000000000..b577dcecd8 Binary files /dev/null and b/graphics/items/icons/zygarde_cube.png differ diff --git a/include/constants/items.h b/include/constants/items.h index 57131f79f1..5413a7afef 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -355,441 +355,440 @@ // Colored Orbs #define ITEM_RED_ORB 290 #define ITEM_BLUE_ORB 291 -#define ITEM_JADE_ORB 292 // Mega Stones -#define ITEM_VENUSAURITE 293 -#define ITEM_CHARIZARDITE_X 294 -#define ITEM_CHARIZARDITE_Y 295 -#define ITEM_BLASTOISINITE 296 -#define ITEM_BEEDRILLITE 297 -#define ITEM_PIDGEOTITE 298 -#define ITEM_ALAKAZITE 299 -#define ITEM_SLOWBRONITE 300 -#define ITEM_GENGARITE 301 -#define ITEM_KANGASKHANITE 302 -#define ITEM_PINSIRITE 303 -#define ITEM_GYARADOSITE 304 -#define ITEM_AERODACTYLITE 305 -#define ITEM_MEWTWONITE_X 306 -#define ITEM_MEWTWONITE_Y 307 -#define ITEM_AMPHAROSITE 308 -#define ITEM_STEELIXITE 309 -#define ITEM_SCIZORITE 310 -#define ITEM_HERACRONITE 311 -#define ITEM_HOUNDOOMINITE 312 -#define ITEM_TYRANITARITE 313 -#define ITEM_SCEPTILITE 314 -#define ITEM_BLAZIKENITE 315 -#define ITEM_SWAMPERTITE 316 -#define ITEM_GARDEVOIRITE 317 -#define ITEM_SABLENITE 318 -#define ITEM_MAWILITE 319 -#define ITEM_AGGRONITE 320 -#define ITEM_MEDICHAMITE 321 -#define ITEM_MANECTITE 322 -#define ITEM_SHARPEDONITE 323 -#define ITEM_CAMERUPTITE 324 -#define ITEM_ALTARIANITE 325 -#define ITEM_BANETTITE 326 -#define ITEM_ABSOLITE 327 -#define ITEM_GLALITITE 328 -#define ITEM_SALAMENCITE 329 -#define ITEM_METAGROSSITE 330 -#define ITEM_LATIASITE 331 -#define ITEM_LATIOSITE 332 -#define ITEM_LOPUNNITE 333 -#define ITEM_GARCHOMPITE 334 -#define ITEM_LUCARIONITE 335 -#define ITEM_ABOMASITE 336 -#define ITEM_GALLADITE 337 -#define ITEM_AUDINITE 338 -#define ITEM_DIANCITE 339 +#define ITEM_VENUSAURITE 292 +#define ITEM_CHARIZARDITE_X 293 +#define ITEM_CHARIZARDITE_Y 294 +#define ITEM_BLASTOISINITE 295 +#define ITEM_BEEDRILLITE 296 +#define ITEM_PIDGEOTITE 297 +#define ITEM_ALAKAZITE 298 +#define ITEM_SLOWBRONITE 299 +#define ITEM_GENGARITE 300 +#define ITEM_KANGASKHANITE 301 +#define ITEM_PINSIRITE 302 +#define ITEM_GYARADOSITE 303 +#define ITEM_AERODACTYLITE 304 +#define ITEM_MEWTWONITE_X 305 +#define ITEM_MEWTWONITE_Y 306 +#define ITEM_AMPHAROSITE 307 +#define ITEM_STEELIXITE 308 +#define ITEM_SCIZORITE 309 +#define ITEM_HERACRONITE 310 +#define ITEM_HOUNDOOMINITE 311 +#define ITEM_TYRANITARITE 312 +#define ITEM_SCEPTILITE 313 +#define ITEM_BLAZIKENITE 314 +#define ITEM_SWAMPERTITE 315 +#define ITEM_GARDEVOIRITE 316 +#define ITEM_SABLENITE 317 +#define ITEM_MAWILITE 318 +#define ITEM_AGGRONITE 319 +#define ITEM_MEDICHAMITE 320 +#define ITEM_MANECTITE 321 +#define ITEM_SHARPEDONITE 322 +#define ITEM_CAMERUPTITE 323 +#define ITEM_ALTARIANITE 324 +#define ITEM_BANETTITE 325 +#define ITEM_ABSOLITE 326 +#define ITEM_GLALITITE 327 +#define ITEM_SALAMENCITE 328 +#define ITEM_METAGROSSITE 329 +#define ITEM_LATIASITE 330 +#define ITEM_LATIOSITE 331 +#define ITEM_LOPUNNITE 332 +#define ITEM_GARCHOMPITE 333 +#define ITEM_LUCARIONITE 334 +#define ITEM_ABOMASITE 335 +#define ITEM_GALLADITE 336 +#define ITEM_AUDINITE 337 +#define ITEM_DIANCITE 338 // Gems -#define ITEM_NORMAL_GEM 340 -#define ITEM_FIRE_GEM 341 -#define ITEM_WATER_GEM 342 -#define ITEM_ELECTRIC_GEM 343 -#define ITEM_GRASS_GEM 344 -#define ITEM_ICE_GEM 345 -#define ITEM_FIGHTING_GEM 346 -#define ITEM_POISON_GEM 347 -#define ITEM_GROUND_GEM 348 -#define ITEM_FLYING_GEM 349 -#define ITEM_PSYCHIC_GEM 350 -#define ITEM_BUG_GEM 351 -#define ITEM_ROCK_GEM 352 -#define ITEM_GHOST_GEM 353 -#define ITEM_DRAGON_GEM 354 -#define ITEM_DARK_GEM 355 -#define ITEM_STEEL_GEM 356 -#define ITEM_FAIRY_GEM 357 +#define ITEM_NORMAL_GEM 339 +#define ITEM_FIRE_GEM 340 +#define ITEM_WATER_GEM 341 +#define ITEM_ELECTRIC_GEM 342 +#define ITEM_GRASS_GEM 343 +#define ITEM_ICE_GEM 344 +#define ITEM_FIGHTING_GEM 345 +#define ITEM_POISON_GEM 346 +#define ITEM_GROUND_GEM 347 +#define ITEM_FLYING_GEM 348 +#define ITEM_PSYCHIC_GEM 349 +#define ITEM_BUG_GEM 350 +#define ITEM_ROCK_GEM 351 +#define ITEM_GHOST_GEM 352 +#define ITEM_DRAGON_GEM 353 +#define ITEM_DARK_GEM 354 +#define ITEM_STEEL_GEM 355 +#define ITEM_FAIRY_GEM 356 // Z-Crystals -#define ITEM_NORMALIUM_Z 358 -#define ITEM_FIRIUM_Z 359 -#define ITEM_WATERIUM_Z 360 -#define ITEM_ELECTRIUM_Z 361 -#define ITEM_GRASSIUM_Z 362 -#define ITEM_ICIUM_Z 363 -#define ITEM_FIGHTINIUM_Z 364 -#define ITEM_POISONIUM_Z 365 -#define ITEM_GROUNDIUM_Z 366 -#define ITEM_FLYINIUM_Z 367 -#define ITEM_PSYCHIUM_Z 368 -#define ITEM_BUGINIUM_Z 369 -#define ITEM_ROCKIUM_Z 370 -#define ITEM_GHOSTIUM_Z 371 -#define ITEM_DRAGONIUM_Z 372 -#define ITEM_DARKINIUM_Z 373 -#define ITEM_STEELIUM_Z 374 -#define ITEM_FAIRIUM_Z 375 -#define ITEM_PIKANIUM_Z 376 -#define ITEM_EEVIUM_Z 377 -#define ITEM_SNORLIUM_Z 378 -#define ITEM_MEWNIUM_Z 379 -#define ITEM_DECIDIUM_Z 380 -#define ITEM_INCINIUM_Z 381 -#define ITEM_PRIMARIUM_Z 382 -#define ITEM_LYCANIUM_Z 383 -#define ITEM_MIMIKIUM_Z 384 -#define ITEM_KOMMONIUM_Z 385 -#define ITEM_TAPUNIUM_Z 386 -#define ITEM_SOLGANIUM_Z 387 -#define ITEM_LUNALIUM_Z 388 -#define ITEM_MARSHADIUM_Z 389 -#define ITEM_ALORAICHIUM_Z 390 -#define ITEM_PIKASHUNIUM_Z 391 -#define ITEM_ULTRANECROZIUM_Z 392 +#define ITEM_NORMALIUM_Z 357 +#define ITEM_FIRIUM_Z 358 +#define ITEM_WATERIUM_Z 359 +#define ITEM_ELECTRIUM_Z 360 +#define ITEM_GRASSIUM_Z 361 +#define ITEM_ICIUM_Z 362 +#define ITEM_FIGHTINIUM_Z 363 +#define ITEM_POISONIUM_Z 364 +#define ITEM_GROUNDIUM_Z 365 +#define ITEM_FLYINIUM_Z 366 +#define ITEM_PSYCHIUM_Z 367 +#define ITEM_BUGINIUM_Z 368 +#define ITEM_ROCKIUM_Z 369 +#define ITEM_GHOSTIUM_Z 370 +#define ITEM_DRAGONIUM_Z 371 +#define ITEM_DARKINIUM_Z 372 +#define ITEM_STEELIUM_Z 373 +#define ITEM_FAIRIUM_Z 374 +#define ITEM_PIKANIUM_Z 375 +#define ITEM_EEVIUM_Z 376 +#define ITEM_SNORLIUM_Z 377 +#define ITEM_MEWNIUM_Z 378 +#define ITEM_DECIDIUM_Z 379 +#define ITEM_INCINIUM_Z 380 +#define ITEM_PRIMARIUM_Z 381 +#define ITEM_LYCANIUM_Z 382 +#define ITEM_MIMIKIUM_Z 383 +#define ITEM_KOMMONIUM_Z 384 +#define ITEM_TAPUNIUM_Z 385 +#define ITEM_SOLGANIUM_Z 386 +#define ITEM_LUNALIUM_Z 387 +#define ITEM_MARSHADIUM_Z 388 +#define ITEM_ALORAICHIUM_Z 389 +#define ITEM_PIKASHUNIUM_Z 390 +#define ITEM_ULTRANECROZIUM_Z 391 // Species-specific Held Items -#define ITEM_LIGHT_BALL 393 -#define ITEM_LEEK 394 -#define ITEM_THICK_CLUB 395 -#define ITEM_LUCKY_PUNCH 396 -#define ITEM_METAL_POWDER 397 -#define ITEM_QUICK_POWDER 398 -#define ITEM_DEEP_SEA_SCALE 399 -#define ITEM_DEEP_SEA_TOOTH 400 -#define ITEM_SOUL_DEW 401 -#define ITEM_ADAMANT_ORB 402 -#define ITEM_LUSTROUS_ORB 403 -#define ITEM_GRISEOUS_ORB 404 +#define ITEM_LIGHT_BALL 392 +#define ITEM_LEEK 393 +#define ITEM_THICK_CLUB 394 +#define ITEM_LUCKY_PUNCH 395 +#define ITEM_METAL_POWDER 396 +#define ITEM_QUICK_POWDER 397 +#define ITEM_DEEP_SEA_SCALE 398 +#define ITEM_DEEP_SEA_TOOTH 399 +#define ITEM_SOUL_DEW 400 +#define ITEM_ADAMANT_ORB 401 +#define ITEM_LUSTROUS_ORB 402 +#define ITEM_GRISEOUS_ORB 403 // Incenses -#define ITEM_SEA_INCENSE 405 -#define ITEM_LAX_INCENSE 406 -#define ITEM_ODD_INCENSE 407 -#define ITEM_ROCK_INCENSE 408 -#define ITEM_FULL_INCENSE 409 -#define ITEM_WAVE_INCENSE 410 -#define ITEM_ROSE_INCENSE 411 -#define ITEM_LUCK_INCENSE 412 -#define ITEM_PURE_INCENSE 413 +#define ITEM_SEA_INCENSE 404 +#define ITEM_LAX_INCENSE 405 +#define ITEM_ODD_INCENSE 406 +#define ITEM_ROCK_INCENSE 407 +#define ITEM_FULL_INCENSE 408 +#define ITEM_WAVE_INCENSE 409 +#define ITEM_ROSE_INCENSE 410 +#define ITEM_LUCK_INCENSE 411 +#define ITEM_PURE_INCENSE 412 // Contest Scarves -#define ITEM_RED_SCARF 414 -#define ITEM_BLUE_SCARF 415 -#define ITEM_PINK_SCARF 416 -#define ITEM_GREEN_SCARF 417 -#define ITEM_YELLOW_SCARF 418 +#define ITEM_RED_SCARF 413 +#define ITEM_BLUE_SCARF 414 +#define ITEM_PINK_SCARF 415 +#define ITEM_GREEN_SCARF 416 +#define ITEM_YELLOW_SCARF 417 // EV Gain Modifiers -#define ITEM_MACHO_BRACE 419 -#define ITEM_POWER_WEIGHT 420 -#define ITEM_POWER_BRACER 421 -#define ITEM_POWER_BELT 422 -#define ITEM_POWER_LENS 423 -#define ITEM_POWER_BAND 424 -#define ITEM_POWER_ANKLET 425 +#define ITEM_MACHO_BRACE 418 +#define ITEM_POWER_WEIGHT 419 +#define ITEM_POWER_BRACER 420 +#define ITEM_POWER_BELT 421 +#define ITEM_POWER_LENS 422 +#define ITEM_POWER_BAND 423 +#define ITEM_POWER_ANKLET 424 // Type-boosting Held Items -#define ITEM_SILK_SCARF 426 -#define ITEM_CHARCOAL 427 -#define ITEM_MYSTIC_WATER 428 -#define ITEM_MAGNET 429 -#define ITEM_MIRACLE_SEED 430 -#define ITEM_NEVER_MELT_ICE 431 -#define ITEM_BLACK_BELT 432 -#define ITEM_POISON_BARB 433 -#define ITEM_SOFT_SAND 434 -#define ITEM_SHARP_BEAK 435 -#define ITEM_TWISTED_SPOON 436 -#define ITEM_SILVER_POWDER 437 -#define ITEM_HARD_STONE 438 -#define ITEM_SPELL_TAG 439 -#define ITEM_DRAGON_FANG 440 -#define ITEM_BLACK_GLASSES 441 -#define ITEM_METAL_COAT 442 +#define ITEM_SILK_SCARF 425 +#define ITEM_CHARCOAL 426 +#define ITEM_MYSTIC_WATER 427 +#define ITEM_MAGNET 428 +#define ITEM_MIRACLE_SEED 429 +#define ITEM_NEVER_MELT_ICE 430 +#define ITEM_BLACK_BELT 431 +#define ITEM_POISON_BARB 432 +#define ITEM_SOFT_SAND 433 +#define ITEM_SHARP_BEAK 434 +#define ITEM_TWISTED_SPOON 435 +#define ITEM_SILVER_POWDER 436 +#define ITEM_HARD_STONE 437 +#define ITEM_SPELL_TAG 438 +#define ITEM_DRAGON_FANG 439 +#define ITEM_BLACK_GLASSES 440 +#define ITEM_METAL_COAT 441 // Choice Items -#define ITEM_CHOICE_BAND 443 -#define ITEM_CHOICE_SPECS 444 -#define ITEM_CHOICE_SCARF 445 +#define ITEM_CHOICE_BAND 442 +#define ITEM_CHOICE_SPECS 443 +#define ITEM_CHOICE_SCARF 444 // Status Orbs -#define ITEM_FLAME_ORB 446 -#define ITEM_TOXIC_ORB 447 +#define ITEM_FLAME_ORB 445 +#define ITEM_TOXIC_ORB 446 // Weather Rocks -#define ITEM_DAMP_ROCK 448 -#define ITEM_HEAT_ROCK 449 -#define ITEM_SMOOTH_ROCK 450 -#define ITEM_ICY_ROCK 451 +#define ITEM_DAMP_ROCK 447 +#define ITEM_HEAT_ROCK 448 +#define ITEM_SMOOTH_ROCK 449 +#define ITEM_ICY_ROCK 450 // Terrain Seeds -#define ITEM_ELECTRIC_SEED 452 -#define ITEM_PSYCHIC_SEED 453 -#define ITEM_MISTY_SEED 454 -#define ITEM_GRASSY_SEED 455 +#define ITEM_ELECTRIC_SEED 451 +#define ITEM_PSYCHIC_SEED 452 +#define ITEM_MISTY_SEED 453 +#define ITEM_GRASSY_SEED 454 // Type-activated Stat Modifiers -#define ITEM_ABSORB_BULB 456 -#define ITEM_CELL_BATTERY 457 -#define ITEM_LUMINOUS_MOSS 458 -#define ITEM_SNOWBALL 459 +#define ITEM_ABSORB_BULB 455 +#define ITEM_CELL_BATTERY 456 +#define ITEM_LUMINOUS_MOSS 457 +#define ITEM_SNOWBALL 458 // Misc. Held Items -#define ITEM_BRIGHT_POWDER 460 -#define ITEM_WHITE_HERB 461 -#define ITEM_EXP_SHARE 462 -#define ITEM_QUICK_CLAW 463 -#define ITEM_SOOTHE_BELL 464 -#define ITEM_MENTAL_HERB 465 -#define ITEM_KINGS_ROCK 466 -#define ITEM_AMULET_COIN 467 -#define ITEM_CLEANSE_TAG 468 -#define ITEM_SMOKE_BALL 469 -#define ITEM_FOCUS_BAND 470 -#define ITEM_LUCKY_EGG 471 -#define ITEM_SCOPE_LENS 472 -#define ITEM_LEFTOVERS 473 -#define ITEM_SHELL_BELL 474 -#define ITEM_WIDE_LENS 475 -#define ITEM_MUSCLE_BAND 476 -#define ITEM_WISE_GLASSES 477 -#define ITEM_EXPERT_BELT 478 -#define ITEM_LIGHT_CLAY 479 -#define ITEM_LIFE_ORB 480 -#define ITEM_POWER_HERB 481 -#define ITEM_FOCUS_SASH 482 -#define ITEM_ZOOM_LENS 483 -#define ITEM_METRONOME 484 -#define ITEM_IRON_BALL 485 -#define ITEM_LAGGING_TAIL 486 -#define ITEM_DESTINY_KNOT 487 -#define ITEM_BLACK_SLUDGE 488 -#define ITEM_GRIP_CLAW 489 -#define ITEM_STICKY_BARB 490 -#define ITEM_SHED_SHELL 491 -#define ITEM_BIG_ROOT 492 -#define ITEM_RAZOR_CLAW 493 -#define ITEM_RAZOR_FANG 494 -#define ITEM_EVIOLITE 495 -#define ITEM_FLOAT_STONE 496 -#define ITEM_ROCKY_HELMET 497 -#define ITEM_AIR_BALLOON 498 -#define ITEM_RED_CARD 499 -#define ITEM_RING_TARGET 500 -#define ITEM_BINDING_BAND 501 -#define ITEM_EJECT_BUTTON 502 -#define ITEM_WEAKNESS_POLICY 503 -#define ITEM_ASSAULT_VEST 504 -#define ITEM_SAFETY_GOGGLES 505 -#define ITEM_ADRENALINE_ORB 506 -#define ITEM_TERRAIN_EXTENDER 507 -#define ITEM_PROTECTIVE_PADS 508 -#define ITEM_THROAT_SPRAY 509 -#define ITEM_EJECT_PACK 510 -#define ITEM_HEAVY_DUTY_BOOTS 511 -#define ITEM_BLUNDER_POLICY 512 -#define ITEM_ROOM_SERVICE 513 -#define ITEM_UTILITY_UMBRELLA 514 +#define ITEM_BRIGHT_POWDER 459 +#define ITEM_WHITE_HERB 460 +#define ITEM_EXP_SHARE 461 +#define ITEM_QUICK_CLAW 462 +#define ITEM_SOOTHE_BELL 463 +#define ITEM_MENTAL_HERB 464 +#define ITEM_KINGS_ROCK 465 +#define ITEM_AMULET_COIN 466 +#define ITEM_CLEANSE_TAG 467 +#define ITEM_SMOKE_BALL 468 +#define ITEM_FOCUS_BAND 469 +#define ITEM_LUCKY_EGG 470 +#define ITEM_SCOPE_LENS 471 +#define ITEM_LEFTOVERS 472 +#define ITEM_SHELL_BELL 473 +#define ITEM_WIDE_LENS 474 +#define ITEM_MUSCLE_BAND 475 +#define ITEM_WISE_GLASSES 476 +#define ITEM_EXPERT_BELT 477 +#define ITEM_LIGHT_CLAY 478 +#define ITEM_LIFE_ORB 479 +#define ITEM_POWER_HERB 480 +#define ITEM_FOCUS_SASH 481 +#define ITEM_ZOOM_LENS 482 +#define ITEM_METRONOME 483 +#define ITEM_IRON_BALL 484 +#define ITEM_LAGGING_TAIL 485 +#define ITEM_DESTINY_KNOT 486 +#define ITEM_BLACK_SLUDGE 487 +#define ITEM_GRIP_CLAW 488 +#define ITEM_STICKY_BARB 489 +#define ITEM_SHED_SHELL 490 +#define ITEM_BIG_ROOT 491 +#define ITEM_RAZOR_CLAW 492 +#define ITEM_RAZOR_FANG 493 +#define ITEM_EVIOLITE 494 +#define ITEM_FLOAT_STONE 495 +#define ITEM_ROCKY_HELMET 496 +#define ITEM_AIR_BALLOON 497 +#define ITEM_RED_CARD 498 +#define ITEM_RING_TARGET 499 +#define ITEM_BINDING_BAND 500 +#define ITEM_EJECT_BUTTON 501 +#define ITEM_WEAKNESS_POLICY 502 +#define ITEM_ASSAULT_VEST 503 +#define ITEM_SAFETY_GOGGLES 504 +#define ITEM_ADRENALINE_ORB 505 +#define ITEM_TERRAIN_EXTENDER 506 +#define ITEM_PROTECTIVE_PADS 507 +#define ITEM_THROAT_SPRAY 508 +#define ITEM_EJECT_PACK 509 +#define ITEM_HEAVY_DUTY_BOOTS 510 +#define ITEM_BLUNDER_POLICY 511 +#define ITEM_ROOM_SERVICE 512 +#define ITEM_UTILITY_UMBRELLA 513 // Berries -#define ITEM_CHERI_BERRY 515 -#define ITEM_CHESTO_BERRY 516 -#define ITEM_PECHA_BERRY 517 -#define ITEM_RAWST_BERRY 518 -#define ITEM_ASPEAR_BERRY 519 -#define ITEM_LEPPA_BERRY 520 -#define ITEM_ORAN_BERRY 521 -#define ITEM_PERSIM_BERRY 522 -#define ITEM_LUM_BERRY 523 -#define ITEM_SITRUS_BERRY 524 -#define ITEM_FIGY_BERRY 525 -#define ITEM_WIKI_BERRY 526 -#define ITEM_MAGO_BERRY 527 -#define ITEM_AGUAV_BERRY 528 -#define ITEM_IAPAPA_BERRY 529 -#define ITEM_RAZZ_BERRY 530 -#define ITEM_BLUK_BERRY 531 -#define ITEM_NANAB_BERRY 532 -#define ITEM_WEPEAR_BERRY 533 -#define ITEM_PINAP_BERRY 534 -#define ITEM_POMEG_BERRY 535 -#define ITEM_KELPSY_BERRY 536 -#define ITEM_QUALOT_BERRY 537 -#define ITEM_HONDEW_BERRY 538 -#define ITEM_GREPA_BERRY 539 -#define ITEM_TAMATO_BERRY 540 -#define ITEM_CORNN_BERRY 541 -#define ITEM_MAGOST_BERRY 542 -#define ITEM_RABUTA_BERRY 543 -#define ITEM_NOMEL_BERRY 544 -#define ITEM_SPELON_BERRY 545 -#define ITEM_PAMTRE_BERRY 546 -#define ITEM_WATMEL_BERRY 547 -#define ITEM_DURIN_BERRY 548 -#define ITEM_BELUE_BERRY 549 -#define ITEM_CHILAN_BERRY 550 -#define ITEM_OCCA_BERRY 551 -#define ITEM_PASSHO_BERRY 552 -#define ITEM_WACAN_BERRY 553 -#define ITEM_RINDO_BERRY 554 -#define ITEM_YACHE_BERRY 555 -#define ITEM_CHOPLE_BERRY 556 -#define ITEM_KEBIA_BERRY 557 -#define ITEM_SHUCA_BERRY 558 -#define ITEM_COBA_BERRY 559 -#define ITEM_PAYAPA_BERRY 560 -#define ITEM_TANGA_BERRY 561 -#define ITEM_CHARTI_BERRY 562 -#define ITEM_KASIB_BERRY 563 -#define ITEM_HABAN_BERRY 564 -#define ITEM_COLBUR_BERRY 565 -#define ITEM_BABIRI_BERRY 566 -#define ITEM_ROSELI_BERRY 567 -#define ITEM_LIECHI_BERRY 568 -#define ITEM_GANLON_BERRY 569 -#define ITEM_SALAC_BERRY 570 -#define ITEM_PETAYA_BERRY 571 -#define ITEM_APICOT_BERRY 572 -#define ITEM_LANSAT_BERRY 573 -#define ITEM_STARF_BERRY 574 -#define ITEM_ENIGMA_BERRY 575 -#define ITEM_MICLE_BERRY 576 -#define ITEM_CUSTAP_BERRY 577 -#define ITEM_JABOCA_BERRY 578 -#define ITEM_ROWAP_BERRY 579 -#define ITEM_KEE_BERRY 580 -#define ITEM_MARANGA_BERRY 581 -#define ITEM_ENIGMA_BERRY_E_READER 582 +#define ITEM_CHERI_BERRY 514 +#define ITEM_CHESTO_BERRY 515 +#define ITEM_PECHA_BERRY 516 +#define ITEM_RAWST_BERRY 517 +#define ITEM_ASPEAR_BERRY 518 +#define ITEM_LEPPA_BERRY 519 +#define ITEM_ORAN_BERRY 520 +#define ITEM_PERSIM_BERRY 521 +#define ITEM_LUM_BERRY 522 +#define ITEM_SITRUS_BERRY 523 +#define ITEM_FIGY_BERRY 524 +#define ITEM_WIKI_BERRY 525 +#define ITEM_MAGO_BERRY 526 +#define ITEM_AGUAV_BERRY 527 +#define ITEM_IAPAPA_BERRY 528 +#define ITEM_RAZZ_BERRY 529 +#define ITEM_BLUK_BERRY 530 +#define ITEM_NANAB_BERRY 531 +#define ITEM_WEPEAR_BERRY 532 +#define ITEM_PINAP_BERRY 533 +#define ITEM_POMEG_BERRY 534 +#define ITEM_KELPSY_BERRY 535 +#define ITEM_QUALOT_BERRY 536 +#define ITEM_HONDEW_BERRY 537 +#define ITEM_GREPA_BERRY 538 +#define ITEM_TAMATO_BERRY 539 +#define ITEM_CORNN_BERRY 540 +#define ITEM_MAGOST_BERRY 541 +#define ITEM_RABUTA_BERRY 542 +#define ITEM_NOMEL_BERRY 543 +#define ITEM_SPELON_BERRY 544 +#define ITEM_PAMTRE_BERRY 545 +#define ITEM_WATMEL_BERRY 546 +#define ITEM_DURIN_BERRY 547 +#define ITEM_BELUE_BERRY 548 +#define ITEM_CHILAN_BERRY 549 +#define ITEM_OCCA_BERRY 550 +#define ITEM_PASSHO_BERRY 551 +#define ITEM_WACAN_BERRY 552 +#define ITEM_RINDO_BERRY 553 +#define ITEM_YACHE_BERRY 554 +#define ITEM_CHOPLE_BERRY 555 +#define ITEM_KEBIA_BERRY 556 +#define ITEM_SHUCA_BERRY 557 +#define ITEM_COBA_BERRY 558 +#define ITEM_PAYAPA_BERRY 559 +#define ITEM_TANGA_BERRY 560 +#define ITEM_CHARTI_BERRY 561 +#define ITEM_KASIB_BERRY 562 +#define ITEM_HABAN_BERRY 563 +#define ITEM_COLBUR_BERRY 564 +#define ITEM_BABIRI_BERRY 565 +#define ITEM_ROSELI_BERRY 566 +#define ITEM_LIECHI_BERRY 567 +#define ITEM_GANLON_BERRY 568 +#define ITEM_SALAC_BERRY 569 +#define ITEM_PETAYA_BERRY 570 +#define ITEM_APICOT_BERRY 571 +#define ITEM_LANSAT_BERRY 572 +#define ITEM_STARF_BERRY 573 +#define ITEM_ENIGMA_BERRY 574 +#define ITEM_MICLE_BERRY 575 +#define ITEM_CUSTAP_BERRY 576 +#define ITEM_JABOCA_BERRY 577 +#define ITEM_ROWAP_BERRY 578 +#define ITEM_KEE_BERRY 579 +#define ITEM_MARANGA_BERRY 580 +#define ITEM_ENIGMA_BERRY_E_READER 581 #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY_E_READER // TMs/HMs -#define ITEM_TM01 583 -#define ITEM_TM02 584 -#define ITEM_TM03 585 -#define ITEM_TM04 586 -#define ITEM_TM05 587 -#define ITEM_TM06 588 -#define ITEM_TM07 589 -#define ITEM_TM08 590 -#define ITEM_TM09 591 -#define ITEM_TM10 592 -#define ITEM_TM11 593 -#define ITEM_TM12 594 -#define ITEM_TM13 595 -#define ITEM_TM14 596 -#define ITEM_TM15 597 -#define ITEM_TM16 598 -#define ITEM_TM17 599 -#define ITEM_TM18 600 -#define ITEM_TM19 601 -#define ITEM_TM20 602 -#define ITEM_TM21 603 -#define ITEM_TM22 604 -#define ITEM_TM23 605 -#define ITEM_TM24 606 -#define ITEM_TM25 607 -#define ITEM_TM26 608 -#define ITEM_TM27 609 -#define ITEM_TM28 610 -#define ITEM_TM29 611 -#define ITEM_TM30 612 -#define ITEM_TM31 613 -#define ITEM_TM32 614 -#define ITEM_TM33 615 -#define ITEM_TM34 616 -#define ITEM_TM35 617 -#define ITEM_TM36 618 -#define ITEM_TM37 619 -#define ITEM_TM38 620 -#define ITEM_TM39 621 -#define ITEM_TM40 622 -#define ITEM_TM41 623 -#define ITEM_TM42 624 -#define ITEM_TM43 625 -#define ITEM_TM44 626 -#define ITEM_TM45 627 -#define ITEM_TM46 628 -#define ITEM_TM47 629 -#define ITEM_TM48 630 -#define ITEM_TM49 631 -#define ITEM_TM50 632 -#define ITEM_TM51 633 -#define ITEM_TM52 634 -#define ITEM_TM53 635 -#define ITEM_TM54 636 -#define ITEM_TM55 637 -#define ITEM_TM56 638 -#define ITEM_TM57 639 -#define ITEM_TM58 640 -#define ITEM_TM59 641 -#define ITEM_TM60 642 -#define ITEM_TM61 643 -#define ITEM_TM62 644 -#define ITEM_TM63 645 -#define ITEM_TM64 646 -#define ITEM_TM65 647 -#define ITEM_TM66 648 -#define ITEM_TM67 649 -#define ITEM_TM68 650 -#define ITEM_TM69 651 -#define ITEM_TM70 652 -#define ITEM_TM71 653 -#define ITEM_TM72 654 -#define ITEM_TM73 655 -#define ITEM_TM74 656 -#define ITEM_TM75 657 -#define ITEM_TM76 658 -#define ITEM_TM77 659 -#define ITEM_TM78 660 -#define ITEM_TM79 661 -#define ITEM_TM80 662 -#define ITEM_TM81 663 -#define ITEM_TM82 664 -#define ITEM_TM83 665 -#define ITEM_TM84 666 -#define ITEM_TM85 667 -#define ITEM_TM86 668 -#define ITEM_TM87 669 -#define ITEM_TM88 670 -#define ITEM_TM89 671 -#define ITEM_TM90 672 -#define ITEM_TM91 673 -#define ITEM_TM92 674 -#define ITEM_TM93 675 -#define ITEM_TM94 676 -#define ITEM_TM95 677 -#define ITEM_TM96 678 -#define ITEM_TM97 679 -#define ITEM_TM98 680 -#define ITEM_TM99 681 -#define ITEM_TM100 682 +#define ITEM_TM01 582 +#define ITEM_TM02 583 +#define ITEM_TM03 584 +#define ITEM_TM04 585 +#define ITEM_TM05 586 +#define ITEM_TM06 587 +#define ITEM_TM07 588 +#define ITEM_TM08 589 +#define ITEM_TM09 590 +#define ITEM_TM10 591 +#define ITEM_TM11 592 +#define ITEM_TM12 593 +#define ITEM_TM13 594 +#define ITEM_TM14 595 +#define ITEM_TM15 596 +#define ITEM_TM16 597 +#define ITEM_TM17 598 +#define ITEM_TM18 599 +#define ITEM_TM19 600 +#define ITEM_TM20 601 +#define ITEM_TM21 602 +#define ITEM_TM22 603 +#define ITEM_TM23 604 +#define ITEM_TM24 605 +#define ITEM_TM25 606 +#define ITEM_TM26 607 +#define ITEM_TM27 608 +#define ITEM_TM28 609 +#define ITEM_TM29 610 +#define ITEM_TM30 611 +#define ITEM_TM31 612 +#define ITEM_TM32 613 +#define ITEM_TM33 614 +#define ITEM_TM34 615 +#define ITEM_TM35 616 +#define ITEM_TM36 617 +#define ITEM_TM37 618 +#define ITEM_TM38 619 +#define ITEM_TM39 620 +#define ITEM_TM40 621 +#define ITEM_TM41 622 +#define ITEM_TM42 623 +#define ITEM_TM43 624 +#define ITEM_TM44 625 +#define ITEM_TM45 626 +#define ITEM_TM46 627 +#define ITEM_TM47 628 +#define ITEM_TM48 629 +#define ITEM_TM49 630 +#define ITEM_TM50 631 +#define ITEM_TM51 632 +#define ITEM_TM52 633 +#define ITEM_TM53 634 +#define ITEM_TM54 635 +#define ITEM_TM55 636 +#define ITEM_TM56 637 +#define ITEM_TM57 638 +#define ITEM_TM58 639 +#define ITEM_TM59 640 +#define ITEM_TM60 641 +#define ITEM_TM61 642 +#define ITEM_TM62 643 +#define ITEM_TM63 644 +#define ITEM_TM64 645 +#define ITEM_TM65 646 +#define ITEM_TM66 647 +#define ITEM_TM67 648 +#define ITEM_TM68 649 +#define ITEM_TM69 650 +#define ITEM_TM70 651 +#define ITEM_TM71 652 +#define ITEM_TM72 653 +#define ITEM_TM73 654 +#define ITEM_TM74 655 +#define ITEM_TM75 656 +#define ITEM_TM76 657 +#define ITEM_TM77 658 +#define ITEM_TM78 659 +#define ITEM_TM79 660 +#define ITEM_TM80 661 +#define ITEM_TM81 662 +#define ITEM_TM82 663 +#define ITEM_TM83 664 +#define ITEM_TM84 665 +#define ITEM_TM85 666 +#define ITEM_TM86 667 +#define ITEM_TM87 668 +#define ITEM_TM88 669 +#define ITEM_TM89 670 +#define ITEM_TM90 671 +#define ITEM_TM91 672 +#define ITEM_TM92 673 +#define ITEM_TM93 674 +#define ITEM_TM94 675 +#define ITEM_TM95 676 +#define ITEM_TM96 677 +#define ITEM_TM97 678 +#define ITEM_TM98 679 +#define ITEM_TM99 680 +#define ITEM_TM100 681 -#define ITEM_HM01 683 -#define ITEM_HM02 684 -#define ITEM_HM03 685 -#define ITEM_HM04 686 -#define ITEM_HM05 687 -#define ITEM_HM06 688 -#define ITEM_HM07 689 -#define ITEM_HM08 690 +#define ITEM_HM01 682 +#define ITEM_HM02 683 +#define ITEM_HM03 684 +#define ITEM_HM04 685 +#define ITEM_HM05 686 +#define ITEM_HM06 687 +#define ITEM_HM07 688 +#define ITEM_HM08 689 #define ITEM_TM01_FOCUS_PUNCH ITEM_TM01 #define ITEM_TM02_DRAGON_CLAW ITEM_TM02 @@ -852,85 +851,84 @@ #define ITEM_HM08_DIVE ITEM_HM08 // Charms -#define ITEM_OVAL_CHARM 691 -#define ITEM_SHINY_CHARM 692 -#define ITEM_CATCHING_CHARM 693 -#define ITEM_EXP_CHARM 694 +#define ITEM_OVAL_CHARM 690 +#define ITEM_SHINY_CHARM 691 +#define ITEM_CATCHING_CHARM 692 +#define ITEM_EXP_CHARM 693 // Form-changing Key Items -#define ITEM_ROTOM_CATALOG 695 -#define ITEM_GRACIDEA 696 -#define ITEM_REVEAL_GLASS 697 -#define ITEM_DNA_SPLICERS 698 -#define ITEM_ZYGARDE_CUBE 699 -#define ITEM_PRISON_BOTTLE 700 -#define ITEM_N_SOLARIZER 701 -#define ITEM_N_LUNARIZER 702 -#define ITEM_REINS_OF_UNITY 703 +#define ITEM_ROTOM_CATALOG 694 +#define ITEM_GRACIDEA 695 +#define ITEM_REVEAL_GLASS 696 +#define ITEM_DNA_SPLICERS 697 +#define ITEM_ZYGARDE_CUBE 698 +#define ITEM_PRISON_BOTTLE 699 +#define ITEM_N_SOLARIZER 700 +#define ITEM_N_LUNARIZER 701 +#define ITEM_REINS_OF_UNITY 702 // Battle Mechanic Key Items -#define ITEM_KEY_STONE 704 -#define ITEM_MEGA_RING 705 -#define ITEM_Z_POWER_RING 706 -#define ITEM_DYNAMAX_BAND 707 +#define ITEM_MEGA_RING 703 +#define ITEM_Z_POWER_RING 704 +#define ITEM_DYNAMAX_BAND 705 // Misc. Key Items -#define ITEM_BICYCLE 708 -#define ITEM_MACH_BIKE 709 -#define ITEM_ACRO_BIKE 710 -#define ITEM_OLD_ROD 711 -#define ITEM_GOOD_ROD 712 -#define ITEM_SUPER_ROD 713 -#define ITEM_DOWSING_MACHINE 714 -#define ITEM_TOWN_MAP 715 -#define ITEM_VS_SEEKER 716 -#define ITEM_TM_CASE 717 -#define ITEM_BERRY_POUCH 718 -#define ITEM_POKEMON_BOX_LINK 719 -#define ITEM_COIN_CASE 720 -#define ITEM_POWDER_JAR 721 -#define ITEM_WAILMER_PAIL 722 -#define ITEM_POKE_RADAR 723 -#define ITEM_POKEBLOCK_CASE 724 -#define ITEM_SOOT_SACK 725 -#define ITEM_POKE_FLUTE 726 -#define ITEM_FAME_CHECKER 727 -#define ITEM_TEACHY_TV 728 +#define ITEM_BICYCLE 706 +#define ITEM_MACH_BIKE 707 +#define ITEM_ACRO_BIKE 708 +#define ITEM_OLD_ROD 709 +#define ITEM_GOOD_ROD 710 +#define ITEM_SUPER_ROD 711 +#define ITEM_DOWSING_MACHINE 712 +#define ITEM_TOWN_MAP 713 +#define ITEM_VS_SEEKER 714 +#define ITEM_TM_CASE 715 +#define ITEM_BERRY_POUCH 716 +#define ITEM_POKEMON_BOX_LINK 717 +#define ITEM_COIN_CASE 718 +#define ITEM_POWDER_JAR 719 +#define ITEM_WAILMER_PAIL 720 +#define ITEM_POKE_RADAR 721 +#define ITEM_POKEBLOCK_CASE 722 +#define ITEM_SOOT_SACK 723 +#define ITEM_POKE_FLUTE 724 +#define ITEM_FAME_CHECKER 725 +#define ITEM_TEACHY_TV 726 // Story Key Items -#define ITEM_SS_TICKET 729 -#define ITEM_EON_TICKET 730 -#define ITEM_MYSTIC_TICKET 731 -#define ITEM_AURORA_TICKET 732 -#define ITEM_OLD_SEA_MAP 733 -#define ITEM_LETTER 734 -#define ITEM_DEVON_PARTS 735 -#define ITEM_GO_GOGGLES 736 -#define ITEM_DEVON_SCOPE 737 -#define ITEM_BASEMENT_KEY 738 -#define ITEM_SCANNER 739 -#define ITEM_STORAGE_KEY 740 -#define ITEM_KEY_TO_ROOM_1 741 -#define ITEM_KEY_TO_ROOM_2 742 -#define ITEM_KEY_TO_ROOM_4 743 -#define ITEM_KEY_TO_ROOM_6 744 -#define ITEM_METEORITE 745 -#define ITEM_MAGMA_EMBLEM 746 -#define ITEM_CONTEST_PASS 747 -#define ITEM_OAKS_PARCEL 748 -#define ITEM_SECRET_KEY 749 -#define ITEM_BIKE_VOUCHER 750 -#define ITEM_GOLD_TEETH 751 -#define ITEM_CARD_KEY 752 -#define ITEM_LIFT_KEY 753 -#define ITEM_SILPH_SCOPE 754 -#define ITEM_TRI_PASS 755 -#define ITEM_RAINBOW_PASS 756 -#define ITEM_TEA 757 -#define ITEM_RUBY 758 -#define ITEM_SAPPHIRE 759 +#define ITEM_SS_TICKET 727 +#define ITEM_EON_TICKET 728 +#define ITEM_MYSTIC_TICKET 729 +#define ITEM_AURORA_TICKET 730 +#define ITEM_OLD_SEA_MAP 731 +#define ITEM_LETTER 732 +#define ITEM_DEVON_PARTS 733 +#define ITEM_GO_GOGGLES 734 +#define ITEM_DEVON_SCOPE 735 +#define ITEM_BASEMENT_KEY 736 +#define ITEM_SCANNER 737 +#define ITEM_STORAGE_KEY 738 +#define ITEM_KEY_TO_ROOM_1 739 +#define ITEM_KEY_TO_ROOM_2 740 +#define ITEM_KEY_TO_ROOM_4 741 +#define ITEM_KEY_TO_ROOM_6 742 +#define ITEM_METEORITE 743 +#define ITEM_MAGMA_EMBLEM 744 +#define ITEM_CONTEST_PASS 745 +#define ITEM_OAKS_PARCEL 746 +#define ITEM_SECRET_KEY 747 +#define ITEM_BIKE_VOUCHER 748 +#define ITEM_GOLD_TEETH 749 +#define ITEM_CARD_KEY 750 +#define ITEM_LIFT_KEY 751 +#define ITEM_SILPH_SCOPE 752 +#define ITEM_TRI_PASS 753 +#define ITEM_RAINBOW_PASS 754 +#define ITEM_TEA 755 +#define ITEM_RUBY 756 +#define ITEM_SAPPHIRE 757 -#define ITEMS_COUNT 760 +#define ITEMS_COUNT 758 #define ITEM_FIELD_ARROW ITEMS_COUNT // Range of berries given out by various NPCS @@ -955,7 +953,7 @@ #define ITEM_TO_MAIL(itemId)((itemId) - FIRST_MAIL_INDEX) #define MAIL_NONE 0xFF -#define NUM_TECHNICAL_MACHINES 50 +#define NUM_TECHNICAL_MACHINES 100 #define NUM_HIDDEN_MACHINES 8 #define MAX_BAG_ITEM_CAPACITY 99 diff --git a/include/graphics.h b/include/graphics.h index 849248b419..abdc76ffff 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7163,23 +7163,23 @@ extern const u32 gItemIcon_SacredAsh[]; extern const u32 gItemIconPalette_SacredAsh[]; extern const u32 gItemIcon_SweetHeart[]; extern const u32 gItemIconPalette_SweetHeart[]; -//extern const u32 gItemIcon_MaxHoney[]; -//extern const u32 gItemIconPalette_MaxHoney[]; +extern const u32 gItemIcon_MaxHoney[]; +extern const u32 gItemIconPalette_MaxHoney[]; // Regional Specialties -//extern const u32 gItemIcon_PewterCrunchies[]; -//extern const u32 gItemIconPalette_PewterCrunchies[]; -//extern const u32 gItemIcon_RageCandyBar[]; -//extern const u32 gItemIconPalette_RageCandyBar[]; +extern const u32 gItemIcon_PewterCrunchies[]; +extern const u32 gItemIconPalette_PewterCrunchies[]; +extern const u32 gItemIcon_RageCandyBar[]; +extern const u32 gItemIconPalette_RageCandyBar[]; extern const u32 gItemIcon_LavaCookie[]; extern const u32 gItemIconPalette_LavaCookieAndLetter[]; extern const u32 gItemIcon_OldGateau[]; extern const u32 gItemIconPalette_OldGateau[]; -//extern const u32 gItemIcon_CasteliaCone[]; -//extern const u32 gItemIconPalette_CasteliaCone[]; -//extern const u32 gItemIcon_LumioseGalette[]; -//extern const u32 gItemIconPalette_LumioseGalette[]; -//extern const u32 gItemIcon_ShalourSable[]; -//extern const u32 gItemIconPalette_ShalourSable[]; +extern const u32 gItemIcon_Casteliacone[]; +extern const u32 gItemIconPalette_Casteliacone[]; +extern const u32 gItemIcon_LumioseGalette[]; +extern const u32 gItemIconPalette_LumioseGalette[]; +extern const u32 gItemIcon_ShalourSable[]; +extern const u32 gItemIconPalette_ShalourSable[]; extern const u32 gItemIcon_BigMalasada[]; extern const u32 gItemIconPalette_BigMalasada[]; // Vitamins @@ -7211,66 +7211,27 @@ extern const u32 gItemIconPalette_SwiftFeather[]; // Ability Modifiers extern const u32 gItemIcon_AbilityCapsule[]; extern const u32 gItemIconPalette_AbilityCapsule[]; -//extern const u32 gItemIcon_AbilityPatch[]; -//extern const u32 gItemIconPalette_AbilityPatch[]; +extern const u32 gItemIcon_AbilityPatch[]; +extern const u32 gItemIconPalette_AbilityPatch[]; // Mints -//extern const u32 gItemIcon_LonelyMint[]; -//extern const u32 gItemIconPalette_LonelyMint[]; -//extern const u32 gItemIcon_AdamantMint[]; -//extern const u32 gItemIconPalette_AdamantMint[]; -//extern const u32 gItemIcon_NaughtyMint[]; -//extern const u32 gItemIconPalette_NaughtyMint[]; -//extern const u32 gItemIcon_BraveMint[]; -//extern const u32 gItemIconPalette_BraveMint[]; -//extern const u32 gItemIcon_BoldMint[]; -//extern const u32 gItemIconPalette_BoldMint[]; -//extern const u32 gItemIcon_ImpishMint[]; -//extern const u32 gItemIconPalette_ImpishMint[]; -//extern const u32 gItemIcon_LaxMint[]; -//extern const u32 gItemIconPalette_LaxMint[]; -//extern const u32 gItemIcon_RelaxedMint[]; -//extern const u32 gItemIconPalette_RelaxedMint[]; -//extern const u32 gItemIcon_ModestMint[]; -//extern const u32 gItemIconPalette_ModestMint[]; -//extern const u32 gItemIcon_MildMint[]; -//extern const u32 gItemIconPalette_MildMint[]; -//extern const u32 gItemIcon_RashMint[]; -//extern const u32 gItemIconPalette_RashMint[]; -//extern const u32 gItemIcon_QuietMint[]; -//extern const u32 gItemIconPalette_QuietMint[]; -//extern const u32 gItemIcon_CalmMint[]; -//extern const u32 gItemIconPalette_CalmMint[]; -//extern const u32 gItemIcon_GentleMint[]; -//extern const u32 gItemIconPalette_GentleMint[]; -//extern const u32 gItemIcon_CarefulMint[]; -//extern const u32 gItemIconPalette_CarefulMint[]; -//extern const u32 gItemIcon_SassyMint[]; -//extern const u32 gItemIconPalette_SassyMint[]; -//extern const u32 gItemIcon_TimidMint[]; -//extern const u32 gItemIconPalette_TimidMint[]; -//extern const u32 gItemIcon_HastyMint[]; -//extern const u32 gItemIconPalette_HastyMint[]; -//extern const u32 gItemIcon_JollyMint[]; -//extern const u32 gItemIconPalette_JollyMint[]; -//extern const u32 gItemIcon_NaiveMint[]; -//extern const u32 gItemIconPalette_NaiveMint[]; -//extern const u32 gItemIcon_SeriousMint[]; -//extern const u32 gItemIconPalette_SeriousMint[]; +extern const u32 gItemIcon_Mint[]; +extern const u32 gItemIconPalette_RedMint[]; +extern const u32 gItemIconPalette_BlueMint[]; +extern const u32 gItemIconPalette_LightBlueMint[]; +extern const u32 gItemIconPalette_PinkMint[]; +extern const u32 gItemIconPalette_GreenMint[]; +extern const u32 gItemIconPalette_YellowMint[]; // Candy extern const u32 gItemIcon_RareCandy[]; extern const u32 gItemIconPalette_RareCandy[]; -//extern const u32 gItemIcon_EXPCandyXS[]; -//extern const u32 gItemIconPalette_EXPCandyXS[]; -//extern const u32 gItemIcon_EXPCandyS[]; -//extern const u32 gItemIconPalette_EXPCandyS[]; -//extern const u32 gItemIcon_EXPCandyM[]; -//extern const u32 gItemIconPalette_EXPCandyM[]; -//extern const u32 gItemIcon_EXPCandyL[]; -//extern const u32 gItemIconPalette_EXPCandyL[]; -//extern const u32 gItemIcon_EXPCandyXL[]; -//extern const u32 gItemIconPalette_EXPCandyXL[]; -//extern const u32 gItemIcon_DynamaxCandy[]; -//extern const u32 gItemIconPalette_DynamaxCandy[]; +extern const u32 gItemIcon_ExpCandyXS[]; +extern const u32 gItemIcon_ExpCandyS[]; +extern const u32 gItemIcon_ExpCandyM[]; +extern const u32 gItemIcon_ExpCandyL[]; +extern const u32 gItemIcon_ExpCandyXL[]; +extern const u32 gItemIconPalette_ExpCandies[]; +extern const u32 gItemIcon_DynamaxCandy[]; +extern const u32 gItemIconPalette_DynamaxCandy[]; // Medicinal Flutes extern const u32 gItemIcon_Flute[]; extern const u32 gItemIconPalette_BlueFlute[]; @@ -7284,12 +7245,10 @@ extern const u32 gItemIcon_Repel[]; extern const u32 gItemIconPalette_Repel[]; extern const u32 gItemIconPalette_SuperRepel[]; extern const u32 gItemIconPalette_MaxRepel[]; -//extern const u32 gItemIcon_Lure[]; -//extern const u32 gItemIconPalette_Lure[]; -//extern const u32 gItemIcon_SuperLure[]; -//extern const u32 gItemIconPalette_SuperLure[]; -//extern const u32 gItemIcon_MaxLure[]; -//extern const u32 gItemIconPalette_MaxLure[]; +extern const u32 gItemIcon_Lure[]; +extern const u32 gItemIconPalette_Lure[]; +extern const u32 gItemIconPalette_SuperLure[]; +extern const u32 gItemIconPalette_MaxLure[]; extern const u32 gItemIcon_EscapeRope[]; extern const u32 gItemIconPalette_EscapeRope[]; // X Items @@ -7308,34 +7267,33 @@ extern const u32 gItemIcon_PokeDoll[]; extern const u32 gItemIconPalette_PokeDoll[]; extern const u32 gItemIcon_FluffyTail[]; extern const u32 gItemIconPalette_FluffyTail[]; -//extern const u32 gItemIcon_PokeToy[]; -//extern const u32 gItemIconPalette_PokeToy[]; -//extern const u32 gItemIcon_MaxMushrooms[]; -//extern const u32 gItemIconPalette_MaxMushrooms[]; +extern const u32 gItemIcon_PokeToy[]; +extern const u32 gItemIconPalette_PokeToy[]; +extern const u32 gItemIcon_MaxMushrooms[]; +extern const u32 gItemIconPalette_MaxMushrooms[]; // Treasures -//extern const u32 gItemIcon_BottleCap[]; -//extern const u32 gItemIconPalette_BottleCap[]; -//extern const u32 gItemIcon_GoldBottleCap[]; -//extern const u32 gItemIconPalette_GoldBottleCap[]; +extern const u32 gItemIcon_BottleCap[]; +extern const u32 gItemIconPalette_BottleCap[]; +extern const u32 gItemIconPalette_GoldBottleCap[]; extern const u32 gItemIcon_Nugget[]; extern const u32 gItemIconPalette_Nugget[]; -//extern const u32 gItemIcon_BigNugget[]; -//extern const u32 gItemIconPalette_BigNugget[]; +extern const u32 gItemIcon_BigNugget[]; +extern const u32 gItemIconPalette_BigNugget[]; extern const u32 gItemIcon_TinyMushroom[]; extern const u32 gItemIconPalette_Mushroom[]; extern const u32 gItemIcon_BigMushroom[]; -//extern const u32 gItemIcon_BalmMushroom[]; -//extern const u32 gItemIconPalette_BalmMushroom[]; +extern const u32 gItemIcon_BalmMushroom[]; +extern const u32 gItemIconPalette_BalmMushroom[]; extern const u32 gItemIcon_Pearl[]; extern const u32 gItemIconPalette_Pearl[]; extern const u32 gItemIcon_BigPearl[]; -//extern const u32 gItemIcon_PearlString[]; -//extern const u32 gItemIconPalette_PearlString[]; +extern const u32 gItemIcon_PearlString[]; +extern const u32 gItemIconPalette_PearlString[]; extern const u32 gItemIcon_Stardust[]; extern const u32 gItemIconPalette_Star[]; extern const u32 gItemIcon_StarPiece[]; -//extern const u32 gItemIcon_CometShard[]; -//extern const u32 gItemIconPalette_CometShard[]; +extern const u32 gItemIcon_CometShard[]; +extern const u32 gItemIconPalette_CometShard[]; extern const u32 gItemIconPalette_ShoalSalt[]; extern const u32 gItemIcon_ShoalShell[]; extern const u32 gItemIconPalette_Shell[]; @@ -7354,24 +7312,17 @@ extern const u32 gItemIcon_OddKeystone[]; extern const u32 gItemIconPalette_OddKeystone[]; extern const u32 gItemIcon_PrettyFeather[]; extern const u32 gItemIconPalette_PrettyFeather[]; -//extern const u32 gItemIcon_RelicCopper[]; -//extern const u32 gItemIconPalette_RelicCopper[]; -//extern const u32 gItemIcon_RelicCopper[]; -//extern const u32 gItemIconPalette_RelicCopper[]; -//extern const u32 gItemIcon_RelicSilver[]; -//extern const u32 gItemIconPalette_RelicSilver[]; -//extern const u32 gItemIcon_RelicGold[]; -//extern const u32 gItemIconPalette_RelicGold[]; -//extern const u32 gItemIcon_RelicVase[]; -//extern const u32 gItemIconPalette_RelicVase[]; -//extern const u32 gItemIcon_RelicBand[]; -//extern const u32 gItemIconPalette_RelicBand[]; -//extern const u32 gItemIcon_RelicStatue[]; -//extern const u32 gItemIconPalette_RelicStatue[]; -//extern const u32 gItemIcon_RelicCrown[]; -//extern const u32 gItemIconPalette_RelicCrown[]; -//extern const u32 gItemIcon_StrangeSouvenir[]; -//extern const u32 gItemIconPalette_StrangeSouvenir[]; +extern const u32 gItemIcon_RelicCoin[]; +extern const u32 gItemIconPalette_RelicCopper[]; +extern const u32 gItemIconPalette_RelicSilver[]; +extern const u32 gItemIconPalette_RelicGold[]; +extern const u32 gItemIcon_RelicVase[]; +extern const u32 gItemIconPalette_Relics[]; +extern const u32 gItemIcon_RelicBand[]; +extern const u32 gItemIcon_RelicStatue[]; +extern const u32 gItemIcon_RelicCrown[]; +extern const u32 gItemIcon_StrangeSouvenir[]; +extern const u32 gItemIconPalette_StrangeSouvenir[]; // Fossils extern const u32 gItemIcon_HelixFossil[]; extern const u32 gItemIconPalette_KantoFossil[]; @@ -7393,31 +7344,25 @@ extern const u32 gItemIcon_JawFossil[]; extern const u32 gItemIconPalette_JawFossil[]; extern const u32 gItemIcon_SailFossil[]; extern const u32 gItemIconPalette_SailFossil[]; -//extern const u32 gItemIcon_FossilizedBird[]; -//extern const u32 gItemIconPalette_FossilizedBird[]; -//extern const u32 gItemIcon_FossilizedFish[]; -//extern const u32 gItemIconPalette_FossilizedFish[]; -//extern const u32 gItemIcon_FossilizedDrake[]; -//extern const u32 gItemIconPalette_FossilizedDrake[]; -//extern const u32 gItemIcon_FossilizedDino[]; -//extern const u32 gItemIconPalette_FossilizedDino[]; +extern const u32 gItemIcon_FossilizedBird[]; +extern const u32 gItemIconPalette_FossilizedBird[]; +extern const u32 gItemIcon_FossilizedFish[]; +extern const u32 gItemIconPalette_FossilizedFish[]; +extern const u32 gItemIcon_FossilizedDrake[]; +extern const u32 gItemIconPalette_FossilizedDrake[]; +extern const u32 gItemIcon_FossilizedDino[]; +extern const u32 gItemIconPalette_FossilizedDino[]; // Mulch -//extern const u32 gItemIcon_GrowthMulch[]; -//extern const u32 gItemIconPalette_GrowthMulch[]; -//extern const u32 gItemIcon_DampMulch[]; -//extern const u32 gItemIconPalette_DampMulch[]; -//extern const u32 gItemIcon_StableMulch[]; -//extern const u32 gItemIconPalette_StableMulch[]; -//extern const u32 gItemIcon_GooeyMulch[]; -//extern const u32 gItemIconPalette_GooeyMulch[]; -//extern const u32 gItemIcon_RichMulch[]; -//extern const u32 gItemIconPalette_RichMulch[]; -//extern const u32 gItemIcon_SurpriseMulch[]; -//extern const u32 gItemIconPalette_SurpriseMulch[]; -//extern const u32 gItemIcon_BoostMulch[]; -//extern const u32 gItemIconPalette_BoostMulch[]; -//extern const u32 gItemIcon_AmazeMulch[]; -//extern const u32 gItemIconPalette_AmazeMulch[]; +extern const u32 gItemIcon_Mulch[]; +extern const u32 gItemIconPalette_GrowthMulch[]; +extern const u32 gItemIconPalette_DampMulch[]; +extern const u32 gItemIcon_StableMulch[]; +extern const u32 gItemIconPalette_StableMulch[]; +extern const u32 gItemIconPalette_GooeyMulch[]; +extern const u32 gItemIconPalette_RichMulch[]; +extern const u32 gItemIconPalette_SurpriseMulch[]; +extern const u32 gItemIconPalette_BoostMulch[]; +extern const u32 gItemIconPalette_AmazeMulch[]; // Apricorns extern const u32 gItemIcon_RedApricorn[]; extern const u32 gItemIconPalette_RedApricorn[]; @@ -7433,14 +7378,14 @@ extern const u32 gItemIcon_WhiteApricorn[]; extern const u32 gItemIconPalette_WhiteApricorn[]; extern const u32 gItemIcon_BlackApricorn[]; extern const u32 gItemIconPalette_BlackApricorn[]; -//extern const u32 gItemIcon_WishingPiece[]; -//extern const u32 gItemIconPalette_WishingPiece[]; -//extern const u32 gItemIcon_GalaricaTwig[]; -//extern const u32 gItemIconPalette_GalaricaTwig[]; -//extern const u32 gItemIcon_ArmoriteOre[]; -//extern const u32 gItemIconPalette_ArmoriteOre[]; -//extern const u32 gItemIcon_DyniteOre[]; -//extern const u32 gItemIconPalette_DyniteOre[]; +extern const u32 gItemIcon_WishingPiece[]; +extern const u32 gItemIconPalette_WishingPiece[]; +extern const u32 gItemIcon_GalaricaTwig[]; +extern const u32 gItemIconPalette_GalaricaItem[]; +extern const u32 gItemIcon_ArmoriteOre[]; +extern const u32 gItemIconPalette_ArmoriteOre[]; +extern const u32 gItemIcon_DyniteOre[]; +extern const u32 gItemIconPalette_DyniteOre[]; // Mail extern const u32 gItemIcon_OrangeMail[]; extern const u32 gItemIconPalette_OrangeMail[]; @@ -7487,18 +7432,15 @@ extern const u32 gItemIcon_DuskStone[]; extern const u32 gItemIconPalette_DuskStone[]; extern const u32 gItemIcon_DawnStone[]; extern const u32 gItemIconPalette_DawnStone[]; -//extern const u32 gItemIcon_SweetApple[]; -//extern const u32 gItemIconPalette_SweetApple[]; -//extern const u32 gItemIcon_TartApple[]; -//extern const u32 gItemIconPalette_TartApple[]; -//extern const u32 gItemIcon_CrackedPot[]; -//extern const u32 gItemIconPalette_CrackedPot[]; -//extern const u32 gItemIcon_ChippedPot[]; -//extern const u32 gItemIconPalette_ChippedPot[]; -//extern const u32 gItemIcon_GalaricaCuff[]; -//extern const u32 gItemIconPalette_GalaricaCuff[]; -//extern const u32 gItemIcon_GalaricaWreath[]; -//extern const u32 gItemIconPalette_GalaricaWreath[]; +extern const u32 gItemIcon_SweetApple[]; +extern const u32 gItemIconPalette_SweetApple[]; +extern const u32 gItemIcon_TartApple[]; +extern const u32 gItemIconPalette_TartApple[]; +extern const u32 gItemIcon_CrackedPot[]; +extern const u32 gItemIcon_ChippedPot[]; +extern const u32 gItemIconPalette_Pot[]; +extern const u32 gItemIcon_GalaricaCuff[]; +extern const u32 gItemIcon_GalaricaWreath[]; extern const u32 gItemIcon_DragonScale[]; extern const u32 gItemIconPalette_DragonScale[]; extern const u32 gItemIcon_Upgrade[]; @@ -7521,20 +7463,20 @@ extern const u32 gItemIcon_Sachet[]; extern const u32 gItemIconPalette_Sachet[]; extern const u32 gItemIcon_OvalStone[]; extern const u32 gItemIconPalette_OvalStone[]; -//extern const u32 gItemIcon_StrawberrySweet[]; -//extern const u32 gItemIconPalette_StrawberrySweet[]; -//extern const u32 gItemIcon_LoveSweet[]; -//extern const u32 gItemIconPalette_LoveSweet[]; -//extern const u32 gItemIcon_BerrySweet[]; -//extern const u32 gItemIconPalette_BerrySweet[]; -//extern const u32 gItemIcon_CloverSweet[]; -//extern const u32 gItemIconPalette_CloverSweet[]; -//extern const u32 gItemIcon_FlowerSweet[]; -//extern const u32 gItemIconPalette_FlowerSweet[]; -//extern const u32 gItemIcon_StarSweet[]; -//extern const u32 gItemIconPalette_StarSweet[]; -//extern const u32 gItemIcon_RibbonSweet[]; -//extern const u32 gItemIconPalette_RibbonSweet[]; +extern const u32 gItemIcon_StrawberrySweet[]; +extern const u32 gItemIconPalette_StrawberrySweet[]; +extern const u32 gItemIcon_LoveSweet[]; +extern const u32 gItemIconPalette_LoveSweet[]; +extern const u32 gItemIcon_BerrySweet[]; +extern const u32 gItemIconPalette_BerrySweet[]; +extern const u32 gItemIcon_CloverSweet[]; +extern const u32 gItemIconPalette_CloverSweet[]; +extern const u32 gItemIcon_FlowerSweet[]; +extern const u32 gItemIconPalette_FlowerSweet[]; +extern const u32 gItemIcon_StarSweet[]; +extern const u32 gItemIconPalette_StarSweet[]; +extern const u32 gItemIcon_RibbonSweet[]; +extern const u32 gItemIconPalette_RibbonSweet[]; extern const u32 gItemIcon_Everstone[]; extern const u32 gItemIconPalette_Everstone[]; // Nectars @@ -7625,17 +7567,14 @@ extern const u32 gItemIcon_SteelMemory[]; extern const u32 gItemIconPalette_SteelMemory[]; extern const u32 gItemIcon_FairyMemory[]; extern const u32 gItemIconPalette_FairyMemory[]; -//extern const u32 gItemIcon_RustedSword[]; -//extern const u32 gItemIconPalette_RustedSword[]; -//extern const u32 gItemIcon_RustedShield[]; -//extern const u32 gItemIconPalette_RustedShield[]; +extern const u32 gItemIcon_RustedSword[]; +extern const u32 gItemIcon_RustedShield[]; +extern const u32 gItemIconPalette_RustedWeapons[]; // Colored Orbs extern const u32 gItemIcon_RedOrb[]; extern const u32 gItemIconPalette_RedOrb[]; extern const u32 gItemIcon_BlueOrb[]; extern const u32 gItemIconPalette_BlueOrb[]; -//extern const u32 gItemIcon_JadeOrb[]; -//extern const u32 gItemIconPalette_JadeOrb[]; // Mega Stones extern const u32 gItemIcon_Venusaurite[]; extern const u32 gItemIconPalette_Venusaurite[]; @@ -8075,18 +8014,18 @@ extern const u32 gItemIcon_TerrainExtender[]; extern const u32 gItemIconPalette_TerrainExtender[]; extern const u32 gItemIcon_ProtectivePads[]; extern const u32 gItemIconPalette_ProtectivePads[]; -//extern const u32 gItemIcon_ThroatSpray[]; -//extern const u32 gItemIconPalette_ThroatSpray[]; -//extern const u32 gItemIcon_EjectPack[]; -//extern const u32 gItemIconPalette_EjectPack[]; -//extern const u32 gItemIcon_HeavyDutyBoots[]; -//extern const u32 gItemIconPalette_HeavyDutyBoots[]; -//extern const u32 gItemIcon_BlunderPolicy[]; -//extern const u32 gItemIconPalette_BlunderPolicy[]; -//extern const u32 gItemIcon_RoomService[]; -//extern const u32 gItemIconPalette_RoomService[]; -//extern const u32 gItemIcon_UtilityUmbrella[]; -//extern const u32 gItemIconPalette_UtilityUmbrella[]; +extern const u32 gItemIcon_ThroatSpray[]; +extern const u32 gItemIconPalette_ThroatSpray[]; +extern const u32 gItemIcon_EjectPack[]; +extern const u32 gItemIconPalette_EjectPack[]; +extern const u32 gItemIcon_HeavyDutyBoots[]; +extern const u32 gItemIconPalette_HeavyDutyBoots[]; +extern const u32 gItemIcon_BlunderPolicy[]; +extern const u32 gItemIconPalette_BlunderPolicy[]; +extern const u32 gItemIcon_RoomService[]; +extern const u32 gItemIconPalette_RoomService[]; +extern const u32 gItemIcon_UtilityUmbrella[]; +extern const u32 gItemIconPalette_UtilityUmbrella[]; // Berries extern const u32 gItemIcon_CheriBerry[]; extern const u32 gItemIconPalette_CheriBerry[]; @@ -8208,8 +8147,8 @@ extern const u32 gItemIcon_LansatBerry[]; extern const u32 gItemIconPalette_LansatBerry[]; extern const u32 gItemIcon_StarfBerry[]; extern const u32 gItemIconPalette_StarfBerry[]; -//extern const u32 gItemIcon_EnigmaBerry[]; -//extern const u32 gItemIconPalette_EnigmaBerry[]; +extern const u32 gItemIcon_EnigmaBerry[]; +extern const u32 gItemIconPalette_EnigmaBerry[]; extern const u32 gItemIcon_MicleBerry[]; extern const u32 gItemIconPalette_MicleBerry[]; extern const u32 gItemIcon_CustapBerry[]; @@ -8222,8 +8161,6 @@ extern const u32 gItemIcon_KeeBerry[]; extern const u32 gItemIconPalette_KeeBerry[]; extern const u32 gItemIcon_MarangaBerry[]; extern const u32 gItemIconPalette_MarangaBerry[]; -extern const u32 gItemIcon_EnigmaBerry[]; -extern const u32 gItemIconPalette_EnigmaBerry[]; // TMs/HMs extern const u32 gItemIcon_TM[]; extern const u32 gItemIcon_HM[]; @@ -8250,38 +8187,35 @@ extern const u32 gItemIcon_OvalCharm[]; extern const u32 gItemIconPalette_OvalCharm[]; extern const u32 gItemIcon_ShinyCharm[]; extern const u32 gItemIconPalette_ShinyCharm[]; -//extern const u32 gItemIcon_CatchingCharm[]; -//extern const u32 gItemIconPalette_CatchingCharm[]; -//extern const u32 gItemIcon_ExpCharm[]; -//extern const u32 gItemIconPalette_ExpCharm[]; +extern const u32 gItemIcon_CatchingCharm[]; +extern const u32 gItemIconPalette_CatchingCharm[]; +extern const u32 gItemIcon_ExpCharm[]; +extern const u32 gItemIconPalette_ExpCharm[]; // Form-changing Key Items -//extern const u32 gItemIcon_RotomCatalog[]; -//extern const u32 gItemIconPalette_RotomCatalog[]; +extern const u32 gItemIcon_RotomCatalog[]; +extern const u32 gItemIconPalette_RotomCatalog[]; extern const u32 gItemIcon_Gracidea[]; extern const u32 gItemIconPalette_Gracidea[]; -//extern const u32 gItemIcon_RevealGlass[]; -//extern const u32 gItemIconPalette_RevealGlass[]; -//extern const u32 gItemIcon_DNASplicers[]; -//extern const u32 gItemIconPalette_DNASplicers[]; -//extern const u32 gItemIcon_ZygardeCube[]; -//extern const u32 gItemIconPalette_ZygardeCube[]; -//extern const u32 gItemIcon_PrisonBottle[]; -//extern const u32 gItemIconPalette_PrisonBottle[]; -//extern const u32 gItemIcon_NSolarizer[]; -//extern const u32 gItemIconPalette_NSolarizer[]; -//extern const u32 gItemIcon_NLunarizer[]; -//extern const u32 gItemIconPalette_NLunarizer[]; -//extern const u32 gItemIcon_ReinsOfUnity[]; -//extern const u32 gItemIconPalette_ReinsOfUnity[]; +extern const u32 gItemIcon_RevealGlass[]; +extern const u32 gItemIconPalette_RevealGlass[]; +extern const u32 gItemIcon_DNASplicers[]; +extern const u32 gItemIconPalette_DNASplicers[]; +extern const u32 gItemIcon_ZygardeCube[]; +extern const u32 gItemIconPalette_ZygardeCube[]; +extern const u32 gItemIcon_PrisonBottle[]; +extern const u32 gItemIconPalette_PrisonBottle[]; +extern const u32 gItemIcon_NecrozmaFuser[]; +extern const u32 gItemIconPalette_NSolarizer[]; +extern const u32 gItemIconPalette_NLunarizer[]; +extern const u32 gItemIcon_ReinsOfUnity[]; +extern const u32 gItemIconPalette_ReinsOfUnity[]; // Battle Mechanic Key Items -//extern const u32 gItemIcon_KeyStone[]; -//extern const u32 gItemIconPalette_KeyStone[]; -//extern const u32 gItemIcon_MegaRing[]; -//extern const u32 gItemIconPalette_MegaRing[]; -//extern const u32 gItemIcon_ZPowerRing[]; -//extern const u32 gItemIconPalette_ZPowerRing[]; -//extern const u32 gItemIcon_DynamaxBand[]; -//extern const u32 gItemIconPalette_DynamaxBand[]; +extern const u32 gItemIcon_MegaRing[]; +extern const u32 gItemIconPalette_MegaRing[]; +extern const u32 gItemIcon_ZPowerRing[]; +extern const u32 gItemIconPalette_ZPowerRing[]; +extern const u32 gItemIcon_DynamaxBand[]; +extern const u32 gItemIconPalette_DynamaxBand[]; // Misc. Key Items extern const u32 gItemIcon_Bicycle[]; extern const u32 gItemIconPalette_Bicycle[]; @@ -8305,16 +8239,16 @@ extern const u32 gItemIcon_TMCase[]; extern const u32 gItemIconPalette_TMCase[]; extern const u32 gItemIcon_BerryPouch[]; extern const u32 gItemIconPalette_BerryPouch[]; -//extern const u32 gItemIcon_PokemonBoxLink[]; -//extern const u32 gItemIconPalette_PokemonBoxLink[]; +extern const u32 gItemIcon_PokemonBoxLink[]; +extern const u32 gItemIconPalette_PokemonBoxLink[]; extern const u32 gItemIcon_CoinCase[]; extern const u32 gItemIconPalette_CoinCase[]; extern const u32 gItemIcon_PowderJar[]; extern const u32 gItemIconPalette_PowderJar[]; extern const u32 gItemIcon_WailmerPail[]; extern const u32 gItemIconPalette_WailmerPail[]; -//extern const u32 gItemIcon_PokeRadar[]; -//extern const u32 gItemIconPalette_PokeRadar[]; +extern const u32 gItemIcon_PokeRadar[]; +extern const u32 gItemIconPalette_PokeRadar[]; extern const u32 gItemIcon_PokeblockCase[]; extern const u32 gItemIconPalette_PokeblockCase[]; extern const u32 gItemIcon_SootSack[]; diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index 572ffae65d..6462a232d1 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -153,7 +153,7 @@ static const struct CaptureStar sCaptureStars[] = #define TAG_PARTICLES_SAFARIBALL 65052 #define TAG_PARTICLES_SPORTBALL 65053 #define TAG_PARTICLES_PARKBALL 65054 -#define TAG_PARTICLES_BEASTBALL 65065 +#define TAG_PARTICLES_BEASTBALL 65055 #define TAG_PARTICLES_CHERISHBALL 65056 static const struct CompressedSpriteSheet sBallParticleSpriteSheets[] = diff --git a/src/berry.c b/src/berry.c index 71345b7dd7..88cd88b791 100644 --- a/src/berry.c +++ b/src/berry.c @@ -26,70 +26,70 @@ static u16 GetStageDurationByBerryType(u8); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); -static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy."); -static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY's thick skin and fruit are"); +static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red Berry is very spicy."); +static const u8 sBerryDescriptionPart1_Chesto[] = _("The Berry's thick skin and fruit are"); static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over."); static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious."); static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care."); static const u8 sBerryDescriptionPart1_Rawst[] = _("If the leaves grow long and curly,"); -static const u8 sBerryDescriptionPart2_Rawst[] = _("the BERRY seems to grow very bitter."); -static const u8 sBerryDescriptionPart1_Aspear[] = _("The hard BERRY is dense with a rich"); +static const u8 sBerryDescriptionPart2_Rawst[] = _("the Berry seems to grow very bitter."); +static const u8 sBerryDescriptionPart1_Aspear[] = _("The hard Berry is dense with a rich"); static const u8 sBerryDescriptionPart2_Aspear[] = _("juice. It is quite sour."); -static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and others."); -static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier."); -static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors."); -static const u8 sBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day."); -static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY's color"); +static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than Cheri and others."); +static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the Berry, the tastier."); +static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar Berry with a mix of flavors."); +static const u8 sBerryDescriptionPart2_Oran[] = _("Berries grow in half a day."); +static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The Berry's color"); static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun."); static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving"); -static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES."); -static const u8 sBerryDescriptionPart1_Sitrus[] = _("Closely related to ORAN. The large"); -static const u8 sBerryDescriptionPart2_Sitrus[] = _("BERRY has a well-rounded flavor."); -static const u8 sBerryDescriptionPart1_Figy[] = _("The BERRY, which looks chewed up,"); +static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two Berries."); +static const u8 sBerryDescriptionPart1_Sitrus[] = _("Closely related to Oran. The large"); +static const u8 sBerryDescriptionPart2_Sitrus[] = _("Berry has a well-rounded flavor."); +static const u8 sBerryDescriptionPart1_Figy[] = _("The Berry, which looks chewed up,"); static const u8 sBerryDescriptionPart2_Figy[] = _("brims with spicy substances."); -static const u8 sBerryDescriptionPart1_Wiki[] = _("The BERRY is said to have grown lumpy"); -static const u8 sBerryDescriptionPart2_Wiki[] = _("to help POKéMON grip it."); -static const u8 sBerryDescriptionPart1_Mago[] = _("The BERRY turns curvy as it grows."); +static const u8 sBerryDescriptionPart1_Wiki[] = _("The Berry is said to have grown lumpy"); +static const u8 sBerryDescriptionPart2_Wiki[] = _("to help Pokémon grip it."); +static const u8 sBerryDescriptionPart1_Mago[] = _("The Berry turns curvy as it grows."); static const u8 sBerryDescriptionPart2_Mago[] = _("The curvier, the sweeter and tastier."); static const u8 sBerryDescriptionPart1_Aguav[] = _("The flower is dainty. It is rare in its"); static const u8 sBerryDescriptionPart2_Aguav[] = _("ability to grow without light."); -static const u8 sBerryDescriptionPart1_Iapapa[] = _("The BERRY is very big and sour."); +static const u8 sBerryDescriptionPart1_Iapapa[] = _("The Berry is very big and sour."); static const u8 sBerryDescriptionPart2_Iapapa[] = _("It takes at least a day to grow."); -static const u8 sBerryDescriptionPart1_Razz[] = _("The red BERRY tastes slightly spicy."); +static const u8 sBerryDescriptionPart1_Razz[] = _("The red Berry tastes slightly spicy."); static const u8 sBerryDescriptionPart2_Razz[] = _("It grows quickly in just four hours."); -static const u8 sBerryDescriptionPart1_Bluk[] = _("The BERRY is blue on the outside, but"); +static const u8 sBerryDescriptionPart1_Bluk[] = _("The Berry is blue on the outside, but"); static const u8 sBerryDescriptionPart2_Bluk[] = _("it blackens the mouth when eaten."); -static const u8 sBerryDescriptionPart1_Nanab[] = _("This BERRY was the seventh"); +static const u8 sBerryDescriptionPart1_Nanab[] = _("This Berry was the seventh"); static const u8 sBerryDescriptionPart2_Nanab[] = _("discovered in the world. It is sweet."); static const u8 sBerryDescriptionPart1_Wepear[] = _("The flower is small and white. It has a"); static const u8 sBerryDescriptionPart2_Wepear[] = _("delicate balance of bitter and sour."); static const u8 sBerryDescriptionPart1_Pinap[] = _("Weak against wind and cold."); static const u8 sBerryDescriptionPart2_Pinap[] = _("The fruit is spicy and the skin, sour."); static const u8 sBerryDescriptionPart1_Pomeg[] = _("However much it is watered,"); -static const u8 sBerryDescriptionPart2_Pomeg[] = _("it only grows up to six BERRIES."); +static const u8 sBerryDescriptionPart2_Pomeg[] = _("it only grows up to six Berries."); static const u8 sBerryDescriptionPart1_Kelpsy[] = _("A rare variety shaped like a root."); static const u8 sBerryDescriptionPart2_Kelpsy[] = _("Grows a very large flower."); static const u8 sBerryDescriptionPart1_Qualot[] = _("Loves water. Grows strong even in"); static const u8 sBerryDescriptionPart2_Qualot[] = _("locations with constant rainfall."); -static const u8 sBerryDescriptionPart1_Hondew[] = _("A BERRY that is very valuable and"); +static const u8 sBerryDescriptionPart1_Hondew[] = _("A Berry that is very valuable and"); static const u8 sBerryDescriptionPart2_Hondew[] = _("rarely seen. It is very delicious."); static const u8 sBerryDescriptionPart1_Grepa[] = _("Despite its tenderness and round"); -static const u8 sBerryDescriptionPart2_Grepa[] = _("shape, the BERRY is unimaginably sour."); -static const u8 sBerryDescriptionPart1_Tamato[] = _("The BERRY is lip-bendingly spicy."); +static const u8 sBerryDescriptionPart2_Grepa[] = _("shape, the Berry is unimaginably sour."); +static const u8 sBerryDescriptionPart1_Tamato[] = _("The Berry is lip-bendingly spicy."); static const u8 sBerryDescriptionPart2_Tamato[] = _("It takes time to grow."); -static const u8 sBerryDescriptionPart1_Cornn[] = _("A BERRY from an ancient era. May not"); +static const u8 sBerryDescriptionPart1_Cornn[] = _("A Berry from an ancient era. May not"); static const u8 sBerryDescriptionPart2_Cornn[] = _("grow unless planted in quantity."); -static const u8 sBerryDescriptionPart1_Magost[] = _("A BERRY that is widely said to have"); +static const u8 sBerryDescriptionPart1_Magost[] = _("A Berry that is widely said to have"); static const u8 sBerryDescriptionPart2_Magost[] = _("a finely balanced flavor."); static const u8 sBerryDescriptionPart1_Rabuta[] = _("A rare variety that is overgrown with"); static const u8 sBerryDescriptionPart2_Rabuta[] = _("hair. It is quite bitter."); static const u8 sBerryDescriptionPart1_Nomel[] = _("Quite sour. Just one bite makes it"); static const u8 sBerryDescriptionPart2_Nomel[] = _("impossible to taste for three days."); -static const u8 sBerryDescriptionPart1_Spelon[] = _("The vividly red BERRY is very spicy."); +static const u8 sBerryDescriptionPart1_Spelon[] = _("The vividly red Berry is very spicy."); static const u8 sBerryDescriptionPart2_Spelon[] = _("Its warts secrete a spicy substance."); static const u8 sBerryDescriptionPart1_Pamtre[] = _("Drifts on the sea from somewhere."); static const u8 sBerryDescriptionPart2_Pamtre[] = _("It is thought to grow elsewhere."); -static const u8 sBerryDescriptionPart1_Watmel[] = _("A huge BERRY, with some over 20"); +static const u8 sBerryDescriptionPart1_Watmel[] = _("A huge Berry, with some over 20"); static const u8 sBerryDescriptionPart2_Watmel[] = _("inches discovered. Exceedingly sweet."); static const u8 sBerryDescriptionPart1_Durin[] = _("Bitter to even look at. It is so"); static const u8 sBerryDescriptionPart2_Durin[] = _("bitter, no one has ever eaten it as is."); @@ -131,21 +131,21 @@ static const u8 sBerryDescriptionPart1_Babiri[] = _("Very tough with a strong fl static const u8 sBerryDescriptionPart2_Babiri[] = _("was used to make medicine in the past."); static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings"); static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown."); -static const u8 sBerryDescriptionPart1_Liechi[] = _("A mysterious BERRY. It is rumored to"); +static const u8 sBerryDescriptionPart1_Liechi[] = _("A mysterious Berry. It is rumored to"); static const u8 sBerryDescriptionPart2_Liechi[] = _("contain the power of the sea."); -static const u8 sBerryDescriptionPart1_Ganlon[] = _("A mysterious BERRY. It is rumored to"); +static const u8 sBerryDescriptionPart1_Ganlon[] = _("A mysterious Berry. It is rumored to"); static const u8 sBerryDescriptionPart2_Ganlon[] = _("contain the power of the land."); -static const u8 sBerryDescriptionPart1_Salac[] = _("A mysterious BERRY. It is rumored to"); +static const u8 sBerryDescriptionPart1_Salac[] = _("A mysterious Berry. It is rumored to"); static const u8 sBerryDescriptionPart2_Salac[] = _("contain the power of the sky."); -static const u8 sBerryDescriptionPart1_Petaya[] = _("A mysterious BERRY. It is rumored to"); +static const u8 sBerryDescriptionPart1_Petaya[] = _("A mysterious Berry. It is rumored to"); static const u8 sBerryDescriptionPart2_Petaya[] = _("contain the power of all living things."); -static const u8 sBerryDescriptionPart1_Apicot[] = _("A very mystifying BERRY. No telling"); +static const u8 sBerryDescriptionPart1_Apicot[] = _("A very mystifying Berry. No telling"); static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used."); -static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY."); +static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary Berry."); static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy."); static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the"); static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage."); -static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); +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_Micle[] = _("It makes other food eaten at the"); static const u8 sBerryDescriptionPart2_Micle[] = _("same time taste sweet."); @@ -164,7 +164,7 @@ const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CHERI"), + .name = _("Cheri"), .firmness = BERRY_FIRMNESS_SOFT, .size = 20, .maxYield = 3, @@ -182,7 +182,7 @@ const struct Berry gBerries[] = [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CHESTO"), + .name = _("Chesto"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 80, .maxYield = 3, @@ -200,7 +200,7 @@ const struct Berry gBerries[] = [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PECHA"), + .name = _("Pecha"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 40, .maxYield = 3, @@ -218,7 +218,7 @@ const struct Berry gBerries[] = [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { - .name = _("RAWST"), + .name = _("Rawst"), .firmness = BERRY_FIRMNESS_HARD, .size = 32, .maxYield = 3, @@ -236,7 +236,7 @@ const struct Berry gBerries[] = [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("ASPEAR"), + .name = _("Aspear"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 50, .maxYield = 3, @@ -254,7 +254,7 @@ const struct Berry gBerries[] = [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("LEPPA"), + .name = _("Leppa"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 28, .maxYield = 3, @@ -272,7 +272,7 @@ const struct Berry gBerries[] = [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("ORAN"), + .name = _("Oran"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 35, .maxYield = 3, @@ -290,7 +290,7 @@ const struct Berry gBerries[] = [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PERSIM"), + .name = _("Persim"), .firmness = BERRY_FIRMNESS_HARD, .size = 47, .maxYield = 3, @@ -308,7 +308,7 @@ const struct Berry gBerries[] = [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { - .name = _("LUM"), + .name = _("Lum"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 34, .maxYield = 2, @@ -326,7 +326,7 @@ const struct Berry gBerries[] = [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { - .name = _("SITRUS"), + .name = _("Sitrus"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 95, .maxYield = 3, @@ -344,7 +344,7 @@ const struct Berry gBerries[] = [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { - .name = _("FIGY"), + .name = _("Figy"), .firmness = BERRY_FIRMNESS_SOFT, .size = 100, .maxYield = 3, @@ -362,7 +362,7 @@ const struct Berry gBerries[] = [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("WIKI"), + .name = _("Wiki"), .firmness = BERRY_FIRMNESS_HARD, .size = 115, .maxYield = 3, @@ -380,7 +380,7 @@ const struct Berry gBerries[] = [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("MAGO"), + .name = _("Mago"), .firmness = BERRY_FIRMNESS_HARD, .size = 126, .maxYield = 3, @@ -398,7 +398,7 @@ const struct Berry gBerries[] = [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { - .name = _("AGUAV"), + .name = _("Aguav"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 64, .maxYield = 3, @@ -416,7 +416,7 @@ const struct Berry gBerries[] = [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("IAPAPA"), + .name = _("Iapapa"), .firmness = BERRY_FIRMNESS_SOFT, .size = 223, .maxYield = 3, @@ -434,7 +434,7 @@ const struct Berry gBerries[] = [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { - .name = _("RAZZ"), + .name = _("Razz"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 120, .maxYield = 6, @@ -452,7 +452,7 @@ const struct Berry gBerries[] = [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { - .name = _("BLUK"), + .name = _("Bluk"), .firmness = BERRY_FIRMNESS_SOFT, .size = 108, .maxYield = 6, @@ -470,7 +470,7 @@ const struct Berry gBerries[] = [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { - .name = _("NANAB"), + .name = _("Nanab"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 77, .maxYield = 6, @@ -488,7 +488,7 @@ const struct Berry gBerries[] = [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("WEPEAR"), + .name = _("Wepear"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 74, .maxYield = 6, @@ -506,7 +506,7 @@ const struct Berry gBerries[] = [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PINAP"), + .name = _("Pinap"), .firmness = BERRY_FIRMNESS_HARD, .size = 80, .maxYield = 6, @@ -524,7 +524,7 @@ const struct Berry gBerries[] = [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = { - .name = _("POMEG"), + .name = _("Pomeg"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 135, .maxYield = 6, @@ -542,7 +542,7 @@ const struct Berry gBerries[] = [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = { - .name = _("KELPSY"), + .name = _("Kelpsy"), .firmness = BERRY_FIRMNESS_HARD, .size = 150, .maxYield = 6, @@ -560,7 +560,7 @@ const struct Berry gBerries[] = [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("QUALOT"), + .name = _("Qualot"), .firmness = BERRY_FIRMNESS_HARD, .size = 110, .maxYield = 6, @@ -578,7 +578,7 @@ const struct Berry gBerries[] = [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = { - .name = _("HONDEW"), + .name = _("Hondew"), .firmness = BERRY_FIRMNESS_HARD, .size = 162, .maxYield = 6, @@ -596,7 +596,7 @@ const struct Berry gBerries[] = [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("GREPA"), + .name = _("Grepa"), .firmness = BERRY_FIRMNESS_SOFT, .size = 149, .maxYield = 6, @@ -614,7 +614,7 @@ const struct Berry gBerries[] = [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("TAMATO"), + .name = _("Tamato"), .firmness = BERRY_FIRMNESS_SOFT, .size = 200, .maxYield = 4, @@ -632,7 +632,7 @@ const struct Berry gBerries[] = [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CORNN"), + .name = _("Cornn"), .firmness = BERRY_FIRMNESS_HARD, .size = 75, .maxYield = 4, @@ -650,7 +650,7 @@ const struct Berry gBerries[] = [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = { - .name = _("MAGOST"), + .name = _("Magost"), .firmness = BERRY_FIRMNESS_HARD, .size = 140, .maxYield = 4, @@ -668,7 +668,7 @@ const struct Berry gBerries[] = [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("RABUTA"), + .name = _("Rabuta"), .firmness = BERRY_FIRMNESS_SOFT, .size = 226, .maxYield = 4, @@ -686,7 +686,7 @@ const struct Berry gBerries[] = [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = _("NOMEL"), + .name = _("Nomel"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 285, .maxYield = 4, @@ -704,7 +704,7 @@ const struct Berry gBerries[] = [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = { - .name = _("SPELON"), + .name = _("Spelon"), .firmness = BERRY_FIRMNESS_SOFT, .size = 133, .maxYield = 2, @@ -722,7 +722,7 @@ const struct Berry gBerries[] = [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PAMTRE"), + .name = _("Pamtre"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 244, .maxYield = 2, @@ -740,7 +740,7 @@ const struct Berry gBerries[] = [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = _("WATMEL"), + .name = _("Watmel"), .firmness = BERRY_FIRMNESS_SOFT, .size = 250, .maxYield = 2, @@ -758,7 +758,7 @@ const struct Berry gBerries[] = [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("DURIN"), + .name = _("Durin"), .firmness = BERRY_FIRMNESS_HARD, .size = 280, .maxYield = 2, @@ -776,7 +776,7 @@ const struct Berry gBerries[] = [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("BELUE"), + .name = _("Belue"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 300, .maxYield = 2, @@ -794,7 +794,7 @@ const struct Berry gBerries[] = [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CHILAN"), + .name = _("Chilan"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 34, .maxYield = 5, @@ -812,7 +812,7 @@ const struct Berry gBerries[] = [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("OCCA"), + .name = _("Occa"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 90, .maxYield = 5, @@ -830,7 +830,7 @@ const struct Berry gBerries[] = [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PASSHO"), + .name = _("Passho"), .firmness = BERRY_FIRMNESS_SOFT, .size = 33, .maxYield = 5, @@ -848,7 +848,7 @@ const struct Berry gBerries[] = [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("WACAN"), + .name = _("Wacan"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 250, .maxYield = 5, @@ -866,7 +866,7 @@ const struct Berry gBerries[] = [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("RINDO"), + .name = _("Rindo"), .firmness = BERRY_FIRMNESS_SOFT, .size = 156, .maxYield = 5, @@ -884,7 +884,7 @@ const struct Berry gBerries[] = [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("YACHE"), + .name = _("Yache"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 135, .maxYield = 5, @@ -902,7 +902,7 @@ const struct Berry gBerries[] = [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CHOPLE"), + .name = _("Chople"), .firmness = BERRY_FIRMNESS_SOFT, .size = 77, .maxYield = 5, @@ -920,7 +920,7 @@ const struct Berry gBerries[] = [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("KEBIA"), + .name = _("Kebia"), .firmness = BERRY_FIRMNESS_HARD, .size = 90, .maxYield = 5, @@ -938,7 +938,7 @@ const struct Berry gBerries[] = [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("SHUCA"), + .name = _("Shuca"), .firmness = BERRY_FIRMNESS_SOFT, .size = 42, .maxYield = 5, @@ -956,7 +956,7 @@ const struct Berry gBerries[] = [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("COBA"), + .name = _("Coba"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 278, .maxYield = 5, @@ -974,7 +974,7 @@ const struct Berry gBerries[] = [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PAYAPA"), + .name = _("Payapa"), .firmness = BERRY_FIRMNESS_SOFT, .size = 252, .maxYield = 5, @@ -992,7 +992,7 @@ const struct Berry gBerries[] = [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("TANGA"), + .name = _("Tanga"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 42, .maxYield = 5, @@ -1010,7 +1010,7 @@ const struct Berry gBerries[] = [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CHARTI"), + .name = _("Charti"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 28, .maxYield = 5, @@ -1028,7 +1028,7 @@ const struct Berry gBerries[] = [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = { - .name = _("KASIB"), + .name = _("Kasib"), .firmness = BERRY_FIRMNESS_HARD, .size = 144, .maxYield = 5, @@ -1046,7 +1046,7 @@ const struct Berry gBerries[] = [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("HABAN"), + .name = _("Haban"), .firmness = BERRY_FIRMNESS_SOFT, .size = 23, .maxYield = 5, @@ -1064,7 +1064,7 @@ const struct Berry gBerries[] = [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("COLBUR"), + .name = _("Colbur"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 39, .maxYield = 5, @@ -1082,7 +1082,7 @@ const struct Berry gBerries[] = [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("BABIRI"), + .name = _("Babiri"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 265, .maxYield = 5, @@ -1100,7 +1100,7 @@ const struct Berry gBerries[] = [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("ROSELI"), + .name = _("Roseli"), .firmness = BERRY_FIRMNESS_HARD, .size = 35, .maxYield = 5, @@ -1118,7 +1118,7 @@ const struct Berry gBerries[] = [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("LIECHI"), + .name = _("Liechi"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 111, .maxYield = 2, @@ -1136,7 +1136,7 @@ const struct Berry gBerries[] = [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = { - .name = _("GANLON"), + .name = _("Ganlon"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 33, .maxYield = 2, @@ -1154,7 +1154,7 @@ const struct Berry gBerries[] = [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = { - .name = _("SALAC"), + .name = _("Salac"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 95, .maxYield = 2, @@ -1172,7 +1172,7 @@ const struct Berry gBerries[] = [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("PETAYA"), + .name = _("Petaya"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 237, .maxYield = 2, @@ -1190,7 +1190,7 @@ const struct Berry gBerries[] = [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("APICOT"), + .name = _("Apicot"), .firmness = BERRY_FIRMNESS_HARD, .size = 75, .maxYield = 2, @@ -1208,7 +1208,7 @@ const struct Berry gBerries[] = [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("LANSAT"), + .name = _("Lansat"), .firmness = BERRY_FIRMNESS_SOFT, .size = 97, .maxYield = 2, @@ -1226,7 +1226,7 @@ const struct Berry gBerries[] = [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = { - .name = _("STARF"), + .name = _("Starf"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 153, .maxYield = 2, @@ -1244,7 +1244,7 @@ const struct Berry gBerries[] = [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("ENIGMA"), + .name = _("Enigma"), .firmness = BERRY_FIRMNESS_HARD, .size = 155, .maxYield = 5, @@ -1262,7 +1262,7 @@ const struct Berry gBerries[] = [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("MICLE"), + .name = _("Micle"), .firmness = BERRY_FIRMNESS_SOFT, .size = 41, .maxYield = 5, @@ -1280,7 +1280,7 @@ const struct Berry gBerries[] = [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("CUSTAP"), + .name = _("Custap"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 267, .maxYield = 5, @@ -1298,7 +1298,7 @@ const struct Berry gBerries[] = [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("JABOCA"), + .name = _("Jaboca"), .firmness = BERRY_FIRMNESS_SOFT, .size = 33, .maxYield = 5, @@ -1316,7 +1316,7 @@ const struct Berry gBerries[] = [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("ROWAP"), + .name = _("Rowap"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 52, .maxYield = 5, @@ -1334,7 +1334,7 @@ const struct Berry gBerries[] = [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("KEE"), + .name = _("Kee"), .firmness = BERRY_FIRMNESS_UNKNOWN, .size = 0, .maxYield = 5, @@ -1352,7 +1352,7 @@ const struct Berry gBerries[] = [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("MARNGA"), // "Maranga" is too long + .name = _("Marnga"), // "Maranga" is too long .firmness = BERRY_FIRMNESS_UNKNOWN, .size = 0, .maxYield = 5, @@ -1370,7 +1370,7 @@ const struct Berry gBerries[] = [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = { - .name = _("ENIGMA"), + .name = _("Enigma"), .firmness = BERRY_FIRMNESS_UNKNOWN, .size = 0, .maxYield = 2, diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index ccb874cbb0..a755c7e6fd 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -160,16 +160,16 @@ const u32 gItemIconPalette_SacredAsh[] = INCBIN_U32("graphics/items/icon_palette 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_MaxHoney[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxHoney[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MaxHoney[] = INCBIN_U32("graphics/items/icons/max_honey.4bpp.lz"); +const u32 gItemIconPalette_MaxHoney[] = INCBIN_U32("graphics/items/icon_palettes/max_honey.gbapal.lz"); // Regional Specialties -//const u32 gItemIcon_PewterCrunchies[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PewterCrunchies[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PewterCrunchies[] = INCBIN_U32("graphics/items/icons/pewter_crunchies.4bpp.lz"); +const u32 gItemIconPalette_PewterCrunchies[] = INCBIN_U32("graphics/items/icon_palettes/pewter_crunchies.gbapal.lz"); -//const u32 gItemIcon_RageCandyBar[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RageCandyBar[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RageCandyBar[] = INCBIN_U32("graphics/items/icons/rage_candy_bar.4bpp.lz"); +const u32 gItemIconPalette_RageCandyBar[] = INCBIN_U32("graphics/items/icon_palettes/rage_candy_bar.gbapal.lz"); const u32 gItemIcon_LavaCookie[] = INCBIN_U32("graphics/items/icons/lava_cookie.4bpp.lz"); const u32 gItemIconPalette_LavaCookieAndLetter[] = INCBIN_U32("graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz"); @@ -177,14 +177,14 @@ const u32 gItemIconPalette_LavaCookieAndLetter[] = INCBIN_U32("graphics/items/ic 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_CasteliaCone[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CasteliaCone[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Casteliacone[] = INCBIN_U32("graphics/items/icons/casteliacone.4bpp.lz"); +const u32 gItemIconPalette_Casteliacone[] = INCBIN_U32("graphics/items/icon_palettes/casteliacone.gbapal.lz"); -//const u32 gItemIcon_LumioseGalette[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LumioseGalette[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_LumioseGalette[] = INCBIN_U32("graphics/items/icons/lumiose_galette.4bpp.lz"); +const u32 gItemIconPalette_LumioseGalette[] = INCBIN_U32("graphics/items/icon_palettes/lumiose_galette.gbapal.lz"); -//const u32 gItemIcon_ShalourSable[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ShalourSable[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ShalourSable[] = INCBIN_U32("graphics/items/icons/shalour_sable.4bpp.lz"); +const u32 gItemIconPalette_ShalourSable[] = INCBIN_U32("graphics/items/icon_palettes/shalour_sable.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"); @@ -236,96 +236,33 @@ const u32 gItemIconPalette_SwiftFeather[] = INCBIN_U32("graphics/items/icon_pale 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_AbilityPatch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AbilityPatch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_AbilityPatch[] = INCBIN_U32("graphics/items/icons/ability_patch.4bpp.lz"); +const u32 gItemIconPalette_AbilityPatch[] = INCBIN_U32("graphics/items/icon_palettes/ability_patch.gbapal.lz"); // Mints -//const u32 gItemIcon_LonelyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LonelyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_AdamantMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AdamantMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_NaughtyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NaughtyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BraveMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BraveMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BoldMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BoldMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ImpishMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ImpishMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_LaxMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LaxMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelaxedMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelaxedMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ModestMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ModestMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_MildMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MildMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RashMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RashMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_QuietMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_QuietMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_CalmMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CalmMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GentleMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GentleMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_CarefulMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CarefulMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SassyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SassyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_TimidMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_TimidMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_HastyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_HastyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_JollyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_JollyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_NaiveMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NaiveMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SeriousMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SeriousMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Mint[] = INCBIN_U32("graphics/items/icons/mint.4bpp.lz"); +const u32 gItemIconPalette_RedMint[] = INCBIN_U32("graphics/items/icon_palettes/red_mint.gbapal.lz"); +const u32 gItemIconPalette_BlueMint[] = INCBIN_U32("graphics/items/icon_palettes/blue_mint.gbapal.lz"); +const u32 gItemIconPalette_LightBlueMint[] = INCBIN_U32("graphics/items/icon_palettes/light_blue_mint.gbapal.lz"); +const u32 gItemIconPalette_PinkMint[] = INCBIN_U32("graphics/items/icon_palettes/pink_mint.gbapal.lz"); +const u32 gItemIconPalette_GreenMint[] = INCBIN_U32("graphics/items/icon_palettes/green_mint.gbapal.lz"); +const u32 gItemIconPalette_YellowMint[] = INCBIN_U32("graphics/items/icon_palettes/yellow_mint.gbapal.lz"); // Candy const u32 gItemIcon_RareCandy[] = INCBIN_U32("graphics/items/icons/rare_candy.4bpp.lz"); const u32 gItemIconPalette_RareCandy[] = INCBIN_U32("graphics/items/icon_palettes/rare_candy.gbapal.lz"); -//const u32 gItemIcon_EXPCandyXS[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyXS[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ExpCandyXS[] = INCBIN_U32("graphics/items/icons/exp_candy_xs.4bpp.lz"); +const u32 gItemIcon_ExpCandyS[] = INCBIN_U32("graphics/items/icons/exp_candy_s.4bpp.lz"); +const u32 gItemIcon_ExpCandyM[] = INCBIN_U32("graphics/items/icons/exp_candy_m.4bpp.lz"); +const u32 gItemIcon_ExpCandyL[] = INCBIN_U32("graphics/items/icons/exp_candy_l.4bpp.lz"); +const u32 gItemIcon_ExpCandyXL[] = INCBIN_U32("graphics/items/icons/exp_candy_xl.4bpp.lz"); +const u32 gItemIconPalette_ExpCandies[] = INCBIN_U32("graphics/items/icon_palettes/exp_candies.gbapal.lz"); -//const u32 gItemIcon_EXPCandyS[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyS[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyM[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyM[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyL[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyL[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyXL[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyXL[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_DynamaxCandy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DynamaxCandy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DynamaxCandy[] = INCBIN_U32("graphics/items/icons/dynamax_candy.4bpp.lz"); +const u32 gItemIconPalette_DynamaxCandy[] = INCBIN_U32("graphics/items/icon_palettes/dynamax_candy.gbapal.lz"); // Medicinal Flutes @@ -351,14 +288,10 @@ const u32 gItemIconPalette_SuperRepel[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIconPalette_MaxRepel[] = INCBIN_U32("graphics/items/icon_palettes/max_repel.gbapal.lz"); -//const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SuperLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_MaxLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/lure.4bpp.lz"); +const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/lure.gbapal.lz"); +const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/super_lure.gbapal.lz"); +const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/max_lure.gbapal.lz"); const u32 gItemIcon_EscapeRope[] = INCBIN_U32("graphics/items/icons/escape_rope.4bpp.lz"); const u32 gItemIconPalette_EscapeRope[] = INCBIN_U32("graphics/items/icon_palettes/escape_rope.gbapal.lz"); @@ -391,49 +324,47 @@ const u32 gItemIconPalette_PokeDoll[] = INCBIN_U32("graphics/items/icon_palettes const u32 gItemIcon_FluffyTail[] = INCBIN_U32("graphics/items/icons/fluffy_tail.4bpp.lz"); const u32 gItemIconPalette_FluffyTail[] = INCBIN_U32("graphics/items/icon_palettes/fluffy_tail.gbapal.lz"); -//const u32 gItemIcon_PokeToy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokeToy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokeToy[] = INCBIN_U32("graphics/items/icons/poke_toy.4bpp.lz"); +const u32 gItemIconPalette_PokeToy[] = INCBIN_U32("graphics/items/icon_palettes/poke_toy.gbapal.lz"); -//const u32 gItemIcon_MaxMushrooms[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxMushrooms[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MaxMushrooms[] = INCBIN_U32("graphics/items/icons/max_mushrooms.4bpp.lz"); +const u32 gItemIconPalette_MaxMushrooms[] = INCBIN_U32("graphics/items/icon_palettes/max_mushrooms.gbapal.lz"); // Treasures -//const u32 gItemIcon_BottleCap[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BottleCap[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GoldBottleCap[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GoldBottleCap[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BottleCap[] = INCBIN_U32("graphics/items/icons/bottle_cap.4bpp.lz"); +const u32 gItemIconPalette_BottleCap[] = INCBIN_U32("graphics/items/icon_palettes/bottle_cap.gbapal.lz"); +const u32 gItemIconPalette_GoldBottleCap[] = INCBIN_U32("graphics/items/icon_palettes/gold_bottle_cap.gbapal.lz"); const u32 gItemIcon_Nugget[] = INCBIN_U32("graphics/items/icons/nugget.4bpp.lz"); const u32 gItemIconPalette_Nugget[] = INCBIN_U32("graphics/items/icon_palettes/nugget.gbapal.lz"); -//const u32 gItemIcon_BigNugget[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BigNugget[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BigNugget[] = INCBIN_U32("graphics/items/icons/big_nugget.4bpp.lz"); +const u32 gItemIconPalette_BigNugget[] = INCBIN_U32("graphics/items/icon_palettes/big_nugget.gbapal.lz"); const u32 gItemIcon_TinyMushroom[] = INCBIN_U32("graphics/items/icons/tiny_mushroom.4bpp.lz"); const u32 gItemIconPalette_Mushroom[] = INCBIN_U32("graphics/items/icon_palettes/mushroom.gbapal.lz"); const u32 gItemIcon_BigMushroom[] = INCBIN_U32("graphics/items/icons/big_mushroom.4bpp.lz"); -//const u32 gItemIcon_BalmMushroom[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BalmMushroom[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BalmMushroom[] = INCBIN_U32("graphics/items/icons/balm_mushroom.4bpp.lz"); +const u32 gItemIconPalette_BalmMushroom[] = INCBIN_U32("graphics/items/icon_palettes/balm_mushroom.gbapal.lz"); const u32 gItemIcon_Pearl[] = INCBIN_U32("graphics/items/icons/pearl.4bpp.lz"); const u32 gItemIconPalette_Pearl[] = INCBIN_U32("graphics/items/icon_palettes/pearl.gbapal.lz"); const u32 gItemIcon_BigPearl[] = INCBIN_U32("graphics/items/icons/big_pearl.4bpp.lz"); -//const u32 gItemIcon_PearlString[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PearlString[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PearlString[] = INCBIN_U32("graphics/items/icons/pearl_string.4bpp.lz"); +const u32 gItemIconPalette_PearlString[] = INCBIN_U32("graphics/items/icon_palettes/pearl_string.gbapal.lz"); const u32 gItemIcon_Stardust[] = INCBIN_U32("graphics/items/icons/stardust.4bpp.lz"); const u32 gItemIconPalette_Star[] = INCBIN_U32("graphics/items/icon_palettes/star.gbapal.lz"); const u32 gItemIcon_StarPiece[] = INCBIN_U32("graphics/items/icons/star_piece.4bpp.lz"); -//const u32 gItemIcon_CometShard[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CometShard[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CometShard[] = INCBIN_U32("graphics/items/icons/comet_shard.4bpp.lz"); +const u32 gItemIconPalette_CometShard[] = INCBIN_U32("graphics/items/icon_palettes/comet_shard.gbapal.lz"); const u32 gItemIconPalette_ShoalSalt[] = INCBIN_U32("graphics/items/icon_palettes/shoal_salt.gbapal.lz"); @@ -464,32 +395,19 @@ const u32 gItemIconPalette_OddKeystone[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_PrettyFeather[] = INCBIN_U32("graphics/items/icons/pretty_feather.4bpp.lz"); const u32 gItemIconPalette_PrettyFeather[] = INCBIN_U32("graphics/items/icon_palettes/pretty_feather.gbapal.lz"); -//const u32 gItemIcon_RelicCopper[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RelicCoin[] = INCBIN_U32("graphics/items/icons/relic_coin.4bpp.lz"); +const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/relic_copper.gbapal.lz"); +const u32 gItemIconPalette_RelicSilver[] = INCBIN_U32("graphics/items/icon_palettes/relic_silver.gbapal.lz"); +const u32 gItemIconPalette_RelicGold[] = INCBIN_U32("graphics/items/icon_palettes/relic_gold.gbapal.lz"); -//const u32 gItemIcon_RelicCopper[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RelicVase[] = INCBIN_U32("graphics/items/icons/relic_vase.4bpp.lz"); +const u32 gItemIconPalette_Relics[] = INCBIN_U32("graphics/items/icon_palettes/relics.gbapal.lz"); +const u32 gItemIcon_RelicBand[] = INCBIN_U32("graphics/items/icons/relic_band.4bpp.lz"); +const u32 gItemIcon_RelicStatue[] = INCBIN_U32("graphics/items/icons/relic_statue.4bpp.lz"); +const u32 gItemIcon_RelicCrown[] = INCBIN_U32("graphics/items/icons/relic_crown.4bpp.lz"); -//const u32 gItemIcon_RelicSilver[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicSilver[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicGold[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicGold[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicVase[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicVase[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicBand[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicBand[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicStatue[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicStatue[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicCrown[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCrown[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_StrangeSouvenir[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StrangeSouvenir[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StrangeSouvenir[] = INCBIN_U32("graphics/items/icons/strange_souvenir.4bpp.lz"); +const u32 gItemIconPalette_StrangeSouvenir[] = INCBIN_U32("graphics/items/icon_palettes/strange_souvenir.gbapal.lz"); // Fossils @@ -524,43 +442,32 @@ const u32 gItemIconPalette_JawFossil[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_SailFossil[] = INCBIN_U32("graphics/items/icons/sail_fossil.4bpp.lz"); const u32 gItemIconPalette_SailFossil[] = INCBIN_U32("graphics/items/icon_palettes/sail_fossil.gbapal.lz"); -//const u32 gItemIcon_FossilizedBird[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedBird[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedBird[] = INCBIN_U32("graphics/items/icons/fossilized_bird.4bpp.lz"); +const u32 gItemIconPalette_FossilizedBird[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_bird.gbapal.lz"); -//const u32 gItemIcon_FossilizedFish[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedFish[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedFish[] = INCBIN_U32("graphics/items/icons/fossilized_fish.4bpp.lz"); +const u32 gItemIconPalette_FossilizedFish[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_fish.gbapal.lz"); -//const u32 gItemIcon_FossilizedDrake[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedDrake[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedDrake[] = INCBIN_U32("graphics/items/icons/fossilized_drake.4bpp.lz"); +const u32 gItemIconPalette_FossilizedDrake[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_drake.gbapal.lz"); -//const u32 gItemIcon_FossilizedDino[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedDino[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedDino[] = INCBIN_U32("graphics/items/icons/fossilized_dino.4bpp.lz"); +const u32 gItemIconPalette_FossilizedDino[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_dino.gbapal.lz"); // Mulch -//const u32 gItemIcon_GrowthMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GrowthMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Mulch[] = INCBIN_U32("graphics/items/icons/mulch.4bpp.lz"); +const u32 gItemIconPalette_GrowthMulch[] = INCBIN_U32("graphics/items/icon_palettes/growth_mulch.gbapal.lz"); +const u32 gItemIconPalette_DampMulch[] = INCBIN_U32("graphics/items/icon_palettes/damp_mulch.gbapal.lz"); -//const u32 gItemIcon_DampMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DampMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StableMulch[] = INCBIN_U32("graphics/items/icons/stable_mulch.4bpp.lz"); +const u32 gItemIconPalette_StableMulch[] = INCBIN_U32("graphics/items/icon_palettes/stable_mulch.gbapal.lz"); -//const u32 gItemIcon_StableMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StableMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GooeyMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GooeyMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RichMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RichMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SurpriseMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SurpriseMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BoostMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BoostMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_AmazeMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AmazeMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIconPalette_GooeyMulch[] = INCBIN_U32("graphics/items/icon_palettes/gooey_mulch.gbapal.lz"); +const u32 gItemIconPalette_RichMulch[] = INCBIN_U32("graphics/items/icon_palettes/rich_mulch.gbapal.lz"); +const u32 gItemIconPalette_SurpriseMulch[] = INCBIN_U32("graphics/items/icon_palettes/surprise_mulch.gbapal.lz"); +const u32 gItemIconPalette_BoostMulch[] = INCBIN_U32("graphics/items/icon_palettes/boost_mulch.gbapal.lz"); +const u32 gItemIconPalette_AmazeMulch[] = INCBIN_U32("graphics/items/icon_palettes/amaze_mulch.gbapal.lz"); // Apricorns @@ -585,17 +492,17 @@ const u32 gItemIconPalette_WhiteApricorn[] = INCBIN_U32("graphics/items/icon_pal 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_WishingPiece[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_WishingPiece[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_WishingPiece[] = INCBIN_U32("graphics/items/icons/wishing_piece.4bpp.lz"); +const u32 gItemIconPalette_WishingPiece[] = INCBIN_U32("graphics/items/icon_palettes/wishing_piece.gbapal.lz"); -//const u32 gItemIcon_GalaricaTwig[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaTwig[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaTwig[] = INCBIN_U32("graphics/items/icons/galarica_twig.4bpp.lz"); +const u32 gItemIconPalette_GalaricaItem[] = INCBIN_U32("graphics/items/icon_palettes/galarica_item.gbapal.lz"); -//const u32 gItemIcon_ArmoriteOre[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ArmoriteOre[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ArmoriteOre[] = INCBIN_U32("graphics/items/icons/armorite_ore.4bpp.lz"); +const u32 gItemIconPalette_ArmoriteOre[] = INCBIN_U32("graphics/items/icon_palettes/armorite_ore.gbapal.lz"); -//const u32 gItemIcon_DyniteOre[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DyniteOre[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DyniteOre[] = INCBIN_U32("graphics/items/icons/dynite_ore.4bpp.lz"); +const u32 gItemIconPalette_DyniteOre[] = INCBIN_U32("graphics/items/icon_palettes/dynite_ore.gbapal.lz"); // Mail @@ -667,23 +574,19 @@ const u32 gItemIconPalette_DuskStone[] = INCBIN_U32("graphics/items/icon_palette 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_SweetApple[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SweetApple[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_SweetApple[] = INCBIN_U32("graphics/items/icons/sweet_apple.4bpp.lz"); +const u32 gItemIconPalette_SweetApple[] = INCBIN_U32("graphics/items/icon_palettes/sweet_apple.gbapal.lz"); -//const u32 gItemIcon_TartApple[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_TartApple[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_TartApple[] = INCBIN_U32("graphics/items/icons/tart_apple.4bpp.lz"); +const u32 gItemIconPalette_TartApple[] = INCBIN_U32("graphics/items/icon_palettes/tart_apple.gbapal.lz"); -//const u32 gItemIcon_CrackedPot[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CrackedPot[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CrackedPot[] = INCBIN_U32("graphics/items/icons/cracked_pot.4bpp.lz"); +const u32 gItemIcon_ChippedPot[] = INCBIN_U32("graphics/items/icons/chipped_pot.4bpp.lz"); +const u32 gItemIconPalette_Pot[] = INCBIN_U32("graphics/items/icon_palettes/pot.gbapal.lz"); -//const u32 gItemIcon_ChippedPot[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ChippedPot[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaCuff[] = INCBIN_U32("graphics/items/icons/galarica_cuff.4bpp.lz"); -//const u32 gItemIcon_GalaricaCuff[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaCuff[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GalaricaWreath[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaWreath[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaWreath[] = INCBIN_U32("graphics/items/icons/galarica_wreath.4bpp.lz"); const u32 gItemIcon_DragonScale[] = INCBIN_U32("graphics/items/icons/dragon_scale.4bpp.lz"); const u32 gItemIconPalette_DragonScale[] = INCBIN_U32("graphics/items/icon_palettes/dragon_scale.gbapal.lz"); @@ -718,26 +621,26 @@ const u32 gItemIconPalette_Sachet[] = INCBIN_U32("graphics/items/icon_palettes/s 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_StrawberrySweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StrawberrySweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StrawberrySweet[] = INCBIN_U32("graphics/items/icons/strawberry_sweet.4bpp.lz"); +const u32 gItemIconPalette_StrawberrySweet[] = INCBIN_U32("graphics/items/icon_palettes/strawberry_sweet.gbapal.lz"); -//const u32 gItemIcon_LoveSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LoveSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_LoveSweet[] = INCBIN_U32("graphics/items/icons/love_sweet.4bpp.lz"); +const u32 gItemIconPalette_LoveSweet[] = INCBIN_U32("graphics/items/icon_palettes/love_sweet.gbapal.lz"); -//const u32 gItemIcon_BerrySweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BerrySweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BerrySweet[] = INCBIN_U32("graphics/items/icons/berry_sweet.4bpp.lz"); +const u32 gItemIconPalette_BerrySweet[] = INCBIN_U32("graphics/items/icon_palettes/berry_sweet.gbapal.lz"); -//const u32 gItemIcon_CloverSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CloverSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CloverSweet[] = INCBIN_U32("graphics/items/icons/clover_sweet.4bpp.lz"); +const u32 gItemIconPalette_CloverSweet[] = INCBIN_U32("graphics/items/icon_palettes/clover_sweet.gbapal.lz"); -//const u32 gItemIcon_FlowerSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FlowerSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FlowerSweet[] = INCBIN_U32("graphics/items/icons/flower_sweet.4bpp.lz"); +const u32 gItemIconPalette_FlowerSweet[] = INCBIN_U32("graphics/items/icon_palettes/flower_sweet.gbapal.lz"); -//const u32 gItemIcon_StarSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StarSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StarSweet[] = INCBIN_U32("graphics/items/icons/star_sweet.4bpp.lz"); +const u32 gItemIconPalette_StarSweet[] = INCBIN_U32("graphics/items/icon_palettes/star_sweet.gbapal.lz"); -//const u32 gItemIcon_RibbonSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RibbonSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RibbonSweet[] = INCBIN_U32("graphics/items/icons/ribbon_sweet.4bpp.lz"); +const u32 gItemIconPalette_RibbonSweet[] = INCBIN_U32("graphics/items/icon_palettes/ribbon_sweet.gbapal.lz"); const u32 gItemIcon_Everstone[] = INCBIN_U32("graphics/items/icons/everstone.4bpp.lz"); const u32 gItemIconPalette_Everstone[] = INCBIN_U32("graphics/items/icon_palettes/everstone.gbapal.lz"); @@ -876,11 +779,9 @@ const u32 gItemIconPalette_SteelMemory[] = INCBIN_U32("graphics/items/icon_palet 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_RustedSword[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RustedSword[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RustedShield[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RustedShield[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RustedSword[] = INCBIN_U32("graphics/items/icons/rusted_sword.4bpp.lz"); +const u32 gItemIcon_RustedShield[] = INCBIN_U32("graphics/items/icons/rusted_shield.4bpp.lz"); +const u32 gItemIconPalette_RustedWeapons[] = INCBIN_U32("graphics/items/icon_palettes/rusted_weapons.gbapal.lz"); // Colored Orbs @@ -890,9 +791,6 @@ const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/r const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz"); const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz"); -//const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - // Mega Stones const u32 gItemIcon_Venusaurite[] = INCBIN_U32("graphics/items/icons/venusaurite.4bpp.lz"); @@ -1562,23 +1460,23 @@ const u32 gItemIconPalette_TerrainExtender[] = INCBIN_U32("graphics/items/icon_p 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_ThroatSpray[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ThroatSpray[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ThroatSpray[] = INCBIN_U32("graphics/items/icons/throat_spray.4bpp.lz"); +const u32 gItemIconPalette_ThroatSpray[] = INCBIN_U32("graphics/items/icon_palettes/throat_spray.gbapal.lz"); -//const u32 gItemIcon_EjectPack[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EjectPack[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_EjectPack[] = INCBIN_U32("graphics/items/icons/eject_pack.4bpp.lz"); +const u32 gItemIconPalette_EjectPack[] = INCBIN_U32("graphics/items/icon_palettes/eject_pack.gbapal.lz"); -//const u32 gItemIcon_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icons/heavy_duty_boots.4bpp.lz"); +const u32 gItemIconPalette_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icon_palettes/heavy_duty_boots.gbapal.lz"); -//const u32 gItemIcon_BlunderPolicy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BlunderPolicy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BlunderPolicy[] = INCBIN_U32("graphics/items/icons/blunder_policy.4bpp.lz"); +const u32 gItemIconPalette_BlunderPolicy[] = INCBIN_U32("graphics/items/icon_palettes/blunder_policy.gbapal.lz"); -//const u32 gItemIcon_RoomService[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RoomService[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RoomService[] = INCBIN_U32("graphics/items/icons/room_service.4bpp.lz"); +const u32 gItemIconPalette_RoomService[] = INCBIN_U32("graphics/items/icon_palettes/room_service.gbapal.lz"); -//const u32 gItemIcon_UtilityUmbrella[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_UtilityUmbrella[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_UtilityUmbrella[] = INCBIN_U32("graphics/items/icons/utility_umbrella.4bpp.lz"); +const u32 gItemIconPalette_UtilityUmbrella[] = INCBIN_U32("graphics/items/icon_palettes/utility_umbrella.gbapal.lz"); // Berries @@ -1762,8 +1660,8 @@ const u32 gItemIconPalette_LansatBerry[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_StarfBerry[] = INCBIN_U32("graphics/items/icons/starf_berry.4bpp.lz"); const u32 gItemIconPalette_StarfBerry[] = INCBIN_U32("graphics/items/icon_palettes/starf_berry.gbapal.lz"); -//const u32 gItemIcon_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/enigma_berry.4bpp.lz"); +const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/enigma_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"); @@ -1783,9 +1681,6 @@ const u32 gItemIconPalette_KeeBerry[] = INCBIN_U32("graphics/items/icon_palettes 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_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/enigma_berry.4bpp.lz"); -const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/enigma_berry.gbapal.lz"); - // TMs/HMs const u32 gItemIcon_TM[] = INCBIN_U32("graphics/items/icons/tm.4bpp.lz"); @@ -1836,60 +1731,52 @@ const u32 gItemIconPalette_OvalCharm[] = INCBIN_U32("graphics/items/icon_palette 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"); -//const u32 gItemIcon_CatchingCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CatchingCharm[] = INCBIN_U32("graphics/items/icons/catching_charm.4bpp.lz"); +const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_palettes/catching_charm.gbapal.lz"); -//const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/exp_charm.4bpp.lz"); +const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/exp_charm.gbapal.lz"); // Form-changing Key Items -//const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RotomCatalog[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/rotom_catalog.4bpp.lz"); +const u32 gItemIconPalette_RotomCatalog[] = INCBIN_U32("graphics/items/icon_palettes/rotom_catalog.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_RevealGlass[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RevealGlass[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RevealGlass[] = INCBIN_U32("graphics/items/icons/reveal_glass.4bpp.lz"); +const u32 gItemIconPalette_RevealGlass[] = INCBIN_U32("graphics/items/icon_palettes/reveal_glass.gbapal.lz"); -//const u32 gItemIcon_DNASplicers[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DNASplicers[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DNASplicers[] = INCBIN_U32("graphics/items/icons/dna_splicers.4bpp.lz"); +const u32 gItemIconPalette_DNASplicers[] = INCBIN_U32("graphics/items/icon_palettes/dna_splicers.gbapal.lz"); -//const u32 gItemIcon_ZygardeCube[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ZygardeCube[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ZygardeCube[] = INCBIN_U32("graphics/items/icons/zygarde_cube.4bpp.lz"); +const u32 gItemIconPalette_ZygardeCube[] = INCBIN_U32("graphics/items/icon_palettes/zygarde_cube.gbapal.lz"); -//const u32 gItemIcon_PrisonBottle[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PrisonBottle[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PrisonBottle[] = INCBIN_U32("graphics/items/icons/prison_bottle.4bpp.lz"); +const u32 gItemIconPalette_PrisonBottle[] = INCBIN_U32("graphics/items/icon_palettes/prison_bottle.gbapal.lz"); -//const u32 gItemIcon_NSolarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NSolarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_NecrozmaFuser[] = INCBIN_U32("graphics/items/icons/necrozma_fuser.4bpp.lz"); +const u32 gItemIconPalette_NSolarizer[] = INCBIN_U32("graphics/items/icon_palettes/n_solarizer.gbapal.lz"); +const u32 gItemIconPalette_NLunarizer[] = INCBIN_U32("graphics/items/icon_palettes/n_lunarizer.gbapal.lz"); -//const u32 gItemIcon_NLunarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NLunarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ReinsOfUnity[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ReinsOfUnity[] = INCBIN_U32("graphics/items/icons/reins_of_unity.4bpp.lz"); +const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_palettes/reins_of_unity.gbapal.lz"); // Battle Mechanic Key Items -//const u32 gItemIcon_KeyStone[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/mega_ring.4bpp.lz"); +const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/mega_ring.gbapal.lz"); -//const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ZPowerRing[] = INCBIN_U32("graphics/items/icons/z_power_ring.4bpp.lz"); +const u32 gItemIconPalette_ZPowerRing[] = INCBIN_U32("graphics/items/icon_palettes/z_power_ring.gbapal.lz"); -//const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz"); // Remove -//const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz"); // Remove +const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); // Remove +const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); // Remove -//const u32 gItemIcon_ZPowerRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ZPowerRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); // Remove -//const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); // Remove - -//const u32 gItemIcon_DynamaxBand[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DynamaxBand[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DynamaxBand[] = INCBIN_U32("graphics/items/icons/dynamax_band.4bpp.lz"); +const u32 gItemIconPalette_DynamaxBand[] = INCBIN_U32("graphics/items/icon_palettes/dynamax_band.gbapal.lz"); // Misc. Key Items @@ -1926,8 +1813,8 @@ const u32 gItemIconPalette_TMCase[] = INCBIN_U32("graphics/items/icon_palettes/t const u32 gItemIcon_BerryPouch[] = INCBIN_U32("graphics/items/icons/berry_pouch.4bpp.lz"); const u32 gItemIconPalette_BerryPouch[] = INCBIN_U32("graphics/items/icon_palettes/berry_pouch.gbapal.lz"); -//const u32 gItemIcon_PokemonBoxLink[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokemonBoxLink[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokemonBoxLink[] = INCBIN_U32("graphics/items/icons/pokemon_box_link.4bpp.lz"); +const u32 gItemIconPalette_PokemonBoxLink[] = INCBIN_U32("graphics/items/icon_palettes/pokemon_box_link.gbapal.lz"); const u32 gItemIcon_CoinCase[] = INCBIN_U32("graphics/items/icons/coin_case.4bpp.lz"); const u32 gItemIconPalette_CoinCase[] = INCBIN_U32("graphics/items/icon_palettes/coin_case.gbapal.lz"); @@ -1938,8 +1825,8 @@ const u32 gItemIconPalette_PowderJar[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_WailmerPail[] = INCBIN_U32("graphics/items/icons/wailmer_pail.4bpp.lz"); const u32 gItemIconPalette_WailmerPail[] = INCBIN_U32("graphics/items/icon_palettes/wailmer_pail.gbapal.lz"); -//const u32 gItemIcon_PokeRadar[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokeRadar[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokeRadar[] = INCBIN_U32("graphics/items/icons/poke_radar.4bpp.lz"); +const u32 gItemIconPalette_PokeRadar[] = INCBIN_U32("graphics/items/icon_palettes/poke_radar.gbapal.lz"); const u32 gItemIcon_PokeblockCase[] = INCBIN_U32("graphics/items/icons/pokeblock_case.4bpp.lz"); const u32 gItemIconPalette_PokeblockCase[] = INCBIN_U32("graphics/items/icon_palettes/pokeblock_case.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index eb6c6142b2..3e1789b9a3 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -58,15 +58,15 @@ const u32 *const gItemIconTable[][2] = [ITEM_BERRY_JUICE] = {gItemIcon_BerryJuice, gItemIconPalette_BerryJuice}, [ITEM_SACRED_ASH] = {gItemIcon_SacredAsh, gItemIconPalette_SacredAsh}, [ITEM_SWEET_HEART] = {gItemIcon_SweetHeart, gItemIconPalette_SweetHeart}, - [ITEM_MAX_HONEY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_MAX_HONEY] = {gItemIcon_MaxHoney, gItemIconPalette_MaxHoney}, // Regional Specialties - [ITEM_PEWTER_CRUNCHIES] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RAGE_CANDY_BAR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_PEWTER_CRUNCHIES] = {gItemIcon_PewterCrunchies, gItemIconPalette_PewterCrunchies}, + [ITEM_RAGE_CANDY_BAR] = {gItemIcon_RageCandyBar, gItemIconPalette_RageCandyBar}, [ITEM_LAVA_COOKIE] = {gItemIcon_LavaCookie, gItemIconPalette_LavaCookieAndLetter}, [ITEM_OLD_GATEAU] = {gItemIcon_OldGateau, gItemIconPalette_OldGateau}, - [ITEM_CASTELIACONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LUMIOSE_GALETTE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SHALOUR_SABLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_CASTELIACONE] = {gItemIcon_Casteliacone, gItemIconPalette_Casteliacone}, + [ITEM_LUMIOSE_GALETTE] = {gItemIcon_LumioseGalette, gItemIconPalette_LumioseGalette}, + [ITEM_SHALOUR_SABLE] = {gItemIcon_ShalourSable, gItemIconPalette_ShalourSable}, [ITEM_BIG_MALASADA] = {gItemIcon_BigMalasada, gItemIconPalette_BigMalasada}, // Vitamins [ITEM_HP_UP] = {gItemIcon_HPUp, gItemIconPalette_HPUp}, @@ -86,37 +86,37 @@ const u32 *const gItemIconTable[][2] = [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftFeather, gItemIconPalette_SwiftFeather}, // Ability Modifiers [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, - [ITEM_ABILITY_PATCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ABILITY_PATCH] = {gItemIcon_AbilityPatch, gItemIconPalette_AbilityPatch}, // Mints - [ITEM_LONELY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ADAMANT_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_NAUGHTY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BRAVE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BOLD_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_IMPISH_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LAX_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELAXED_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MODEST_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MILD_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RASH_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_QUIET_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CALM_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GENTLE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CAREFUL_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SASSY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_TIMID_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_HASTY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_JOLLY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_NAIVE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SERIOUS_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_LONELY_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, + [ITEM_ADAMANT_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, + [ITEM_NAUGHTY_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, + [ITEM_BRAVE_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, + [ITEM_BOLD_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, + [ITEM_IMPISH_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, + [ITEM_LAX_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, + [ITEM_RELAXED_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, + [ITEM_MODEST_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, + [ITEM_MILD_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, + [ITEM_RASH_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, + [ITEM_QUIET_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, + [ITEM_CALM_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, + [ITEM_GENTLE_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, + [ITEM_CAREFUL_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, + [ITEM_SASSY_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, + [ITEM_TIMID_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, + [ITEM_HASTY_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, + [ITEM_JOLLY_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, + [ITEM_NAIVE_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, + [ITEM_SERIOUS_MINT] = {gItemIcon_Mint, gItemIconPalette_YellowMint}, // Candy [ITEM_RARE_CANDY] = {gItemIcon_RareCandy, gItemIconPalette_RareCandy}, - [ITEM_EXP_CANDY_XS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_S] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_M] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_L] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_XL] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DYNAMAX_CANDY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_EXP_CANDY_XS] = {gItemIcon_ExpCandyXS, gItemIconPalette_ExpCandies}, + [ITEM_EXP_CANDY_S] = {gItemIcon_ExpCandyS, gItemIconPalette_ExpCandies}, + [ITEM_EXP_CANDY_M] = {gItemIcon_ExpCandyM, gItemIconPalette_ExpCandies}, + [ITEM_EXP_CANDY_L] = {gItemIcon_ExpCandyL, gItemIconPalette_ExpCandies}, + [ITEM_EXP_CANDY_XL] = {gItemIcon_ExpCandyXL, gItemIconPalette_ExpCandies}, + [ITEM_DYNAMAX_CANDY] = {gItemIcon_DynamaxCandy, gItemIconPalette_DynamaxCandy}, // Medicinal Flutes [ITEM_BLUE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlueFlute}, [ITEM_YELLOW_FLUTE] = {gItemIcon_Flute, gItemIconPalette_YellowFlute}, @@ -128,9 +128,9 @@ const u32 *const gItemIconTable[][2] = [ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel}, [ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel}, [ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel}, - [ITEM_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SUPER_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MAX_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_LURE] = {gItemIcon_Lure, gItemIconPalette_Lure}, + [ITEM_SUPER_LURE] = {gItemIcon_Lure, gItemIconPalette_SuperLure}, + [ITEM_MAX_LURE] = {gItemIcon_Lure, gItemIconPalette_MaxLure}, [ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope}, // X Items [ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack}, @@ -144,22 +144,22 @@ const u32 *const gItemIconTable[][2] = // Escape Items [ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll}, [ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail}, - [ITEM_POKE_TOY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MAX_MUSHROOMS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_POKE_TOY] = {gItemIcon_PokeToy, gItemIconPalette_PokeToy}, + [ITEM_MAX_MUSHROOMS] = {gItemIcon_MaxMushrooms, gItemIconPalette_MaxMushrooms}, // Treasures - [ITEM_BOTTLE_CAP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GOLD_BOTTLE_CAP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_BOTTLE_CAP] = {gItemIcon_BottleCap, gItemIconPalette_BottleCap}, + [ITEM_GOLD_BOTTLE_CAP] = {gItemIcon_BottleCap, gItemIconPalette_GoldBottleCap}, [ITEM_NUGGET] = {gItemIcon_Nugget, gItemIconPalette_Nugget}, - [ITEM_BIG_NUGGET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_BIG_NUGGET] = {gItemIcon_BigNugget, gItemIconPalette_BigNugget}, [ITEM_TINY_MUSHROOM] = {gItemIcon_TinyMushroom, gItemIconPalette_Mushroom}, [ITEM_BIG_MUSHROOM] = {gItemIcon_BigMushroom, gItemIconPalette_Mushroom}, - [ITEM_BALM_MUSHROOM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_BALM_MUSHROOM] = {gItemIcon_BalmMushroom, gItemIconPalette_BalmMushroom}, [ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl}, [ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl}, - [ITEM_PEARL_STRING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_PEARL_STRING] = {gItemIcon_PearlString, gItemIconPalette_PearlString}, [ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star}, [ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star}, - [ITEM_COMET_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_COMET_SHARD] = {gItemIcon_CometShard, gItemIconPalette_CometShard}, [ITEM_SHOAL_SALT] = {gItemIcon_Powder, gItemIconPalette_ShoalSalt}, [ITEM_SHOAL_SHELL] = {gItemIcon_ShoalShell, gItemIconPalette_Shell}, [ITEM_RED_SHARD] = {gItemIcon_Shard, gItemIconPalette_RedShard}, @@ -171,14 +171,14 @@ const u32 *const gItemIconTable[][2] = [ITEM_RARE_BONE] = {gItemIcon_RareBone, gItemIconPalette_RareBone}, [ITEM_ODD_KEYSTONE] = {gItemIcon_OddKeystone, gItemIconPalette_OddKeystone}, [ITEM_PRETTY_FEATHER] = {gItemIcon_PrettyFeather, gItemIconPalette_PrettyFeather}, - [ITEM_RELIC_COPPER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_SILVER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_GOLD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_VASE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_STATUE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_CROWN] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STRANGE_SOUVENIR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_RELIC_COPPER] = {gItemIcon_RelicCoin, gItemIconPalette_RelicCopper}, + [ITEM_RELIC_SILVER] = {gItemIcon_RelicCoin, gItemIconPalette_RelicSilver}, + [ITEM_RELIC_GOLD] = {gItemIcon_RelicCoin, gItemIconPalette_RelicGold}, + [ITEM_RELIC_VASE] = {gItemIcon_RelicVase, gItemIconPalette_Relics}, + [ITEM_RELIC_BAND] = {gItemIcon_RelicBand, gItemIconPalette_Relics}, + [ITEM_RELIC_STATUE] = {gItemIcon_RelicStatue, gItemIconPalette_Relics}, + [ITEM_RELIC_CROWN] = {gItemIcon_RelicCrown, gItemIconPalette_Relics}, + [ITEM_STRANGE_SOUVENIR] = {gItemIcon_StrangeSouvenir, gItemIconPalette_StrangeSouvenir}, // Fossils [ITEM_HELIX_FOSSIL] = {gItemIcon_HelixFossil, gItemIconPalette_KantoFossil}, [ITEM_DOME_FOSSIL] = {gItemIcon_DomeFossil, gItemIconPalette_KantoFossil}, @@ -191,19 +191,19 @@ const u32 *const gItemIconTable[][2] = [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, [ITEM_JAW_FOSSIL] = {gItemIcon_JawFossil, gItemIconPalette_JawFossil}, [ITEM_SAIL_FOSSIL] = {gItemIcon_SailFossil, gItemIconPalette_SailFossil}, - [ITEM_FOSSILIZED_BIRD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_FISH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_DRAKE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_DINO] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_FOSSILIZED_BIRD] = {gItemIcon_FossilizedBird, gItemIconPalette_FossilizedBird}, + [ITEM_FOSSILIZED_FISH] = {gItemIcon_FossilizedFish, gItemIconPalette_FossilizedFish}, + [ITEM_FOSSILIZED_DRAKE] = {gItemIcon_FossilizedDrake, gItemIconPalette_FossilizedDrake}, + [ITEM_FOSSILIZED_DINO] = {gItemIcon_FossilizedDino, gItemIconPalette_FossilizedDino}, // Mulch - [ITEM_GROWTH_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DAMP_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STABLE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GOOEY_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RICH_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SURPRISE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BOOST_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_AMAZE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_GROWTH_MULCH] = {gItemIcon_Mulch, gItemIconPalette_GrowthMulch}, + [ITEM_DAMP_MULCH] = {gItemIcon_Mulch, gItemIconPalette_DampMulch}, + [ITEM_STABLE_MULCH] = {gItemIcon_StableMulch, gItemIconPalette_StableMulch}, + [ITEM_GOOEY_MULCH] = {gItemIcon_Mulch, gItemIconPalette_GooeyMulch}, + [ITEM_RICH_MULCH] = {gItemIcon_Mulch, gItemIconPalette_RichMulch}, + [ITEM_SURPRISE_MULCH] = {gItemIcon_Mulch, gItemIconPalette_SurpriseMulch}, + [ITEM_BOOST_MULCH] = {gItemIcon_Mulch, gItemIconPalette_BoostMulch}, + [ITEM_AMAZE_MULCH] = {gItemIcon_Mulch, gItemIconPalette_AmazeMulch}, // Apricorns [ITEM_RED_APRICORN] = {gItemIcon_RedApricorn, gItemIconPalette_RedApricorn}, [ITEM_BLUE_APRICORN] = {gItemIcon_BlueApricorn, gItemIconPalette_BlueApricorn}, @@ -212,10 +212,10 @@ const u32 *const gItemIconTable[][2] = [ITEM_PINK_APRICORN] = {gItemIcon_PinkApricorn, gItemIconPalette_PinkApricorn}, [ITEM_WHITE_APRICORN] = {gItemIcon_WhiteApricorn, gItemIconPalette_WhiteApricorn}, [ITEM_BLACK_APRICORN] = {gItemIcon_BlackApricorn, gItemIconPalette_BlackApricorn}, - [ITEM_WISHING_PIECE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_TWIG] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ARMORITE_ORE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DYNITE_ORE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_WISHING_PIECE] = {gItemIcon_WishingPiece, gItemIconPalette_WishingPiece}, + [ITEM_GALARICA_TWIG] = {gItemIcon_GalaricaTwig, gItemIconPalette_GalaricaItem}, + [ITEM_ARMORITE_ORE] = {gItemIcon_ArmoriteOre, gItemIconPalette_ArmoriteOre}, + [ITEM_DYNITE_ORE] = {gItemIcon_DyniteOre, gItemIconPalette_DyniteOre}, // Mail [ITEM_ORANGE_MAIL] = {gItemIcon_OrangeMail, gItemIconPalette_OrangeMail}, [ITEM_HARBOR_MAIL] = {gItemIcon_HarborMail, gItemIconPalette_HarborMail}, @@ -240,12 +240,12 @@ const u32 *const gItemIconTable[][2] = [ITEM_SHINY_STONE] = {gItemIcon_ShinyStone, gItemIconPalette_ShinyStone}, [ITEM_DUSK_STONE] = {gItemIcon_DuskStone, gItemIconPalette_DuskStone}, [ITEM_DAWN_STONE] = {gItemIcon_DawnStone, gItemIconPalette_DawnStone}, - [ITEM_SWEET_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_TART_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CRACKED_POT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CHIPPED_POT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_CUFF] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_WREATH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_SWEET_APPLE] = {gItemIcon_SweetApple, gItemIconPalette_SweetApple}, + [ITEM_TART_APPLE] = {gItemIcon_TartApple, gItemIconPalette_TartApple}, + [ITEM_CRACKED_POT] = {gItemIcon_CrackedPot, gItemIconPalette_Pot}, + [ITEM_CHIPPED_POT] = {gItemIcon_ChippedPot, gItemIconPalette_Pot}, + [ITEM_GALARICA_CUFF] = {gItemIcon_GalaricaCuff, gItemIconPalette_GalaricaItem}, + [ITEM_GALARICA_WREATH] = {gItemIcon_GalaricaWreath, gItemIconPalette_GalaricaItem}, [ITEM_DRAGON_SCALE] = {gItemIcon_DragonScale, gItemIconPalette_DragonScale}, [ITEM_UPGRADE] = {gItemIcon_Upgrade, gItemIconPalette_Upgrade}, [ITEM_PROTECTOR] = {gItemIcon_Protector, gItemIconPalette_Protector}, @@ -257,13 +257,13 @@ const u32 *const gItemIconTable[][2] = [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, - [ITEM_STRAWBERRY_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LOVE_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BERRY_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CLOVER_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FLOWER_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STAR_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RIBBON_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_STRAWBERRY_SWEET] = {gItemIcon_StrawberrySweet, gItemIconPalette_StrawberrySweet}, + [ITEM_LOVE_SWEET] = {gItemIcon_LoveSweet, gItemIconPalette_LoveSweet}, + [ITEM_BERRY_SWEET] = {gItemIcon_BerrySweet, gItemIconPalette_BerrySweet}, + [ITEM_CLOVER_SWEET] = {gItemIcon_CloverSweet, gItemIconPalette_CloverSweet}, + [ITEM_FLOWER_SWEET] = {gItemIcon_FlowerSweet, gItemIconPalette_FlowerSweet}, + [ITEM_STAR_SWEET] = {gItemIcon_StarSweet, gItemIconPalette_StarSweet}, + [ITEM_RIBBON_SWEET] = {gItemIcon_RibbonSweet, gItemIconPalette_RibbonSweet}, [ITEM_EVERSTONE] = {gItemIcon_Everstone, gItemIconPalette_Everstone}, // Nectars [ITEM_RED_NECTAR] = {gItemIcon_RedNectar, gItemIconPalette_RedNectar}, @@ -311,12 +311,11 @@ const u32 *const gItemIconTable[][2] = [ITEM_DARK_MEMORY] = {gItemIcon_DarkMemory, gItemIconPalette_DarkMemory}, [ITEM_STEEL_MEMORY] = {gItemIcon_SteelMemory, gItemIconPalette_SteelMemory}, [ITEM_FAIRY_MEMORY] = {gItemIcon_FairyMemory, gItemIconPalette_FairyMemory}, - [ITEM_RUSTED_SWORD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RUSTED_SHIELD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_RUSTED_SWORD] = {gItemIcon_RustedSword, gItemIconPalette_RustedWeapons}, + [ITEM_RUSTED_SHIELD] = {gItemIcon_RustedShield, gItemIconPalette_RustedWeapons}, // Colored Orbs [ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb}, [ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb}, - [ITEM_JADE_ORB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo // Mega Stones [ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite}, [ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX}, @@ -547,12 +546,12 @@ const u32 *const gItemIconTable[][2] = [ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb}, [ITEM_TERRAIN_EXTENDER] = {gItemIcon_TerrainExtender, gItemIconPalette_TerrainExtender}, [ITEM_PROTECTIVE_PADS] = {gItemIcon_ProtectivePads, gItemIconPalette_ProtectivePads}, - [ITEM_THROAT_SPRAY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EJECT_PACK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_HEAVY_DUTY_BOOTS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BLUNDER_POLICY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ROOM_SERVICE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_UTILITY_UMBRELLA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_THROAT_SPRAY] = {gItemIcon_ThroatSpray, gItemIconPalette_ThroatSpray}, + [ITEM_EJECT_PACK] = {gItemIcon_EjectPack, gItemIconPalette_EjectPack}, + [ITEM_HEAVY_DUTY_BOOTS] = {gItemIcon_HeavyDutyBoots, gItemIconPalette_HeavyDutyBoots}, + [ITEM_BLUNDER_POLICY] = {gItemIcon_BlunderPolicy, gItemIconPalette_BlunderPolicy}, + [ITEM_ROOM_SERVICE] = {gItemIcon_RoomService, gItemIconPalette_RoomService}, + [ITEM_UTILITY_UMBRELLA] = {gItemIcon_UtilityUmbrella, gItemIconPalette_UtilityUmbrella}, // Berries [ITEM_CHERI_BERRY] = {gItemIcon_CheriBerry, gItemIconPalette_CheriBerry}, [ITEM_CHESTO_BERRY] = {gItemIcon_ChestoBerry, gItemIconPalette_ChestoBerry}, @@ -614,7 +613,7 @@ const u32 *const gItemIconTable[][2] = [ITEM_APICOT_BERRY] = {gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry}, [ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry}, [ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry}, - [ITEM_ENIGMA_BERRY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry}, [ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry}, [ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry}, [ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry}, @@ -673,55 +672,55 @@ const u32 *const gItemIconTable[][2] = [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, - [ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo [ITEM_TM100] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, @@ -734,25 +733,22 @@ const u32 *const gItemIconTable[][2] = // Charms [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, - [ITEM_CATCHING_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_CATCHING_CHARM] = {gItemIcon_CatchingCharm, gItemIconPalette_CatchingCharm}, + [ITEM_EXP_CHARM] = {gItemIcon_ExpCharm, gItemIconPalette_ExpCharm}, // Form-changing Key Items - [ITEM_ROTOM_CATALOG] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ROTOM_CATALOG] = {gItemIcon_RotomCatalog, gItemIconPalette_RotomCatalog}, [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, - [ITEM_REVEAL_GLASS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DNA_SPLICERS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ZYGARDE_CUBE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_PRISON_BOTTLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_N_SOLARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_N_LUNARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_REINS_OF_UNITY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_REVEAL_GLASS] = {gItemIcon_RevealGlass, gItemIconPalette_RevealGlass}, + [ITEM_DNA_SPLICERS] = {gItemIcon_DNASplicers, gItemIconPalette_DNASplicers}, + [ITEM_ZYGARDE_CUBE] = {gItemIcon_ZygardeCube, gItemIconPalette_ZygardeCube}, + [ITEM_PRISON_BOTTLE] = {gItemIcon_PrisonBottle, gItemIconPalette_PrisonBottle}, + [ITEM_N_SOLARIZER] = {gItemIcon_NecrozmaFuser, gItemIconPalette_NSolarizer}, + [ITEM_N_LUNARIZER] = {gItemIcon_NecrozmaFuser, gItemIconPalette_NLunarizer}, + [ITEM_REINS_OF_UNITY] = {gItemIcon_ReinsOfUnity, gItemIconPalette_ReinsOfUnity}, // Battle Mechanic Key Items - [ITEM_KEY_STONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MEGA_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - //[ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet}, // Remove - [ITEM_Z_POWER_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - //[ITEM_Z_RING] = {gItemIcon_ZRing, gItemIconPalette_ZRing}, // Remove - [ITEM_DYNAMAX_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_MEGA_RING] = {gItemIcon_MegaRing, gItemIconPalette_MegaRing}, + [ITEM_Z_POWER_RING] = {gItemIcon_ZPowerRing, gItemIconPalette_ZPowerRing}, + [ITEM_DYNAMAX_BAND] = {gItemIcon_DynamaxBand, gItemIconPalette_DynamaxBand}, // Misc. Key Items [ITEM_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle}, [ITEM_MACH_BIKE] = {gItemIcon_MachBike, gItemIconPalette_MachBike}, @@ -765,11 +761,11 @@ const u32 *const gItemIconTable[][2] = [ITEM_VS_SEEKER] = {gItemIcon_VsSeeker, gItemIconPalette_VsSeeker}, [ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase}, [ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch}, - [ITEM_POKEMON_BOX_LINK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_POKEMON_BOX_LINK] = {gItemIcon_PokemonBoxLink, gItemIconPalette_PokemonBoxLink}, [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase}, [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar}, [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, - [ITEM_POKE_RADAR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_POKE_RADAR] = {gItemIcon_PokeRadar, gItemIconPalette_PokeRadar}, [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase}, [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, [ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute}, diff --git a/src/data/items.h b/src/data/items.h index 16e6b34de3..63ad66dfec 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -378,6 +378,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SUPER_POTION] = @@ -392,6 +393,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_HYPER_POTION] = @@ -406,6 +408,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MAX_POTION] = @@ -420,6 +423,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FULL_RESTORE] = @@ -434,6 +438,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_REVIVE] = @@ -447,6 +452,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MAX_REVIVE] = @@ -460,6 +466,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FRESH_WATER] = @@ -474,6 +481,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SODA_POP] = @@ -488,6 +496,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_LEMONADE] = @@ -502,6 +511,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_MOOMOO_MILK] = @@ -516,6 +526,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ENERGY_POWDER] = @@ -529,6 +540,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ENERGY_ROOT] = @@ -542,6 +554,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_HEAL_POWDER] = @@ -555,6 +568,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_REVIVAL_HERB] = @@ -568,6 +582,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ANTIDOTE] = @@ -581,6 +596,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_PARALYZE_HEAL] = @@ -594,6 +610,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_BURN_HEAL] = @@ -607,6 +624,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ICE_HEAL] = @@ -620,6 +638,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_AWAKENING] = @@ -633,6 +652,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_FULL_HEAL] = @@ -646,6 +666,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_ETHER] = @@ -660,6 +681,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_MAX_ETHER] = @@ -674,6 +696,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_ELIXIR] = @@ -688,6 +711,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_MAX_ELIXIR] = @@ -702,6 +726,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 30, }, [ITEM_BERRY_JUICE] = @@ -717,6 +742,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_SACRED_ASH] = @@ -728,6 +754,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, + .flingPower = 30, }, [ITEM_SWEET_HEART] = @@ -742,41 +769,51 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, - [ITEM_MAX_HONEY] = // Todo + [ITEM_MAX_HONEY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Max Honey"), + .itemId = ITEM_MAX_HONEY, + .price = 8000, + .description = sMaxHoneyDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, // Regional Specialties - [ITEM_PEWTER_CRUNCHIES] = // Todo + [ITEM_PEWTER_CRUNCHIES] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("PewtrCrnches"), + .itemId = ITEM_PEWTER_CRUNCHIES, + .price = 250, + .description = sPewterCrunchiesDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, - [ITEM_RAGE_CANDY_BAR] = // Todo + [ITEM_RAGE_CANDY_BAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("RageCandyBar"), + .itemId = ITEM_RAGE_CANDY_BAR, + .price = 350, + .description = sRageCandyBarDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_LAVA_COOKIE] = @@ -790,6 +827,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_OLD_GATEAU] = @@ -803,39 +841,49 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, - [ITEM_CASTELIACONE] = // Todo + [ITEM_CASTELIACONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("CasteliaCone"), + .itemId = ITEM_CASTELIACONE, + .price = 350, + .description = sCasteliaconeDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, - [ITEM_LUMIOSE_GALETTE] = // Todo + [ITEM_LUMIOSE_GALETTE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("LumioseGlete"), + .itemId = ITEM_LUMIOSE_GALETTE, + .price = 350, + .description = sLumioseGaletteDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, - [ITEM_SHALOUR_SABLE] = // Todo + [ITEM_SHALOUR_SABLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("ShalourSable"), + .itemId = ITEM_SHALOUR_SABLE, + .price = 350, + .description = sShalourSableDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_BIG_MALASADA] = @@ -849,6 +897,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, // Vitamins @@ -862,6 +911,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_PROTEIN] = @@ -873,6 +923,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_IRON] = @@ -884,6 +935,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_CALCIUM] = @@ -895,6 +947,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_ZINC] = @@ -906,6 +959,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_CARBOS] = @@ -917,6 +971,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 30, }, [ITEM_PP_UP] = @@ -928,6 +983,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, + .flingPower = 30, }, [ITEM_PP_MAX] = @@ -939,6 +995,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, + .flingPower = 30, }, // EV Feathers @@ -952,6 +1009,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_MUSCLE_FEATHER] = @@ -963,6 +1021,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_RESIST_FEATHER] = @@ -974,6 +1033,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_GENIUS_FEATHER] = @@ -985,6 +1045,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_CLEVER_FEATHER] = @@ -996,6 +1057,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, [ITEM_SWIFT_FEATHER] = @@ -1007,6 +1069,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .flingPower = 20, }, // Ability Modifiers @@ -1023,248 +1086,270 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, }, - [ITEM_ABILITY_PATCH] = // Todo + [ITEM_ABILITY_PATCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("AbilityPatch"), + .itemId = ITEM_ABILITY_PATCH, .price = 0, - .description = sDummyDesc, + .holdEffectParam = 0, + .description = sAbilityPatchDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, // Mints - [ITEM_LONELY_MINT] = // Todo + [ITEM_LONELY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Lonely Mint"), + .itemId = ITEM_LONELY_MINT, + .price = 20, + .description = sLonelyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_ADAMANT_MINT] = // Todo + [ITEM_ADAMANT_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Adamant Mint"), + .itemId = ITEM_ADAMANT_MINT, + .price = 20, + .description = sAdamantMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_NAUGHTY_MINT] = // Todo + [ITEM_NAUGHTY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Naughty Mint"), + .itemId = ITEM_NAUGHTY_MINT, + .price = 20, + .description = sNaughtyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_BRAVE_MINT] = // Todo + [ITEM_BRAVE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Brave Mint"), + .itemId = ITEM_BRAVE_MINT, + .price = 20, + .description = sBraveMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_BOLD_MINT] = // Todo + [ITEM_BOLD_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Bold Mint"), + .itemId = ITEM_BOLD_MINT, + .price = 20, + .description = sBoldMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_IMPISH_MINT] = // Todo + [ITEM_IMPISH_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Impish Mint"), + .itemId = ITEM_IMPISH_MINT, + .price = 20, + .description = sImpishMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_LAX_MINT] = // Todo + [ITEM_LAX_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Lax Mint"), + .itemId = ITEM_LAX_MINT, + .price = 20, + .description = sLaxMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_RELAXED_MINT] = // Todo + [ITEM_RELAXED_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Relaxed Mint"), + .itemId = ITEM_RELAXED_MINT, + .price = 20, + .description = sRelaxedMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_MODEST_MINT] = // Todo + [ITEM_MODEST_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Modest Mint"), + .itemId = ITEM_MODEST_MINT, + .price = 20, + .description = sModestMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_MILD_MINT] = // Todo + [ITEM_MILD_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Mild Mint"), + .itemId = ITEM_MILD_MINT, + .price = 20, + .description = sMildMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_RASH_MINT] = // Todo + [ITEM_RASH_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Rash Mint"), + .itemId = ITEM_RASH_MINT, + .price = 20, + .description = sRashMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_QUIET_MINT] = // Todo + [ITEM_QUIET_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Quiet Mint"), + .itemId = ITEM_QUIET_MINT, + .price = 20, + .description = sQuietMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_CALM_MINT] = // Todo + [ITEM_CALM_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Calm Mint"), + .itemId = ITEM_CALM_MINT, + .price = 20, + .description = sCalmMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_GENTLE_MINT] = // Todo + [ITEM_GENTLE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Gentle Mint"), + .itemId = ITEM_GENTLE_MINT, + .price = 20, + .description = sGentleMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_CAREFUL_MINT] = // Todo + [ITEM_CAREFUL_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Careful Mint"), + .itemId = ITEM_CAREFUL_MINT, + .price = 20, + .description = sCarefulMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_SASSY_MINT] = // Todo + [ITEM_SASSY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Sassy Mint"), + .itemId = ITEM_SASSY_MINT, + .price = 20, + .description = sSassyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_TIMID_MINT] = // Todo + [ITEM_TIMID_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Timid Mint"), + .itemId = ITEM_TIMID_MINT, + .price = 20, + .description = sTimidMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_HASTY_MINT] = // Todo + [ITEM_HASTY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Hasty Mint"), + .itemId = ITEM_HASTY_MINT, + .price = 20, + .description = sHastyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_JOLLY_MINT] = // Todo + [ITEM_JOLLY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Jolly Mint"), + .itemId = ITEM_JOLLY_MINT, + .price = 20, + .description = sJollyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_NAIVE_MINT] = // Todo + [ITEM_NAIVE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Naive Mint"), + .itemId = ITEM_NAIVE_MINT, + .price = 20, + .description = sNaiveMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, - [ITEM_SERIOUS_MINT] = // Todo + [ITEM_SERIOUS_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Serious Mint"), + .itemId = ITEM_SERIOUS_MINT, + .price = 20, + .description = sSeriousMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 10, }, // Candy @@ -1278,72 +1363,79 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_RareCandy, + .flingPower = 30, }, - [ITEM_EXP_CANDY_XS] = // Todo + [ITEM_EXP_CANDY_XS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy XS"), + .itemId = ITEM_EXP_CANDY_XS, + .price = 20, + .description = sExpCandyXSDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_EXP_CANDY_S] = // Todo + [ITEM_EXP_CANDY_S] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy S"), + .itemId = ITEM_EXP_CANDY_S, + .price = 240, + .description = sExpCandyXSDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_EXP_CANDY_M] = // Todo + [ITEM_EXP_CANDY_M] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy M"), + .itemId = ITEM_EXP_CANDY_M, + .price = 1000, + .description = sExpCandyMDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_EXP_CANDY_L] = // Todo + [ITEM_EXP_CANDY_L] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy L"), + .itemId = ITEM_EXP_CANDY_L, + .price = 3000, + .description = sExpCandyLDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_EXP_CANDY_XL] = // Todo + [ITEM_EXP_CANDY_XL] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy XL"), + .itemId = ITEM_EXP_CANDY_XL, + .price = 10000, + .description = sExpCandyXLDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_DYNAMAX_CANDY] = // Todo + [ITEM_DYNAMAX_CANDY] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("DynamaxCandy"), + .itemId = ITEM_DYNAMAX_CANDY, .price = 0, - .description = sDummyDesc, + .description = sDynamaxCandyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, // Medicinal Flutes @@ -1359,6 +1451,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_YELLOW_FLUTE] = @@ -1372,6 +1465,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, [ITEM_RED_FLUTE] = @@ -1385,6 +1479,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 30, }, // Encounter-modifying Flutes @@ -1399,6 +1494,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, + .flingPower = 30, }, [ITEM_WHITE_FLUTE] = @@ -1411,6 +1507,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, + .flingPower = 30, }, // Encounter Modifiers @@ -1425,6 +1522,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, [ITEM_SUPER_REPEL] = @@ -1437,6 +1535,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, [ITEM_MAX_REPEL] = @@ -1449,39 +1548,49 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, + .flingPower = 30, }, - [ITEM_LURE] = // Todo + [ITEM_LURE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Lure"), + .itemId = ITEM_LURE, + .price = 350, + .holdEffectParam = 100, + .description = sLureDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + .flingPower = 30, }, - [ITEM_SUPER_LURE] = // Todo + [ITEM_SUPER_LURE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Super Lure"), + .itemId = ITEM_SUPER_LURE, + .price = 500, + .holdEffectParam = 200, + .description = sSuperLureDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + .flingPower = 30, }, - [ITEM_MAX_LURE] = // Todo + [ITEM_MAX_LURE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Max Lure"), + .itemId = ITEM_MAX_LURE, + .price = 700, + .holdEffectParam = 250, + .description = sMaxLureDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + .flingPower = 30, }, [ITEM_ESCAPE_ROPE] = @@ -1499,6 +1608,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, + .flingPower = 30, }, // X Items @@ -1514,6 +1624,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_DEFENSE] = @@ -1527,6 +1638,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SP_ATK] = @@ -1540,6 +1652,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SP_DEF] = @@ -1553,6 +1666,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_SPEED] = @@ -1566,6 +1680,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_X_ACCURACY] = @@ -1579,6 +1694,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_DIRE_HIT] = @@ -1592,6 +1708,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_GUARD_SPEC] = @@ -1605,6 +1722,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, + .flingPower = 30, }, [ITEM_POKE_DOLL] = @@ -1618,6 +1736,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, + .flingPower = 30, }, [ITEM_FLUFFY_TAIL] = @@ -1631,52 +1750,61 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, + .flingPower = 30, }, - [ITEM_POKE_TOY] = // Todo + [ITEM_POKE_TOY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Poké Toy"), + .itemId = ITEM_POKE_TOY, + .price = 100, + .description = sPokeToyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = ITEM_B_USE_OTHER, + .battleUseFunc = ItemUseInBattle_Escape, + .flingPower = 30, }, - [ITEM_MAX_MUSHROOMS] = // Todo + [ITEM_MAX_MUSHROOMS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("MaxMushrooms"), + .itemId = ITEM_MAX_MUSHROOMS, + .price = 8000, + .description = sMaxMushroomsDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = ITEM_B_USE_OTHER, + .battleUseFunc = ItemUseInBattle_StatIncrease, // Todo + .flingPower = 30, }, // Treasures - [ITEM_BOTTLE_CAP] = // Todo + [ITEM_BOTTLE_CAP] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Bottle Cap"), + .itemId = ITEM_BOTTLE_CAP, + .price = 5000, + .description = sBottleCapDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_GOLD_BOTTLE_CAP] = // Todo + [ITEM_GOLD_BOTTLE_CAP] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GoldBottlCap"), + .itemId = ITEM_GOLD_BOTTLE_CAP, + .price = 10000, + .description = sGoldBottleCapDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_NUGGET] = @@ -1688,17 +1816,19 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_BIG_NUGGET] = // Todo + [ITEM_BIG_NUGGET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Big Nugget"), + .itemId = ITEM_BIG_NUGGET, + .price = 40000, + .description = sBigNuggetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TINY_MUSHROOM] = @@ -1710,6 +1840,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_MUSHROOM] = @@ -1721,17 +1852,19 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_BALM_MUSHROOM] = // Todo + [ITEM_BALM_MUSHROOM] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Balm Mushroom"), + .itemId = ITEM_BALM_MUSHROOM, + .price = 15000, + .description = sBalmMushroomDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_PEARL] = @@ -1743,6 +1876,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BIG_PEARL] = @@ -1754,17 +1888,19 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_PEARL_STRING] = // Todo + [ITEM_PEARL_STRING] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Pearl String"), + .itemId = ITEM_PEARL_STRING, + .price = 20000, + .description = sPearlStringDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STARDUST] = @@ -1776,6 +1912,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_STAR_PIECE] = @@ -1787,17 +1924,19 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_COMET_SHARD] = // Todo + [ITEM_COMET_SHARD] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Comet Shard"), + .itemId = ITEM_COMET_SHARD, + .price = 25000, + .description = sCometShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SHOAL_SALT] = @@ -1809,6 +1948,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SHOAL_SHELL] = @@ -1820,6 +1960,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RED_SHARD] = @@ -1831,6 +1972,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BLUE_SHARD] = @@ -1842,6 +1984,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_YELLOW_SHARD] = @@ -1853,6 +1996,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GREEN_SHARD] = @@ -1864,6 +2008,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_HEART_SCALE] = @@ -1875,6 +2020,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_HONEY] = @@ -1886,6 +2032,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_RARE_BONE] = @@ -1897,6 +2044,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ODD_KEYSTONE] = @@ -1908,6 +2056,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PRETTY_FEATHER] = @@ -1919,94 +2068,103 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 20, }, - [ITEM_RELIC_COPPER] = // Todo + [ITEM_RELIC_COPPER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Copper"), + .itemId = ITEM_RELIC_COPPER, .price = 0, - .description = sDummyDesc, + .description = sRelicCopperDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_SILVER] = // Todo + [ITEM_RELIC_SILVER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Silver"), + .itemId = ITEM_RELIC_SILVER, .price = 0, - .description = sDummyDesc, + .description = sRelicSilverDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_GOLD] = // Todo + [ITEM_RELIC_GOLD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Gold"), + .itemId = ITEM_RELIC_GOLD, .price = 0, - .description = sDummyDesc, + .description = sRelicGoldDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_VASE] = // Todo + [ITEM_RELIC_VASE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Vase"), + .itemId = ITEM_RELIC_VASE, .price = 0, - .description = sDummyDesc, + .description = sRelicVaseDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_BAND] = // Todo + [ITEM_RELIC_BAND] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Band"), + .itemId = ITEM_RELIC_BAND, .price = 0, - .description = sDummyDesc, + .description = sRelicBandDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_STATUE] = // Todo + [ITEM_RELIC_STATUE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Statue"), + .itemId = ITEM_RELIC_STATUE, .price = 0, - .description = sDummyDesc, + .description = sRelicStatueDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_RELIC_CROWN] = // Todo + [ITEM_RELIC_CROWN] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Crown"), + .itemId = ITEM_RELIC_CROWN, .price = 0, - .description = sDummyDesc, + .description = sRelicCrownDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_STRANGE_SOUVENIR] = // Todo + [ITEM_STRANGE_SOUVENIR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("StrngeSouvnr"), + .itemId = ITEM_STRANGE_SOUVENIR, + .price = 3000, + .description = sStrangeSouvenirDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Fossils @@ -2026,6 +2184,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_DOME_FOSSIL] = @@ -2043,6 +2202,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_OLD_AMBER] = @@ -2060,6 +2220,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ROOT_FOSSIL] = @@ -2077,6 +2238,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_CLAW_FOSSIL] = @@ -2094,6 +2256,7 @@ const struct Item gItems[] = #endif .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_ARMOR_FOSSIL] = @@ -2105,6 +2268,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SKULL_FOSSIL] = @@ -2116,6 +2280,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_COVER_FOSSIL] = @@ -2127,6 +2292,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_PLUME_FOSSIL] = @@ -2138,6 +2304,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_JAW_FOSSIL] = @@ -2149,6 +2316,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SAIL_FOSSIL] = @@ -2160,140 +2328,153 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, - [ITEM_FOSSILIZED_BIRD] = // Todo + [ITEM_FOSSILIZED_BIRD] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedBird"), + .itemId = ITEM_FOSSILIZED_BIRD, + .price = 5000, + .description = sFossilizedBirdDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, - [ITEM_FOSSILIZED_FISH] = // Todo + [ITEM_FOSSILIZED_FISH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedFish"), + .itemId = ITEM_FOSSILIZED_FISH, + .price = 5000, + .description = sFossilizedFishDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, - [ITEM_FOSSILIZED_DRAKE] = // Todo + [ITEM_FOSSILIZED_DRAKE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedDrke"), + .itemId = ITEM_FOSSILIZED_DRAKE, + .price = 5000, + .description = sFossilizedDrakeDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, - [ITEM_FOSSILIZED_DINO] = // Todo + [ITEM_FOSSILIZED_DINO] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedDino"), + .itemId = ITEM_FOSSILIZED_DINO, + .price = 5000, + .description = sFossilizedDinoDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, // Mulch - [ITEM_GROWTH_MULCH] = // Todo + [ITEM_GROWTH_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Growth Mulch"), + .itemId = ITEM_GROWTH_MULCH, + .price = 200, + .description = sGrowthMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_DAMP_MULCH] = // Todo + [ITEM_DAMP_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Damp Mulch"), + .itemId = ITEM_DAMP_MULCH, + .price = 200, + .description = sDampMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_STABLE_MULCH] = // Todo + [ITEM_STABLE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Stable Mulch"), + .itemId = ITEM_STABLE_MULCH, + .price = 200, + .description = sStableMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_GOOEY_MULCH] = // Todo + [ITEM_GOOEY_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Gooey Mulch"), + .itemId = ITEM_GOOEY_MULCH, + .price = 200, + .description = sGooeyMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_RICH_MULCH] = // Todo + [ITEM_RICH_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Rich Mulch"), + .itemId = ITEM_RICH_MULCH, + .price = 200, + .description = sRichMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_SURPRISE_MULCH] = // Todo + [ITEM_SURPRISE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("SurprseMulch"), + .itemId = ITEM_SURPRISE_MULCH, + .price = 200, + .description = sSurpriseMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_BOOST_MULCH] = // Todo + [ITEM_BOOST_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Boost Mulch"), + .itemId = ITEM_BOOST_MULCH, + .price = 200, + .description = sBoostMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, - [ITEM_AMAZE_MULCH] = // Todo + [ITEM_AMAZE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Amaze Mulch"), + .itemId = ITEM_AMAZE_MULCH, + .price = 200, + .description = sAmazeMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 30, }, // Apricorns @@ -2375,48 +2556,52 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_WISHING_PIECE] = // Todo + [ITEM_WISHING_PIECE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("WishingPiece"), + .itemId = ITEM_WISHING_PIECE, + .price = 20, + .description = sWishingPieceDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .flingPower = 50, }, - [ITEM_GALARICA_TWIG] = // Todo + [ITEM_GALARICA_TWIG] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GalaricaTwig"), + .itemId = ITEM_GALARICA_TWIG, + .price = 40, + .description = sGalaricaTwigDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_ARMORITE_ORE] = // Todo + [ITEM_ARMORITE_ORE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Armorite Ore"), + .itemId = ITEM_ARMORITE_ORE, + .price = 40, + .description = sArmoriteOreDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_DYNITE_ORE] = // Todo + [ITEM_DYNITE_ORE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Dynite Ore"), + .itemId = ITEM_DYNITE_ORE, + .price = 20, + .description = sDyniteOreDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Mail @@ -2576,6 +2761,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_WATER_STONE] = @@ -2587,6 +2773,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_THUNDER_STONE] = @@ -2598,6 +2785,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_LEAF_STONE] = @@ -2609,6 +2797,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_ICE_STONE] = @@ -2620,6 +2809,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_SUN_STONE] = @@ -2631,6 +2821,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_MOON_STONE] = @@ -2642,6 +2833,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_SHINY_STONE] = @@ -2653,6 +2845,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_DUSK_STONE] = @@ -2664,6 +2857,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, [ITEM_DAWN_STONE] = @@ -2675,72 +2869,79 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, - [ITEM_SWEET_APPLE] = // Todo + [ITEM_SWEET_APPLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Sweet Apple"), + .itemId = ITEM_SWEET_APPLE, + .price = 2200, + .description = sSweetAppleDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, - [ITEM_TART_APPLE] = // Todo + [ITEM_TART_APPLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Tart Apple"), + .itemId = ITEM_TART_APPLE, + .price = 2200, + .description = sTartAppleDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, - [ITEM_CRACKED_POT] = // Todo + [ITEM_CRACKED_POT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Cracked Pot"), + .itemId = ITEM_CRACKED_POT, + .price = 1600, + .description = sCrackedPotDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, - [ITEM_CHIPPED_POT] = // Todo + [ITEM_CHIPPED_POT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Chipped Pot"), + .itemId = ITEM_CHIPPED_POT, + .price = 38000, + .description = sChippedPotDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 80, }, - [ITEM_GALARICA_CUFF] = // Todo + [ITEM_GALARICA_CUFF] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GalaricaCuff"), + .itemId = ITEM_GALARICA_CUFF, + .price = 6000, + .description = sGalaricaCuffDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, - [ITEM_GALARICA_WREATH] = // Todo + [ITEM_GALARICA_WREATH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GalrcaWreath"), + .itemId = ITEM_GALARICA_WREATH, + .price = 6000, + .description = sGalaricaWreathDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .flingPower = 30, }, [ITEM_DRAGON_SCALE] = @@ -2754,6 +2955,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_UPGRADE] = @@ -2766,6 +2968,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_PROTECTOR] = @@ -2777,6 +2980,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ELECTIRIZER] = @@ -2788,6 +2992,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MAGMARIZER] = @@ -2799,6 +3004,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_DUBIOUS_DISC] = @@ -2810,6 +3016,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_REAPER_CLOTH] = @@ -2821,6 +3028,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PRISM_SCALE] = @@ -2832,6 +3040,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WHIPPED_DREAM] = @@ -2843,6 +3052,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SACHET] = @@ -2854,6 +3064,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_OVAL_STONE] = @@ -2865,83 +3076,91 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, - [ITEM_STRAWBERRY_SWEET] = // Todo + [ITEM_STRAWBERRY_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("StrwbrySweet"), + .itemId = ITEM_STRAWBERRY_SWEET, + .price = 500, + .description = sStrawberrySweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_LOVE_SWEET] = // Todo + [ITEM_LOVE_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Love Sweet"), + .itemId = ITEM_LOVE_SWEET, + .price = 500, + .description = sLoveSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_BERRY_SWEET] = // Todo + [ITEM_BERRY_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Berry Sweet"), + .itemId = ITEM_BERRY_SWEET, + .price = 500, + .description = sBerrySweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_CLOVER_SWEET] = // Todo + [ITEM_CLOVER_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Clover Sweet"), + .itemId = ITEM_CLOVER_SWEET, + .price = 500, + .description = sCloverSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_FLOWER_SWEET] = // Todo + [ITEM_FLOWER_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Flower Sweet"), + .itemId = ITEM_FLOWER_SWEET, + .price = 500, + .description = sFlowerSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_STAR_SWEET] = // Todo + [ITEM_STAR_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Star Sweet"), + .itemId = ITEM_STAR_SWEET, + .price = 500, + .description = sStarSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_RIBBON_SWEET] = // Todo + [ITEM_RIBBON_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Ribbon Sweet"), + .itemId = ITEM_RIBBON_SWEET, + .price = 500, + .description = sRibbonSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EVERSTONE] = @@ -2954,6 +3173,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Nectars @@ -2974,6 +3194,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_YELLOW_NECTAR] = @@ -2992,6 +3213,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_PINK_NECTAR] = @@ -3010,6 +3232,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, [ITEM_PURPLE_NECTAR] = @@ -3028,6 +3251,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .flingPower = 10, }, // Plates @@ -3044,6 +3268,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 90, }, [ITEM_SPLASH_PLATE] = @@ -3058,6 +3283,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 90, }, [ITEM_ZAP_PLATE] = @@ -3072,6 +3298,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 90, }, [ITEM_MEADOW_PLATE] = @@ -3086,6 +3313,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .flingPower = 90, }, [ITEM_ICICLE_PLATE] = @@ -3100,6 +3328,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 90, }, [ITEM_FIST_PLATE] = @@ -3114,6 +3343,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .flingPower = 90, }, [ITEM_TOXIC_PLATE] = @@ -3128,6 +3358,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .flingPower = 90, }, [ITEM_EARTH_PLATE] = @@ -3142,6 +3373,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .flingPower = 90, }, [ITEM_SKY_PLATE] = @@ -3156,6 +3388,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .flingPower = 90, }, [ITEM_MIND_PLATE] = @@ -3170,6 +3403,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .flingPower = 90, }, [ITEM_INSECT_PLATE] = @@ -3184,6 +3418,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .flingPower = 90, }, [ITEM_STONE_PLATE] = @@ -3198,6 +3433,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .flingPower = 90, }, [ITEM_SPOOKY_PLATE] = @@ -3212,6 +3448,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .flingPower = 90, }, [ITEM_DRACO_PLATE] = @@ -3226,6 +3463,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .flingPower = 90, }, [ITEM_DREAD_PLATE] = @@ -3240,6 +3478,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .flingPower = 90, }, [ITEM_IRON_PLATE] = @@ -3254,6 +3493,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .flingPower = 90, }, [ITEM_PIXIE_PLATE] = @@ -3268,6 +3508,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .flingPower = 90, }, // Drives @@ -3283,6 +3524,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 70, }, [ITEM_SHOCK_DRIVE] = @@ -3296,6 +3538,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 70, }, [ITEM_BURN_DRIVE] = @@ -3309,6 +3552,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 70, }, [ITEM_CHILL_DRIVE] = @@ -3322,6 +3566,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 70, }, // Memories @@ -3338,6 +3583,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .flingPower = 50, }, [ITEM_WATER_MEMORY] = @@ -3352,6 +3598,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .flingPower = 50, }, [ITEM_ELECTRIC_MEMORY] = @@ -3366,6 +3613,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .flingPower = 50, }, [ITEM_GRASS_MEMORY] = @@ -3380,6 +3628,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .flingPower = 50, }, [ITEM_ICE_MEMORY] = @@ -3394,6 +3643,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .flingPower = 50, }, [ITEM_FIGHTING_MEMORY] = @@ -3408,6 +3658,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .flingPower = 50, }, [ITEM_POISON_MEMORY] = @@ -3422,6 +3673,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .flingPower = 50, }, [ITEM_GROUND_MEMORY] = @@ -3436,6 +3688,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .flingPower = 50, }, [ITEM_FLYING_MEMORY] = @@ -3450,6 +3703,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .flingPower = 50, }, [ITEM_PSYCHIC_MEMORY] = @@ -3464,6 +3718,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .flingPower = 50, }, [ITEM_BUG_MEMORY] = @@ -3478,6 +3733,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .flingPower = 50, }, [ITEM_ROCK_MEMORY] = @@ -3492,6 +3748,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .flingPower = 50, }, [ITEM_GHOST_MEMORY] = @@ -3506,6 +3763,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .flingPower = 50, }, [ITEM_DRAGON_MEMORY] = @@ -3520,6 +3778,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .flingPower = 50, }, [ITEM_DARK_MEMORY] = @@ -3534,6 +3793,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .flingPower = 50, }, [ITEM_STEEL_MEMORY] = @@ -3548,6 +3808,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .flingPower = 50, }, [ITEM_FAIRY_MEMORY] = @@ -3562,25 +3823,26 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .flingPower = 50, }, - [ITEM_RUSTED_SWORD] = // Todo + [ITEM_RUSTED_SWORD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RustedSword"), + .itemId = ITEM_RUSTED_SWORD, .price = 0, - .description = sDummyDesc, + .description = sRustedSwordDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RUSTED_SHIELD] = // Todo + [ITEM_RUSTED_SHIELD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RustedShield"), + .itemId = ITEM_RUSTED_SHIELD, .price = 0, - .description = sDummyDesc, + .description = sRustedShieldDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -3612,17 +3874,6 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_JADE_ORB] = // Todo - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - // Mega Stones [ITEM_VENUSAURITE] = @@ -3635,6 +3886,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CHARIZARDITE_X] = @@ -3647,6 +3899,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CHARIZARDITE_Y] = @@ -3659,6 +3912,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BLASTOISINITE] = @@ -3671,6 +3925,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BEEDRILLITE] = @@ -3683,6 +3938,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PIDGEOTITE] = @@ -3695,6 +3951,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ALAKAZITE] = @@ -3707,6 +3964,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SLOWBRONITE] = @@ -3719,6 +3977,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GENGARITE] = @@ -3731,6 +3990,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_KANGASKHANITE] = @@ -3743,6 +4003,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_PINSIRITE] = @@ -3755,6 +4016,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GYARADOSITE] = @@ -3767,6 +4029,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AERODACTYLITE] = @@ -3779,6 +4042,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEWTWONITE_X] = @@ -3791,6 +4055,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEWTWONITE_Y] = @@ -3803,6 +4068,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AMPHAROSITE] = @@ -3815,6 +4081,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_STEELIXITE] = @@ -3827,6 +4094,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SCIZORITE] = @@ -3839,6 +4107,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_HERACRONITE] = @@ -3851,6 +4120,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_HOUNDOOMINITE] = @@ -3863,6 +4133,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_TYRANITARITE] = @@ -3875,6 +4146,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SCEPTILITE] = @@ -3887,6 +4159,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BLAZIKENITE] = @@ -3899,6 +4172,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SWAMPERTITE] = @@ -3911,6 +4185,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GARDEVOIRITE] = @@ -3923,6 +4198,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SABLENITE] = @@ -3935,6 +4211,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MAWILITE] = @@ -3947,6 +4224,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AGGRONITE] = @@ -3959,6 +4237,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MEDICHAMITE] = @@ -3971,6 +4250,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_MANECTITE] = @@ -3983,6 +4263,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SHARPEDONITE] = @@ -3995,6 +4276,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_CAMERUPTITE] = @@ -4007,6 +4289,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ALTARIANITE] = @@ -4019,6 +4302,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_BANETTITE] = @@ -4031,6 +4315,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ABSOLITE] = @@ -4043,6 +4328,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GLALITITE] = @@ -4055,6 +4341,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SALAMENCITE] = @@ -4067,6 +4354,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_METAGROSSITE] = @@ -4079,6 +4367,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LATIASITE] = @@ -4091,6 +4380,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LATIOSITE] = @@ -4103,6 +4393,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LOPUNNITE] = @@ -4115,6 +4406,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GARCHOMPITE] = @@ -4127,6 +4419,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_LUCARIONITE] = @@ -4139,6 +4432,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ABOMASITE] = @@ -4151,6 +4445,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_GALLADITE] = @@ -4163,6 +4458,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_AUDINITE] = @@ -4175,6 +4471,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_DIANCITE] = @@ -4187,6 +4484,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, // Gems @@ -4538,7 +4836,7 @@ const struct Item gItems[] = [ITEM_POISONIUM_Z] = { - .name = _("Poisinium Z"), + .name = _("Poisonium Z"), .itemId = ITEM_POISONIUM_Z, .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, @@ -4912,6 +5210,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LEEK] = @@ -4924,6 +5223,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_THICK_CLUB] = @@ -4936,6 +5236,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_LUCKY_PUNCH] = @@ -4948,6 +5249,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, [ITEM_METAL_POWDER] = @@ -4960,6 +5262,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_QUICK_POWDER] = @@ -4972,6 +5275,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DEEP_SEA_SCALE] = @@ -4984,6 +5288,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DEEP_SEA_TOOTH] = @@ -4996,6 +5301,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_SOUL_DEW] = @@ -5013,6 +5319,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_ADAMANT_ORB] = @@ -5026,6 +5333,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_LUSTROUS_ORB] = @@ -5039,6 +5347,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_GRISEOUS_ORB] = @@ -5052,6 +5361,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, // Incenses @@ -5067,6 +5377,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LAX_INCENSE] = @@ -5080,6 +5391,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ODD_INCENSE] = @@ -5093,6 +5405,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROCK_INCENSE] = @@ -5106,6 +5419,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_FULL_INCENSE] = @@ -5119,6 +5433,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WAVE_INCENSE] = @@ -5132,6 +5447,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROSE_INCENSE] = @@ -5145,6 +5461,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LUCK_INCENSE] = @@ -5158,6 +5475,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PURE_INCENSE] = @@ -5170,6 +5488,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Contest Scarves @@ -5183,6 +5502,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLUE_SCARF] = @@ -5194,6 +5514,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PINK_SCARF] = @@ -5205,6 +5526,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GREEN_SCARF] = @@ -5216,6 +5538,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_YELLOW_SCARF] = @@ -5227,6 +5550,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // EV Gain Modifiers @@ -5241,6 +5565,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_POWER_WEIGHT] = @@ -5255,6 +5580,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_HP, + .flingPower = 70, }, [ITEM_POWER_BRACER] = @@ -5269,6 +5595,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_ATK, + .flingPower = 70, }, [ITEM_POWER_BELT] = @@ -5283,6 +5610,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_DEF, + .flingPower = 70, }, [ITEM_POWER_LENS] = @@ -5297,6 +5625,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPATK, + .flingPower = 70, }, [ITEM_POWER_BAND] = @@ -5311,6 +5640,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPDEF, + .flingPower = 70, }, [ITEM_POWER_ANKLET] = @@ -5325,6 +5655,7 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPEED, + .flingPower = 70, }, // Type-boosting Held Items @@ -5340,6 +5671,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHARCOAL] = @@ -5353,6 +5685,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MYSTIC_WATER] = @@ -5366,6 +5699,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MAGNET] = @@ -5379,6 +5713,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_MIRACLE_SEED] = @@ -5392,6 +5727,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_NEVER_MELT_ICE] = @@ -5405,6 +5741,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_BLACK_BELT] = @@ -5418,6 +5755,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_POISON_BARB] = @@ -5431,6 +5769,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 70, }, [ITEM_SOFT_SAND] = @@ -5444,6 +5783,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHARP_BEAK] = @@ -5457,6 +5797,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, [ITEM_TWISTED_SPOON] = @@ -5470,6 +5811,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SILVER_POWDER] = @@ -5483,6 +5825,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_HARD_STONE] = @@ -5496,6 +5839,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, [ITEM_SPELL_TAG] = @@ -5509,6 +5853,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_DRAGON_FANG] = @@ -5522,6 +5867,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 70, }, [ITEM_BLACK_GLASSES] = @@ -5535,6 +5881,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_METAL_COAT] = @@ -5548,6 +5895,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Choice Items @@ -5562,6 +5910,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOICE_SPECS] = @@ -5574,6 +5923,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOICE_SCARF] = @@ -5586,6 +5936,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Status Orbs @@ -5600,6 +5951,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TOXIC_ORB] = @@ -5612,6 +5964,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Weather Rocks @@ -5626,6 +5979,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_HEAT_ROCK] = @@ -5638,6 +5992,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_SMOOTH_ROCK] = @@ -5650,6 +6005,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ICY_ROCK] = @@ -5662,6 +6018,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, // Terrain Seeds @@ -5677,6 +6034,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PSYCHIC_SEED] = @@ -5690,6 +6048,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MISTY_SEED] = @@ -5703,6 +6062,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GRASSY_SEED] = @@ -5716,6 +6076,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, // Type-activated Stat Modifiers @@ -5731,6 +6092,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_CELL_BATTERY] = @@ -5744,6 +6106,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LUMINOUS_MOSS] = @@ -5757,6 +6120,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SNOWBALL] = @@ -5770,6 +6134,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, // Misc. Held Items @@ -5785,6 +6150,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WHITE_HERB] = @@ -5797,6 +6163,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EXP_SHARE] = @@ -5809,6 +6176,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_QUICK_CLAW] = @@ -5822,6 +6190,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SOOTHE_BELL] = @@ -5834,6 +6203,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MENTAL_HERB] = @@ -5846,6 +6216,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KINGS_ROCK] = @@ -5859,6 +6230,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_AMULET_COIN] = @@ -5872,6 +6244,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_CLEANSE_TAG] = @@ -5884,6 +6257,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SMOKE_BALL] = @@ -5896,6 +6270,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_FOCUS_BAND] = @@ -5909,6 +6284,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LUCKY_EGG] = @@ -5921,6 +6297,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_SCOPE_LENS] = @@ -5933,6 +6310,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LEFTOVERS] = @@ -5946,6 +6324,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHELL_BELL] = @@ -5959,6 +6338,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WIDE_LENS] = @@ -5972,6 +6352,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MUSCLE_BAND] = @@ -5985,6 +6366,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WISE_GLASSES] = @@ -5998,6 +6380,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_EXPERT_BELT] = @@ -6011,6 +6394,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LIGHT_CLAY] = @@ -6023,6 +6407,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_LIFE_ORB] = @@ -6035,6 +6420,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_POWER_HERB] = @@ -6047,6 +6433,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_FOCUS_SASH] = @@ -6059,6 +6446,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ZOOM_LENS] = @@ -6072,6 +6460,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_METRONOME] = @@ -6085,6 +6474,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_IRON_BALL] = @@ -6097,6 +6487,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 130, }, [ITEM_LAGGING_TAIL] = @@ -6109,6 +6500,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DESTINY_KNOT] = @@ -6121,6 +6513,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLACK_SLUDGE] = @@ -6133,6 +6526,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_GRIP_CLAW] = @@ -6145,6 +6539,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 90, }, [ITEM_STICKY_BARB] = @@ -6157,6 +6552,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SHED_SHELL] = @@ -6169,6 +6565,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BIG_ROOT] = @@ -6182,6 +6579,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RAZOR_CLAW] = @@ -6194,6 +6592,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_RAZOR_FANG] = @@ -6207,6 +6606,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EVIOLITE] = @@ -6220,6 +6620,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 40, }, [ITEM_FLOAT_STONE] = @@ -6232,6 +6633,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_ROCKY_HELMET] = @@ -6245,6 +6647,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_AIR_BALLOON] = @@ -6258,6 +6661,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RED_CARD] = @@ -6271,6 +6675,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RING_TARGET] = @@ -6284,6 +6689,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BINDING_BAND] = @@ -6296,6 +6702,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_EJECT_BUTTON] = @@ -6309,6 +6716,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_WEAKNESS_POLICY] = @@ -6322,6 +6730,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ASSAULT_VEST] = @@ -6335,6 +6744,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_SAFETY_GOGGLES] = @@ -6347,6 +6757,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, [ITEM_ADRENALINE_ORB] = @@ -6359,6 +6770,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, [ITEM_TERRAIN_EXTENDER] = @@ -6371,6 +6783,7 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, [ITEM_PROTECTIVE_PADS] = @@ -6383,72 +6796,85 @@ const struct Item gItems[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_THROAT_SPRAY] = // Todo + [ITEM_THROAT_SPRAY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Throat Spray"), + .itemId = ITEM_THROAT_SPRAY, + .price = 4000, + .holdEffect = HOLD_EFFECT_THROAT_SPRAY, + .description = sThroatSprayDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 30, }, - [ITEM_EJECT_PACK] = // Todo + [ITEM_EJECT_PACK] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Eject Pack"), + .itemId = ITEM_EJECT_PACK, + .price = 4000, + .holdEffect = HOLD_EFFECT_EJECT_PACK, + .description = sEjectPackDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 50, }, - [ITEM_HEAVY_DUTY_BOOTS] = // Todo + [ITEM_HEAVY_DUTY_BOOTS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Heavy-DtyBts"), + .itemId = ITEM_HEAVY_DUTY_BOOTS, + .price = 4000, + .holdEffect = HOLD_EFFECT_HEAVY_DUTY_BOOTS, + .description = sHeavyDutyBootsDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, - [ITEM_BLUNDER_POLICY] = // Todo + [ITEM_BLUNDER_POLICY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("BlundrPolicy"), + .itemId = ITEM_BLUNDER_POLICY, + .price = 4000, + .holdEffect = HOLD_EFFECT_BLUNDER_POLICY, + .description = sBlunderPolicyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 80, }, - [ITEM_ROOM_SERVICE] = // Todo + [ITEM_ROOM_SERVICE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Room Service"), + .itemId = ITEM_ROOM_SERVICE, + .price = 4000, + .holdEffect = HOLD_EFFECT_ROOM_SERVICE, + .description = sRoomServiceDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 100, }, - [ITEM_UTILITY_UMBRELLA] = // Todo + [ITEM_UTILITY_UMBRELLA] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("UtltyUmbrlla"), + .itemId = ITEM_UTILITY_UMBRELLA, + .price = 4000, + .holdEffect = HOLD_EFFECT_UTILITY_UMBRELLA, + .description = sUtilityUmbrellaDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 60, }, // Berries @@ -6465,6 +6891,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_CHESTO_BERRY] = @@ -6479,6 +6906,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_PECHA_BERRY] = @@ -6493,6 +6921,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_RAWST_BERRY] = @@ -6507,6 +6936,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_ASPEAR_BERRY] = @@ -6521,6 +6951,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_LEPPA_BERRY] = @@ -6536,6 +6967,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, + .flingPower = 10, }, [ITEM_ORAN_BERRY] = @@ -6551,6 +6983,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_PERSIM_BERRY] = @@ -6565,6 +6998,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_LUM_BERRY] = @@ -6579,6 +7013,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_SITRUS_BERRY] = @@ -6599,6 +7034,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, + .flingPower = 10, }, [ITEM_FIGY_BERRY] = @@ -6612,6 +7048,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WIKI_BERRY] = @@ -6625,6 +7062,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MAGO_BERRY] = @@ -6638,6 +7076,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_AGUAV_BERRY] = @@ -6651,6 +7090,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_IAPAPA_BERRY] = @@ -6664,6 +7104,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RAZZ_BERRY] = @@ -6675,6 +7116,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BLUK_BERRY] = @@ -6686,6 +7128,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NANAB_BERRY] = @@ -6697,6 +7140,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WEPEAR_BERRY] = @@ -6708,6 +7152,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PINAP_BERRY] = @@ -6719,6 +7164,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_POMEG_BERRY] = @@ -6730,6 +7176,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_KELPSY_BERRY] = @@ -6741,6 +7188,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_QUALOT_BERRY] = @@ -6752,6 +7200,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_HONDEW_BERRY] = @@ -6763,6 +7212,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_GREPA_BERRY] = @@ -6774,6 +7224,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_TAMATO_BERRY] = @@ -6785,6 +7236,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, + .flingPower = 10, }, [ITEM_CORNN_BERRY] = @@ -6796,6 +7248,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MAGOST_BERRY] = @@ -6807,6 +7260,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RABUTA_BERRY] = @@ -6818,6 +7272,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_NOMEL_BERRY] = @@ -6829,6 +7284,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SPELON_BERRY] = @@ -6840,6 +7296,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PAMTRE_BERRY] = @@ -6851,6 +7308,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WATMEL_BERRY] = @@ -6862,6 +7320,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_DURIN_BERRY] = @@ -6873,6 +7332,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BELUE_BERRY] = @@ -6884,6 +7344,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHILAN_BERRY] = @@ -6897,6 +7358,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_OCCA_BERRY] = @@ -6910,6 +7372,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PASSHO_BERRY] = @@ -6923,6 +7386,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_WACAN_BERRY] = @@ -6936,6 +7400,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_RINDO_BERRY] = @@ -6949,6 +7414,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_YACHE_BERRY] = @@ -6962,6 +7428,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHOPLE_BERRY] = @@ -6975,6 +7442,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KEBIA_BERRY] = @@ -6988,6 +7456,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SHUCA_BERRY] = @@ -7001,6 +7470,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_COBA_BERRY] = @@ -7009,11 +7479,12 @@ const struct Item gItems[] = .itemId = ITEM_COBA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_RESIST_BERRY, - .holdEffectParam = TYPE_FLYING, + .holdEffectParam = TYPE_FIGHTING, .description = sCobaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PAYAPA_BERRY] = @@ -7027,6 +7498,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_TANGA_BERRY] = @@ -7040,6 +7512,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CHARTI_BERRY] = @@ -7053,6 +7526,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KASIB_BERRY] = @@ -7066,6 +7540,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_HABAN_BERRY] = @@ -7079,6 +7554,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_COLBUR_BERRY] = @@ -7092,6 +7568,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_BABIRI_BERRY] = @@ -7105,6 +7582,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROSELI_BERRY] = @@ -7118,6 +7596,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LIECHI_BERRY] = @@ -7131,6 +7610,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_GANLON_BERRY] = @@ -7144,6 +7624,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_SALAC_BERRY] = @@ -7157,6 +7638,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_PETAYA_BERRY] = @@ -7170,6 +7652,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_APICOT_BERRY] = @@ -7183,6 +7666,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_LANSAT_BERRY] = @@ -7196,6 +7680,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_STARF_BERRY] = @@ -7209,17 +7694,20 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, - [ITEM_ENIGMA_BERRY] = // Todo + [ITEM_ENIGMA_BERRY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .name = _("Enigma Berry"), + .itemId = ITEM_ENIGMA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_ENIGMA_BERRY, + .description = sEnigmaBerryDesc, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MICLE_BERRY] = @@ -7233,6 +7721,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_CUSTAP_BERRY] = @@ -7246,6 +7735,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_JABOCA_BERRY] = @@ -7258,6 +7748,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ROWAP_BERRY] = @@ -7270,6 +7761,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_KEE_BERRY] = @@ -7282,6 +7774,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_MARANGA_BERRY] = @@ -7294,6 +7787,7 @@ const struct Item gItems[] = .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .flingPower = 10, }, [ITEM_ENIGMA_BERRY_E_READER] = @@ -7307,6 +7801,7 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_EnigmaBerry, + .flingPower = 10, }, // TMs/HMs @@ -7320,6 +7815,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 150, }, [ITEM_TM02_DRAGON_CLAW] = @@ -7331,6 +7827,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_TM03_WATER_PULSE] = @@ -7342,6 +7839,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM04_CALM_MIND] = @@ -7353,6 +7851,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM05_ROAR] = @@ -7364,6 +7863,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM06_TOXIC] = @@ -7375,6 +7875,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM07_HAIL] = @@ -7386,6 +7887,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM08_BULK_UP] = @@ -7397,6 +7899,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM09_BULLET_SEED] = @@ -7408,6 +7911,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5) + .flingPower = 25, + #else + .flingPower = 10, + #endif }, [ITEM_TM10_HIDDEN_POWER] = @@ -7419,6 +7927,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 10, + #endif }, [ITEM_TM11_SUNNY_DAY] = @@ -7430,6 +7943,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM12_TAUNT] = @@ -7441,6 +7955,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM13_ICE_BEAM] = @@ -7452,6 +7967,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM14_BLIZZARD] = @@ -7463,6 +7983,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM15_HYPER_BEAM] = @@ -7474,6 +7999,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 150, }, [ITEM_TM16_LIGHT_SCREEN] = @@ -7485,6 +8011,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM17_PROTECT] = @@ -7496,6 +8023,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM18_RAIN_DANCE] = @@ -7507,6 +8035,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM19_GIGA_DRAIN] = @@ -7518,6 +8047,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5) + .flingPower = 75, + #else + .flingPower = 60, + #endif }, [ITEM_TM20_SAFEGUARD] = @@ -7529,6 +8063,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM21_FRUSTRATION] = @@ -7540,6 +8075,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM22_SOLAR_BEAM] = @@ -7551,6 +8087,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 120, }, [ITEM_TM23_IRON_TAIL] = @@ -7562,6 +8099,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 100, }, [ITEM_TM24_THUNDERBOLT] = @@ -7573,6 +8111,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM25_THUNDER] = @@ -7584,6 +8127,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM26_EARTHQUAKE] = @@ -7595,6 +8143,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 100, }, [ITEM_TM27_RETURN] = @@ -7606,6 +8155,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM28_DIG] = @@ -7617,6 +8167,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 80, + #else + .flingPower = 60, + #endif }, [ITEM_TM29_PSYCHIC] = @@ -7628,6 +8183,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 90, }, [ITEM_TM30_SHADOW_BALL] = @@ -7639,6 +8195,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_TM31_BRICK_BREAK] = @@ -7650,6 +8207,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 75, }, [ITEM_TM32_DOUBLE_TEAM] = @@ -7661,6 +8219,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM33_REFLECT] = @@ -7672,6 +8231,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM34_SHOCK_WAVE] = @@ -7683,6 +8243,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM35_FLAMETHROWER] = @@ -7694,6 +8255,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_TM36_SLUDGE_BOMB] = @@ -7705,6 +8271,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 90, }, [ITEM_TM37_SANDSTORM] = @@ -7716,6 +8283,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM38_FIRE_BLAST] = @@ -7727,6 +8295,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 110, + #else + .flingPower = 120, + #endif }, [ITEM_TM39_ROCK_TOMB] = @@ -7738,6 +8311,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 50, + #endif }, [ITEM_TM40_AERIAL_ACE] = @@ -7749,6 +8327,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 60, }, [ITEM_TM41_TORMENT] = @@ -7760,6 +8339,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM42_FACADE] = @@ -7771,6 +8351,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM43_SECRET_POWER] = @@ -7782,6 +8363,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 70, }, [ITEM_TM44_REST] = @@ -7793,6 +8375,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM45_ATTRACT] = @@ -7804,6 +8387,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM46_THIEF] = @@ -7815,6 +8399,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 60, + #else + .flingPower = 40, + #endif }, [ITEM_TM47_STEEL_WING] = @@ -7826,6 +8415,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 70, }, [ITEM_TM48_SKILL_SWAP] = @@ -7837,6 +8427,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM49_SNATCH] = @@ -7848,6 +8439,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_TM50_OVERHEAT] = @@ -7859,6 +8451,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 130, + #else + .flingPower = 140, + #endif }, [ITEM_TM51] = @@ -8421,6 +9018,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 50, }, [ITEM_HM02_FLY] = @@ -8433,6 +9031,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 90, + #else + .flingPower = 70, + #endif }, [ITEM_HM03_SURF] = @@ -8445,6 +9048,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6) + .flingPower = 90, + #else + .flingPower = 95, + #endif }, [ITEM_HM04_STRENGTH] = @@ -8457,6 +9065,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_HM05_FLASH] = @@ -8469,6 +9078,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 10, }, [ITEM_HM06_ROCK_SMASH] = @@ -8481,6 +9091,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 20, + #else + .flingPower = 40, + #endif }, [ITEM_HM07_WATERFALL] = @@ -8493,6 +9108,7 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + .flingPower = 80, }, [ITEM_HM08_DIVE] = @@ -8505,6 +9121,11 @@ const struct Item gItems[] = .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, + #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4) + .flingPower = 80, + #else + .flingPower = 60, + #endif }, @@ -8534,39 +9155,42 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_CATCHING_CHARM] = // Todo + [ITEM_CATCHING_CHARM] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("CatchngCharm"), + .itemId = ITEM_CATCHING_CHARM, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sCatchingCharmDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_EXP_CHARM] = // Todo + [ITEM_EXP_CHARM] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Exp. Charm"), + .itemId = ITEM_EXP_CHARM, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sExpCharmDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, // Form-changing Key Items - [ITEM_ROTOM_CATALOG] = // Todo + [ITEM_ROTOM_CATALOG] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RotomCatalog"), + .itemId = ITEM_ROTOM_CATALOG, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sRotomCatalogDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_GRACIDEA] = @@ -8586,99 +9210,125 @@ const struct Item gItems[] = #endif }, - [ITEM_REVEAL_GLASS] = // Todo + [ITEM_REVEAL_GLASS] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Reveal Glass"), + .itemId = ITEM_REVEAL_GLASS, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sRevealGlassDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_DNA_SPLICERS] = // Todo + [ITEM_DNA_SPLICERS] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("DNA Splicers"), + .itemId = ITEM_DNA_SPLICERS, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sDNASplicersDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_ZYGARDE_CUBE] = // Todo + [ITEM_ZYGARDE_CUBE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Zygarde Cube"), + .itemId = ITEM_ZYGARDE_CUBE, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sZygardeCubeDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_PRISON_BOTTLE] = // Todo + [ITEM_PRISON_BOTTLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Prison Bottle"), + .itemId = ITEM_PRISON_BOTTLE, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sPrisonBottleDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_N_SOLARIZER] = // Todo + [ITEM_N_SOLARIZER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("N-Solarizer"), + .itemId = ITEM_N_SOLARIZER, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sNSolarizerDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_N_LUNARIZER] = // Todo + [ITEM_N_LUNARIZER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("N-Lunarizer"), + .itemId = ITEM_N_LUNARIZER, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sNLunarizerDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_REINS_OF_UNITY] = // Todo + [ITEM_REINS_OF_UNITY] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("ReinsOfUnity"), + .itemId = ITEM_REINS_OF_UNITY, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sReinsOfUnityDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, // Battle Mechanic Key Items - [ITEM_KEY_STONE] = // Todo + [ITEM_MEGA_RING] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_MEGA_RING] = // Todo (Replaces ITEM_MEGA_BRACELET) - { - .name = _("Mega Bracelet"), + .name = _("Mega Ring"), .itemId = ITEM_MEGA_RING, .price = 0, .importance = 1, @@ -8688,26 +9338,25 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_Z_POWER_RING] = // Todo (Replaces ITEM_Z_POWER_RING) + [ITEM_Z_POWER_RING] = { - .name = _("Z-Ring"), + .name = _("Z-Power Ring"), .itemId = ITEM_Z_POWER_RING, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .description = sZPowerRingDesc, .importance = 1, + .description = sZPowerRingDesc, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_DYNAMAX_BAND] = // Todo + [ITEM_DYNAMAX_BAND] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Dynamax Band"), + .itemId = ITEM_DYNAMAX_BAND, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sDynamaxBandDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, @@ -8862,15 +9511,16 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_POKEMON_BOX_LINK] = // Todo + [ITEM_POKEMON_BOX_LINK] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("{PKMN} Box Link"), + .itemId = ITEM_POKEMON_BOX_LINK, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sPokemonBoxLinkDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_COIN_CASE] = @@ -8910,15 +9560,16 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, }, - [ITEM_POKE_RADAR] = // Todo + [ITEM_POKE_RADAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Poké Radar"), + .itemId = ITEM_POKE_RADAR, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sPokeRadarDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_POKEBLOCK_CASE] = diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 5050367cf1..ff621356e1 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -161,10 +161,6 @@ const u8 gItemEffect_MaxElixir[7] = { [6] = ITEM6_HEAL_PP_FULL, }; -const u8 gItemEffect_LavaCookie[6] = { - [3] = ITEM3_STATUS_ALL, -}; - const u8 gItemEffect_BlueFlute[6] = { [3] = ITEM3_SLEEP, }; @@ -182,19 +178,6 @@ const u8 gItemEffect_BerryJuice[7] = { [6] = 20, // Amount of HP to recover }; -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, @@ -396,7 +379,7 @@ const u8 gItemEffect_XSpecialDefense[8] = { STAT_BOOST_FRIENDSHIP_CHANGE, }; -const u8 gItemEffect_EvoStone[6] = { +const u8 gItemEffect_EvoItem[6] = { [4] = ITEM4_EVO_STONE, }; @@ -434,10 +417,6 @@ const u8 gItemEffect_PersimBerry[6] = { [3] = ITEM3_CONFUSION, }; -const u8 gItemEffect_LumBerry[6] = { - [3] = ITEM3_STATUS_ALL, -}; - const u8 gItemEffect_SitrusBerry[7] = { [4] = ITEM4_HEAL_HP, #if I_SITRUS_BERRY_HEAL >= GEN_4 @@ -492,88 +471,126 @@ const u8 gItemEffect_TamatoBerry[10] = { const u8 *const gItemEffectTable[] = { - [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion, - [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote, - [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal, - [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal, - [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening, - [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal, - [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore, - [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion, - [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion, - [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion, - [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal, - [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive, - [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive, - [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater, - [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop, - [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade, - [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk, - [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder, - [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot, - [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder, - [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb, - [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether, - [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther, - [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir, - [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir, - [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie, - [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute, - [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, - [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron, - [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos, - [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium, - [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, - [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, - [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, - [ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpFeather, - [ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkFeather, - [ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefFeather, - [ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkFeather, - [ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefFeather, - [ITEM_SWIFT_FEATHER - ITEM_POTION] = gItemEffect_SpeedFeather, - [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_DEFENSE - ITEM_POTION] = gItemEffect_XDefense, - [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, - [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, - [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, - [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry, - [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry, - [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry, - [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry, - [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry, - [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry, - [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry, - [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry, - [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry, - [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry, - [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry, - [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry, - [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry, - [LAST_BERRY_INDEX - ITEM_POTION] = NULL + // Medicine + [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion, + [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion, + [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion, + [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion, + [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore, + [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive, + [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive, + [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater, + [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop, + [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade, + [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk, + [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder, + [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot, + [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder, + [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb, + [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote, + [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal, + [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal, + [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal, + [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening, + [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether, + [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther, + [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir, + [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir, + [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, + [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, + [ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_Potion, + [ITEM_MAX_HONEY - ITEM_POTION] = gItemEffect_MaxRevive, + + // Regional Specialties + [ITEM_PEWTER_CRUNCHIES - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_RAGE_CANDY_BAR - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_CASTELIACONE - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_LUMIOSE_GALETTE - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_SHALOUR_SABLE - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_FullHeal, + + // Vitamins + [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, + [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, + [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron, + [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium, + [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, + [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos, + [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, + [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, + + // EV Feathers + [ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpFeather, + [ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkFeather, + [ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefFeather, + [ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkFeather, + [ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefFeather, + [ITEM_SWIFT_FEATHER - ITEM_POTION] = gItemEffect_SpeedFeather, + + // Candy + [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, + //[ITEM_EXP_CANDY_XS - ITEM_POTION] = gItemEffect_ExpCandy, // Todo + //[ITEM_EXP_CANDY_S - ITEM_POTION] = gItemEffect_ExpCandy, // Todo + //[ITEM_EXP_CANDY_M - ITEM_POTION] = gItemEffect_ExpCandy, // Todo + //[ITEM_EXP_CANDY_L - ITEM_POTION] = gItemEffect_ExpCandy, // Todo + //[ITEM_EXP_CANDY_XL - ITEM_POTION] = gItemEffect_ExpCandy, // Todo + //[ITEM_DYNAMAX_CANDY - ITEM_POTION] = gItemEffect_DynamaxCandy, // Todo + + // Medicinal Flutes + [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute, + [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, + [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, + + // X Items + [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack, + [ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefense, + [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, + [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, + [ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecialAttack, + [ITEM_X_SP_DEF - ITEM_POTION] = gItemEffect_XSpecialDefense, + + [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit, + [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, + + //[ITEM_MAX_MUSHROOMS - ITEM_POTION] = gItemEffect_MaxMushrooms, // Todo + + // Evolution Items + [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_ICE_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_SHINY_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_DUSK_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_DAWN_STONE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_SWEET_APPLE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_TART_APPLE - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_CRACKED_POT - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_CHIPPED_POT - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_GALARICA_CUFF - ITEM_POTION] = gItemEffect_EvoItem, + [ITEM_GALARICA_WREATH - ITEM_POTION] = gItemEffect_EvoItem, + + // Berries + [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry, + [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry, + [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry, + [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry, + [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry, + [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry, + [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry, + [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry, + [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_FullHeal, + [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry, + [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry, + [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry, + [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry, + [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry, + [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry, + [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry, + [LAST_BERRY_INDEX - ITEM_POTION] = NULL, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index b0bd4d854f..5c70e17b26 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -108,9 +108,14 @@ static const u8 sHeavyBallDesc[] = _( "Pokémon."); static const u8 sDreamBallDesc[] = _( +#if defined(BATTLE_ENGINE) && B_DREAM_BALL_MODIFIER >= GEN_8 + "A Ball that works\n" + "well on sleeping\n" + "Pokémon."); +#else "A Poké Ball used in\n" - "the Entree Forest.\n" - "It doesn't fail."); + "the Entree Forest."); +#endif static const u8 sSafariBallDesc[] = _( "A special Ball that\n" @@ -144,12 +149,20 @@ static const u8 sPotionDesc[] = _( static const u8 sSuperPotionDesc[] = _( "Restores the HP of\n" "a Pokémon by\n" +#if I_HEALTH_RECOVERY >= GEN_7 "60 points."); +#else + "50 points."); +#endif static const u8 sHyperPotionDesc[] = _( "Restores the HP of\n" "a Pokémon by\n" +#if I_HEALTH_RECOVERY >= GEN_7 "120 points."); +#else + "200 points."); +#endif static const u8 sMaxPotionDesc[] = _( "Fully restores the\n" @@ -173,17 +186,29 @@ static const u8 sMaxReviveDesc[] = _( static const u8 sFreshWaterDesc[] = _( "A mineral water\n" "that restores HP\n" +#if I_HEALTH_RECOVERY >= GEN_7 "by 30 points."); +#else + "by 50 points."); +#endif static const u8 sSodaPopDesc[] = _( "A fizzy soda drink\n" "that restores HP\n" +#if I_HEALTH_RECOVERY >= GEN_7 "by 50 points."); +#else + "by 60 points."); +#endif static const u8 sLemonadeDesc[] = _( "A very sweet drink\n" "that restores HP\n" +#if I_HEALTH_RECOVERY >= GEN_7 "by 70 points."); +#else + "by 80 points."); +#endif static const u8 sMoomooMilkDesc[] = _( "A nutritious milk\n" @@ -193,12 +218,20 @@ static const u8 sMoomooMilkDesc[] = _( static const u8 sEnergyPowderDesc[] = _( "A bitter powder\n" "that restores HP\n" +#if I_HEALTH_RECOVERY >= GEN_7 "by 60 points."); +#else + "by 50 points."); +#endif static const u8 sEnergyRootDesc[] = _( "A bitter root\n" "that restores HP\n" +#if I_HEALTH_RECOVERY >= GEN_7 "by 120 points."); +#else + "by 200 points."); +#endif static const u8 sHealPowderDesc[] = _( "A bitter powder\n" @@ -269,14 +302,20 @@ static const u8 sSweetHeartDesc[] = _( "that restores HP\n" "by 20 points."); -static const u8 sMaxHoneyDesc[] = _( // Todo - "?????"); +static const u8 sMaxHoneyDesc[] = _( + "Revives a fainted\n" + "Pokémon with all\n" + "its HP."); -static const u8 sPewterCrunchiesDesc[] = _( // Todo - "?????"); +static const u8 sPewterCrunchiesDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sRageCandyBarDesc[] = _( // Todo - "?????"); +static const u8 sRageCandyBarDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); static const u8 sLavaCookieDesc[] = _( "A local specialty\n" @@ -288,14 +327,20 @@ static const u8 sOldGateauDesc[] = _( "status problems of\n" "one Pokémon."); -static const u8 sCasteliaconeDesc[] = _( // Todo - "?????"); +static const u8 sCasteliaconeDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sLumioseGaletteDesc[] = _( // Todo - "?????"); +static const u8 sLumioseGaletteDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sShalourSableDesc[] = _( // Todo - "?????"); +static const u8 sShalourSableDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); static const u8 sBigMalasadaDesc[] = _( "Heals all the\n" @@ -378,72 +423,116 @@ static const u8 sAbilityCapsuleDesc[] = _( "Switches a Poké-\n" "mon's ability."); -static const u8 sAbilityPatchDesc[] = _( // Todo - "?????"); +static const u8 sAbilityPatchDesc[] = _( + "Turns the ability\n" + "of a Pokémon into\n" + "a rare ability."); // Mints -static const u8 sLonelyMintDesc[] = _( // Todo - "?????"); +static const u8 sLonelyMintDesc[] = _( + "Can be smelled. It\n" + "ups Attack, but\n" + "reduces Defense."); -static const u8 sAdamantMintDesc[] = _( // Todo - "?????"); +static const u8 sAdamantMintDesc[] = _( + "Can be smelled. It\n" + "ups Attack, but\n" + "reduces Sp. Atk."); -static const u8 sNaughtyMintDesc[] = _( // Todo - "?????"); +static const u8 sNaughtyMintDesc[] = _( + "Can be smelled. It\n" + "ups Attack, but\n" + "reduces Sp. Def."); -static const u8 sBraveMintDesc[] = _( // Todo - "?????"); +static const u8 sBraveMintDesc[] = _( + "Can be smelled. It\n" + "ups Attack, but\n" + "reduces Speed."); -static const u8 sBoldMintDesc[] = _( // Todo - "?????"); +static const u8 sBoldMintDesc[] = _( + "Can be smelled. It\n" + "ups Defense, but\n" + "reduces Attack."); -static const u8 sImpishMintDesc[] = _( // Todo - "?????"); +static const u8 sImpishMintDesc[] = _( + "Can be smelled. It\n" + "ups Defense, but\n" + "reduces Sp. Atk."); -static const u8 sLaxMintDesc[] = _( // Todo - "?????"); +static const u8 sLaxMintDesc[] = _( + "Can be smelled. It\n" + "ups Defense, but\n" + "reduces Sp. Def."); -static const u8 sRelaxedMintDesc[] = _( // Todo - "?????"); +static const u8 sRelaxedMintDesc[] = _( + "Can be smelled. It\n" + "ups Defense, but\n" + "reduces Speed."); -static const u8 sModestMintDesc[] = _( // Todo - "?????"); +static const u8 sModestMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Atk, but\n" + "reduces Attack."); -static const u8 sMildMintDesc[] = _( // Todo - "?????"); +static const u8 sMildMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Atk, but\n" + "reduces Defense."); -static const u8 sRashMintDesc[] = _( // Todo - "?????"); +static const u8 sRashMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Atk, but\n" + "reduces Sp. Def."); -static const u8 sQuietMintDesc[] = _( // Todo - "?????"); +static const u8 sQuietMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Atk, but\n" + "reduces Speed."); -static const u8 sCalmMintDesc[] = _( // Todo - "?????"); +static const u8 sCalmMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Def, but\n" + "reduces Attack."); -static const u8 sGentleMintDesc[] = _( // Todo - "?????"); +static const u8 sGentleMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Def, but\n" + "reduces Defense."); -static const u8 sCarefulMintDesc[] = _( // Todo - "?????"); +static const u8 sCarefulMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Def, but\n" + "reduces Sp. Atk."); -static const u8 sSassyMintDesc[] = _( // Todo - "?????"); +static const u8 sSassyMintDesc[] = _( + "Can be smelled. It\n" + "ups Sp. Def, but\n" + "reduces Speed."); -static const u8 sTimidMintDesc[] = _( // Todo - "?????"); +static const u8 sTimidMintDesc[] = _( + "Can be smelled. It\n" + "ups Speed, but\n" + "reduces Attack."); -static const u8 sHastyMintDesc[] = _( // Todo - "?????"); +static const u8 sHastyMintDesc[] = _( + "Can be smelled. It\n" + "ups Speed, but\n" + "reduces Defense."); -static const u8 sJollyMintDesc[] = _( // Todo - "?????"); +static const u8 sJollyMintDesc[] = _( + "Can be smelled. It\n" + "ups Speed, but\n" + "reduces Sp. Atk."); -static const u8 sNaiveMintDesc[] = _( // Todo - "?????"); +static const u8 sNaiveMintDesc[] = _( + "Can be smelled. It\n" + "ups Speed, but\n" + "reduces Sp. Def."); -static const u8 sSeriousMintDesc[] = _( // Todo - "?????"); +static const u8 sSeriousMintDesc[] = _( + "Can be smelled. It\n" + "ups Speed, but\n" + "reduces Attack."); // Candy static const u8 sRareCandyDesc[] = _( @@ -451,23 +540,35 @@ static const u8 sRareCandyDesc[] = _( "of a Pokémon by\n" "one."); -static const u8 sExpCandyXSDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyXSDesc[] = _( + "Gives a very small\n" + "amount of Exp. to\n" + "a single Pokémon."); -static const u8 sExpCandySDesc[] = _( // Todo - "?????"); +static const u8 sExpCandySDesc[] = _( + "Gives a small\n" + "amount of Exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyMDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyMDesc[] = _( + "Gives a moderate\n" + "amount of Exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyLDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyLDesc[] = _( + "Gives a large\n" + "amount of Exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyXLDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyXLDesc[] = _( + "Gives a very large\n" + "amount of Exp. to\n" + "a single Pokémon."); -static const u8 sDynamaxCandyDesc[] = _( // Todo - "?????"); +static const u8 sDynamaxCandyDesc[] = _( + "Raises the Dynamax\n" + "Level of a single\n" + "Pokémon by one."); // Medicinal Flutes static const u8 sBlueFluteDesc[] = _( @@ -511,14 +612,20 @@ static const u8 sMaxRepelDesc[] = _( "Pokémon for 250\n" "steps."); -static const u8 sLureDesc[] = _( // Todo - "?????"); +static const u8 sLureDesc[] = _( + "Makes Pokémon more\n" + "likely to appear\n" + "for 100 steps."); -static const u8 sSuperLureDesc[] = _( // Todo - "?????"); +static const u8 sSuperLureDesc[] = _( + "Makes Pokémon more\n" + "likely to appear\n" + "for 200 steps."); -static const u8 sMaxLureDesc[] = _( // Todo - "?????"); +static const u8 sMaxLureDesc[] = _( + "Makes Pokémon more\n" + "likely to appear\n" + "for 250 steps."); static const u8 sEscapeRopeDesc[] = _( "Use to escape\n" @@ -527,34 +634,70 @@ static const u8 sEscapeRopeDesc[] = _( // Battle items static const u8 sXAttackDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises stat\n" + "Attack during\n" + "one battle."); +#else "Raises the stat\n" "Attack during one\n" "battle."); +#endif static const u8 sXDefenseDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises stat\n" + "Defense during\n" + "one battle."); +#else "Raises the stat\n" "Defense during one\n" "battle."); +#endif static const u8 sXSpAtkDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises stat\n" + "Sp. Atk during\n" + "one battle."); +#else "Raises the stat\n" "Sp. Atk during one\n" "battle."); +#endif static const u8 sXSpDefDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises stat\n" + "Sp. Def during\n" + "one battle."); +#else "Raises the stat\n" "Sp. Def during one\n" "battle."); +#endif static const u8 sXSpeedDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises stat\n" + "Speed during\n" + "one battle."); +#else "Raises the stat\n" "Speed during one\n" "battle."); +#endif static const u8 sXAccuracyDesc[] = _( +#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7 + "Sharply raises move\n" + "accuracy during\n" + "one battle."); +#else "Raises accuracy\n" "of attack moves\n" "during one battle."); +#endif static const u8 sDireHitDesc[] = _( "Raises the\n" @@ -577,26 +720,36 @@ static const u8 sFluffyTailDesc[] = _( "any battle with\n" "a wild Pokémon."); -static const u8 sPokeToyDesc[] = _( // Todo - "?????"); +static const u8 sPokeToyDesc[] = _( + "Use to flee from\n" + "any battle with\n" + "a wild Pokémon."); -static const u8 sMaxMushroomsDesc[] = _( // Todo - "?????"); +static const u8 sMaxMushroomsDesc[] = _( + "Raises every stat\n" + "during one battle\n" + "by one stage."); // Treasures -static const u8 sBottleCapDesc[] = _( // Todo - "?????"); +static const u8 sBottleCapDesc[] = _( + "A beautiful bottle\n" + "cap that gives off\n" + "a silver gleam."); -static const u8 sGoldBottleCapDesc[] = _( // Todo - "?????"); +static const u8 sGoldBottleCapDesc[] = _( + "A beautiful bottle\n" + "cap that gives off\n" + "a golden gleam."); static const u8 sNuggetDesc[] = _( "A nugget of pure\n" "gold. Can be sold at\n" "a high price."); -static const u8 sBigNuggetDesc[] = _( // Todo - "?????"); +static const u8 sBigNuggetDesc[] = _( + "A big nugget made\n" + "of gold, sellable\n" + "at a high price."); static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n" @@ -608,8 +761,10 @@ static const u8 sBigMushroomDesc[] = _( "that would sell at a\n" "high price."); -static const u8 sBalmMushroomDesc[] = _( // Todo - "?????"); +static const u8 sBalmMushroomDesc[] = _( + "A rare mushroom\n" + "that would sell at a\n" + "high price."); static const u8 sPearlDesc[] = _( "A pretty pearl\n" @@ -621,8 +776,10 @@ static const u8 sBigPearlDesc[] = _( "that would sell at a\n" "high price."); -static const u8 sPearlStringDesc[] = _( // Todo - "?????"); +static const u8 sPearlStringDesc[] = _( + "Very large pearls\n" + "that would sell at a\n" + "high price."); static const u8 sStardustDesc[] = _( "Beautiful red sand.\n" @@ -634,8 +791,10 @@ static const u8 sStarPieceDesc[] = _( "It would sell for a\n" "very high price."); -static const u8 sCometShardDesc[] = _( // Todo - "?????"); +static const u8 sCometShardDesc[] = _( + "A comet's shard.\n" + "It would sell for a\n" + "high price."); static const u8 sShoalSaltDesc[] = _( "Salt obtained from\n" @@ -692,29 +851,45 @@ static const u8 sPrettyFeatherDesc[] = _( "plain feather that\n" "does nothing."); -static const u8 sRelicCopperDesc[] = _( // Todo - "?????"); +static const u8 sRelicCopperDesc[] = _( + "A copper coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicSilverDesc[] = _( // Todo - "?????"); +static const u8 sRelicSilverDesc[] = _( + "A silver coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicGoldDesc[] = _( // Todo - "?????"); +static const u8 sRelicGoldDesc[] = _( + "A gold coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicVaseDesc[] = _( // Todo - "?????"); +static const u8 sRelicVaseDesc[] = _( + "A vase made long\n" + "ago. It sells at\n" + "a high price."); -static const u8 sRelicBandDesc[] = _( // Todo - "?????"); +static const u8 sRelicBandDesc[] = _( + "An old bracelet.\n" + "It sells at a\n" + "high price."); -static const u8 sRelicStatueDesc[] = _( // Todo - "?????"); +static const u8 sRelicStatueDesc[] = _( + "An old statue.\n" + "It sells at a\n" + "high price."); -static const u8 sRelicCrownDesc[] = _( // Todo - "?????"); +static const u8 sRelicCrownDesc[] = _( + "An old crown.\n" + "It sells at a\n" + "high price."); -static const u8 sStrangeSouvenirDesc[] = _( // Todo - "?????"); +static const u8 sStrangeSouvenirDesc[] = _( + "An ornament that\n" + "depicts a Pokémon\n" + "from Alola."); // Fossils static const u8 sHelixFossilDesc[] = _( @@ -772,42 +947,67 @@ static const u8 sSailFossilDesc[] = _( "toric Pokémon's\n" "skin sail."); -static const u8 sFossilizedBirdDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedBirdDesc[] = _( + "A fossil of an\n" + "ancient, sky-\n" + "soaring Pokémon."); -static const u8 sFossilizedFishDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedFishDesc[] = _( + "A fossil of an\n" + "ancient, sea-\n" + "dwelling Pokémon."); -static const u8 sFossilizedDrakeDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedDrakeDesc[] = _( + "A fossil of an\n" + "ancient, land-\n" + "roaming Pokémon."); -static const u8 sFossilizedDinoDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedDinoDesc[] = _( + "A fossil of an\n" + "ancient, sea-\n" + "dwelling Pokémon."); // Mulch -static const u8 sGrowthMulchDesc[] = _( // Todo - "?????"); +static const u8 sGrowthMulchDesc[] = _( + "A fertilizer that\n" + "accelerates the\n" + "growth of Berries."); -static const u8 sDampMulchDesc[] = _( // Todo - "?????"); +static const u8 sDampMulchDesc[] = _( + "A fertilizer that\n" + "decelerates the\n" + "growth of Berries."); -static const u8 sStableMulchDesc[] = _( // Todo - "?????"); +static const u8 sStableMulchDesc[] = _( + "A fertilizer that\n" + "ups the life time\n" + "of Berry trees."); -static const u8 sGooeyMulchDesc[] = _( // Todo - "?????"); +static const u8 sGooeyMulchDesc[] = _( + "A fertilizer that\n" + "makes more Berries\n" + "regrow after fall."); -static const u8 sRichMulchDesc[] = _( // Todo - "?????"); +static const u8 sRichMulchDesc[] = _( + "A fertilizer that\n" + "ups the number of\n" + "Berries harvested."); -static const u8 sSurpriseMulchDesc[] = _( // Todo - "?????"); +static const u8 sSurpriseMulchDesc[] = _( + "A fertilizer that\n" + "ups the chance of\n" + "Berry mutations."); -static const u8 sBoostMulchDesc[] = _( // Todo - "?????"); +static const u8 sBoostMulchDesc[] = _( + "A fertilizer that\n" + "ups the dry speed\n" + "of soft soil."); + +static const u8 sAmazeMulchDesc[] = _( + "A fertilizer Rich\n" + "Surprising and\n" + "Boosting as well."); -static const u8 sAmazeMulchDesc[] = _( // Todo - "?????"); // Apricorns static const u8 sRedApricornDesc[] = _( "A red apricorn.\n" @@ -844,17 +1044,25 @@ static const u8 sBlackApricornDesc[] = _( "It has an inde-\n" "scribable scent."); -static const u8 sWishingPieceDesc[] = _( // Todo - "?????"); +static const u8 sWishingPieceDesc[] = _( + "Throw into a\n" + "{PKMN} Den to attract\n" + "Dynamax Pokémon."); -static const u8 sGalaricaTwigDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaTwigDesc[] = _( + "A twig from a tree\n" + "in Galar called\n" + "Galarica."); -static const u8 sArmoriteOreDesc[] = _( // Todo - "?????"); +static const u8 sArmoriteOreDesc[] = _( + "A rare ore. Can be\n" + "found in the Isle\n" + "of Armor at Galar."); -static const u8 sDyniteOreDesc[] = _( // Todo - "?????"); +static const u8 sDyniteOreDesc[] = _( + "A mysterious ore.\n" + "It can be found in\n" + "Galar's Max Lair."); // Mail static const u8 sOrangeMailDesc[] = _( @@ -968,23 +1176,35 @@ static const u8 sDawnStoneDesc[] = _( "species of Pokémon\n" "evolve."); -static const u8 sSweetAppleDesc[] = _( // Todo - "?????"); +static const u8 sSweetAppleDesc[] = _( + "A very sweet apple\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sTartAppleDesc[] = _( // Todo - "?????"); +static const u8 sTartAppleDesc[] = _( + "A very tart apple\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sCrackedPotDesc[] = _( // Todo - "?????"); +static const u8 sCrackedPotDesc[] = _( + "A cracked teapot\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sChippedPotDesc[] = _( // Todo - "?????"); +static const u8 sChippedPotDesc[] = _( + "A chipped teapot\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sGalaricaCuffDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaCuffDesc[] = _( + "A cuff from Galar\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sGalaricaWreathDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaWreathDesc[] = _( + "A wreath made in\n" + "Galar. Makes some\n" + "Pokémon evolve."); static const u8 sDragonScaleDesc[] = _( "A strange scale\n" @@ -1040,26 +1260,40 @@ static const u8 sOvalStoneDesc[] = _( "Pokémon evolve. It's\n" "shaped like an egg."); -static const u8 sStrawberrySweetDesc[] = _( // Todo - "?????"); +static const u8 sStrawberrySweetDesc[] = _( + "Strawberry-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sLoveSweetDesc[] = _( // Todo - "?????"); +static const u8 sLoveSweetDesc[] = _( + "A heart-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sBerrySweetDesc[] = _( // Todo - "?????"); +static const u8 sBerrySweetDesc[] = _( + "A berry-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sCloverSweetDesc[] = _( // Todo - "?????"); +static const u8 sCloverSweetDesc[] = _( + "A clover-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sFlowerSweetDesc[] = _( // Todo - "?????"); +static const u8 sFlowerSweetDesc[] = _( + "A flower-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sStarSweetDesc[] = _( // Todo - "?????"); +static const u8 sStarSweetDesc[] = _( + "A star-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sRibbonSweetDesc[] = _( // Todo - "?????"); +static const u8 sRibbonSweetDesc[] = _( + "A ribbon-shaped\n" + "sweet loved by\n" + "Milcery."); static const u8 sEverstoneDesc[] = _( "A wondrous hold\n" @@ -1280,11 +1514,15 @@ static const u8 sFairyMemoryDesc[] = _( "type data. It swaps\n" "Silvally's type."); -static const u8 sRustedSwordDesc[] = _( // Todo - "?????"); +static const u8 sRustedSwordDesc[] = _( + "A rusty sword. A\n" + "hero used it to\n" + "halt a disaster."); -static const u8 sRustedShieldDesc[] = _( // Todo - "?????"); +static const u8 sRustedShieldDesc[] = _( + "A rusty shield. A\n" + "hero used it to\n" + "halt a disaster."); // Colored Orbs static const u8 sRedOrbDesc[] = _( @@ -1297,9 +1535,6 @@ static const u8 sBlueOrbDesc[] = _( "said to contain an\n" "ancient power."); -static const u8 sJadeOrbDesc[] = _( // Todo - "?????"); - // Mega Stones static const u8 sVenusauriteDesc[] = _( "This stone enables\n" @@ -1835,9 +2070,15 @@ static const u8 sDeepSeaToothDesc[] = _( "of Clamperl."); static const u8 sSoulDewDesc[] = _( +#if defined(BATTLE_ENGINE) && B_SOUL_DEW_BOOST >= GEN_7 + "Powers up Latios' &\n" + "Latias' Psychic and\n" + "Dragon-type moves."); +#else "Hold item: raises\n" "Sp. Atk & Sp. Def of\n" "Latios & Latias."); +#endif static const u8 sAdamantOrbDesc[] = _( "Boosts the power of\n" @@ -2391,23 +2632,35 @@ static const u8 sProtectivePadsDesc[] = _( "from contact move\n" "effects."); -static const u8 sThroatSprayDesc[] = _( // Todo - "?????"); +static const u8 sThroatSprayDesc[] = _( + "Raises Sp. Atk. if\n" + "a Pokémon is hit by\n" + "a sound-based move."); -static const u8 sEjectPackDesc[] = _( // Todo - "?????"); +static const u8 sEjectPackDesc[] = _( + "Forces the user to\n" + "switch if its stats\n" + "are lowered."); -static const u8 sHeavyDutyBootsDesc[] = _( // Todo - "?????"); +static const u8 sHeavyDutyBootsDesc[] = _( + "Boots that prevent\n" + "effects of traps\n" + "set in the field."); -static const u8 sBlunderPolicyDesc[] = _( // Todo - "?????"); +static const u8 sBlunderPolicyDesc[] = _( + "Raises Speed if\n" + "the user misses\n" + "due to Accuracy."); -static const u8 sRoomServiceDesc[] = _( // Todo - "?????"); +static const u8 sRoomServiceDesc[] = _( + "Lowers Speed if\n" + "Trick Room is\n" + "active."); -static const u8 sUtilityUmbrellaDesc[] = _( // Todo - "?????"); +static const u8 sUtilityUmbrellaDesc[] = _( + "An umbrella that\n" + "protects from\n" + "weather effects."); // Berries static const u8 sCheriBerryDesc[] = _( @@ -2456,9 +2709,15 @@ static const u8 sLumBerryDesc[] = _( "problem in battle."); static const u8 sSitrusBerryDesc[] = _( +#if I_SITRUS_BERRY_HEAL >= GEN_4 + "A hold item that\n" + "restores the user's\n" + "HP a little."); +#else "A hold item that\n" "restores 30 HP in\n" "battle."); +#endif static const u8 sFigyBerryDesc[] = _( "A hold item that\n" @@ -2710,8 +2969,10 @@ static const u8 sStarfBerryDesc[] = _( "sharply boosts a\n" "stat in a pinch."); -static const u8 sEnigmaBerryDesc[] = _( // Todo - "?????"); +static const u8 sEnigmaBerryDesc[] = _( + "A hold item that\n" + "heals from super\n" + "effective moves."); static const u8 sMicleBerryDesc[] = _( "When held, it ups\n" @@ -3196,50 +3457,67 @@ static const u8 sOvalCharmDesc[] = _( "at the daycare."); static const u8 sShinyCharmDesc[] = _( - "A charm that will\n" + "A charm that will\n" "raise the chance\n" "of Shiny Pokémon."); -static const u8 sCatchingCharmDesc[] = _( // Todo - "?????"); +static const u8 sCatchingCharmDesc[] = _( + "A charm that raises\n" + "the chance of\n" + "Critical Captures."); -static const u8 sExpCharmDesc[] = _( // Todo - "?????"); +static const u8 sExpCharmDesc[] = _( + "A charm that raises\n" + "the amount of Exp.\n" + "earned in battle."); // Form-changing Key Items -static const u8 sRotomCatalogDesc[] = _( // Todo - "?????"); +static const u8 sRotomCatalogDesc[] = _( + "A catalog full of\n" + "deviced liked by\n" + "Rotom."); static const u8 sGracideaDesc[] = _( "Bouquets made with\n" "it are offered as a\n" "token of gratitude."); -static const u8 sRevealGlassDesc[] = _( // Todo - "?????"); +static const u8 sRevealGlassDesc[] = _( + "This glass returns\n" + "a Pokémon back to\n" + "its original form."); -static const u8 sDNASplicersDesc[] = _( // Todo - "?????"); +static const u8 sDNASplicersDesc[] = _( + "Splicer that fuses\n" + "Kyurem and a\n" + "certain Pokémon."); -static const u8 sZygardeCubeDesc[] = _( // Todo - "?????"); +static const u8 sZygardeCubeDesc[] = _( + "An item to store\n" + "Zygarde Cores and\n" + "Cells."); -static const u8 sPrisonBottleDesc[] = _( // Todo - "?????"); +static const u8 sPrisonBottleDesc[] = _( + "A bottle used to\n" + "seal a certain\n" + "Pokémon long ago."); -static const u8 sNSolarizerDesc[] = _( // Todo - "?????"); +static const u8 sNSolarizerDesc[] = _( + "A device to fuse\n" + "and split Necrozma\n" + "using a Solgaleo."); -static const u8 sNLunarizerDesc[] = _( // Todo - "?????"); +static const u8 sNLunarizerDesc[] = _( + "A device to fuse\n" + "and split Necrozma\n" + "using a Lunala."); -static const u8 sReinsOfUnityDesc[] = _( // Todo - "?????"); +static const u8 sReinsOfUnityDesc[] = _( + "Reins that unite\n" + "Calyrex with its\n" + "beloved steed."); // Battle Mechanic Key Items -static const u8 sKeyStoneDesc[] = _( // Todo - "?????"); - static const u8 sMegaRingDesc[] = _( "Enables {PKMN} holding\n" "their Mega Stone to\n" @@ -3250,8 +3528,10 @@ static const u8 sZPowerRingDesc[] = _( "that enables\n" "Z-Move usage."); -static const u8 sDynamaxBandDesc[] = _( // Todo - "?????"); +static const u8 sDynamaxBandDesc[] = _( + "A band carrying a\n" + "Wishing Star that\n" + "allows Dynamaxing."); // Misc. Key Items static const u8 sBicycleDesc[] = _( @@ -3309,8 +3589,10 @@ static const u8 sBerryPouchDesc[] = _( "container that\n" "holds Berries."); -static const u8 sPokemonBoxLinkDesc[] = _( // Todo - "?????"); +static const u8 sPokemonBoxLinkDesc[] = _( + "This device grants\n" + "access to the {PKMN}\n" + "Storage System."); static const u8 sCoinCaseDesc[] = _( "A case that holds\n" @@ -3326,8 +3608,10 @@ static const u8 sWailmerPailDesc[] = _( "watering Berries\n" "and plants."); -static const u8 sPokeRadarDesc[] = _( // Todo - "?????"); +static const u8 sPokeRadarDesc[] = _( + "A tool used to\n" + "search out Pokémon\n" + "hiding in grass."); static const u8 sPokeblockCaseDesc[] = _( "A case for holding\n" diff --git a/src/daycare.c b/src/daycare.c index 4455b5d96b..2a1c2201f5 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -759,8 +759,8 @@ static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE) *species = SPECIES_CHANSEY; #endif - #ifdef SPECIES_MIMEJR - else if (*species == SPECIES_MIMEJR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) + #ifdef SPECIES_MIME_JR + else if (*species == SPECIES_MIME_JR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) *species = SPECIES_MR_MIME; #endif #ifdef SPECIES_CHINGLING diff --git a/src/item.c b/src/item.c index 0a65540af5..c9f8de2b55 100644 --- a/src/item.c +++ b/src/item.c @@ -948,25 +948,6 @@ u8 ItemId_GetSecondaryId(u16 itemId) return gItems[SanitizeItemId(itemId)].secondaryId; } -bool32 IsPinchBerryItemEffect(u16 holdEffect) -{ - switch (holdEffect) - { - case HOLD_EFFECT_ATTACK_UP: - case HOLD_EFFECT_DEFENSE_UP: - case HOLD_EFFECT_SPEED_UP: - case HOLD_EFFECT_SP_ATTACK_UP: - case HOLD_EFFECT_SP_DEFENSE_UP: - case HOLD_EFFECT_CRITICAL_UP: - case HOLD_EFFECT_RANDOM_STAT_UP: - case HOLD_EFFECT_CUSTAP_BERRY: - case HOLD_EFFECT_MICLE_BERRY: - return TRUE; - } - - return FALSE; -} - u8 ItemId_GetFlingPower(u16 itemId) { return gItems[SanitizeItemId(itemId)].flingPower; diff --git a/src/party_menu.c b/src/party_menu.c index 9cc6541aca..23d7389d26 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1961,9 +1961,7 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor) if (item >= ITEM_TM01) { - if (item > ITEM_TM50 && item < ITEM_HM01) - return CANNOT_LEARN_MOVE; - else if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? 50 : 0))) + if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? NUM_TECHNICAL_MACHINES : 0))) return CANNOT_LEARN_MOVE; else move = ItemIdToBattleMoveId(item);