diff --git a/graphics/items/icon_palettes/ability_patch.pal b/graphics/items/icon_palettes/ability_patch.pal new file mode 100644 index 000000000..425bc2770 --- /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 000000000..72ef8b7a9 --- /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 000000000..e2b7be97a --- /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 000000000..7802b4b8d --- /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 000000000..3b2f14901 --- /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 000000000..534953189 --- /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 000000000..6eb4f9b5b --- /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 000000000..9e29d88f5 --- /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 000000000..f116faf59 --- /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 000000000..412b2967b --- /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 000000000..438dff044 --- /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 000000000..0f0db7606 --- /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 000000000..31392277f --- /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 000000000..fcd9d2804 --- /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 000000000..97d72c330 --- /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 000000000..3a6253c2d --- /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 000000000..ca35dc19e --- /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 000000000..743ea9e6d --- /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 000000000..6bf3b35bc --- /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 000000000..36657d864 --- /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 000000000..7e669d6f4 --- /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 000000000..f12330d36 --- /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 000000000..983cbf3f1 --- /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 000000000..8472a0373 --- /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 000000000..464586af9 --- /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 000000000..1c1eb5b53 --- /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 000000000..d36dcaf06 --- /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 000000000..6f003b1f8 --- /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 000000000..2420b2d4c --- /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 000000000..775007447 --- /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 000000000..fe469885c --- /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 000000000..f00cd9306 --- /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 000000000..8ec7b2d4a --- /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 000000000..623374444 --- /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 000000000..3d1bbddb9 --- /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 000000000..61fd69666 --- /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 000000000..a00aa2de9 --- /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 000000000..512c889b0 --- /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 000000000..2ab68a6b0 --- /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 000000000..e0847c632 --- /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 000000000..fd954d572 --- /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 000000000..143b1f12d --- /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 000000000..a45829d72 --- /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 000000000..a8c12d975 --- /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 000000000..b7e5ef7b4 --- /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 000000000..b754262ce --- /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 000000000..282a5cff3 --- /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 000000000..64cc312e0 --- /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 000000000..0b64b89ff --- /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 000000000..4ee38edd3 --- /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 000000000..39367b6da --- /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 000000000..1ea827fa3 --- /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 000000000..9845ade30 --- /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 000000000..985c80da6 --- /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 000000000..db15bad4f --- /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 000000000..423943fac --- /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 000000000..8b7c45fd8 --- /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 000000000..2666ec5b8 --- /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 000000000..80a16b120 --- /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 000000000..b095aa950 --- /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 000000000..b7cbcf3f4 --- /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 000000000..faea05e40 --- /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 000000000..95616b559 --- /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 000000000..53345c1a7 --- /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 000000000..02313fedc --- /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 000000000..7d8f33d7c --- /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 000000000..ae6f368a8 --- /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 000000000..a0a98aabc --- /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 000000000..e94061aa9 --- /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 000000000..16a1ddadb --- /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 000000000..90dd56390 --- /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 000000000..8064ffc4e --- /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 000000000..a4c6db4eb --- /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 000000000..90465ef51 --- /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 000000000..92c8604ed --- /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 000000000..2b78e5440 --- /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 000000000..287da7537 --- /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 000000000..898b8b36a --- /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 000000000..c4692d9a3 --- /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 000000000..2c3b5951a --- /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 000000000..3358a67c8 --- /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 000000000..acbef7462 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 000000000..c08372afc 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 000000000..ba4373faa 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 000000000..0c0f11dab 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 000000000..3b30d2a7d 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 000000000..5004ecbcf 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 000000000..b3f52c422 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 000000000..47691d623 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 000000000..fbdf64be3 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 000000000..c77c8b90b 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 000000000..7b9e7f463 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 000000000..7d6788b61 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 000000000..ffe570ad5 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 000000000..9fc055de3 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 000000000..726fd069b 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 000000000..8c3c3edf1 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 000000000..3599f6a47 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 000000000..54a590ed9 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 000000000..e63abfeaf 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 000000000..74cd8a084 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 000000000..ae37524f8 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 000000000..abc1541ed 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 000000000..6faac9fc0 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 000000000..2b014c25e 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 000000000..97f6c4e44 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 000000000..725b5f891 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 000000000..61b1907fd 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 000000000..63adc30d8 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 000000000..c2de7c009 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 000000000..a99bedc6e 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 000000000..28fabf7be 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 000000000..21c094d65 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 000000000..a42596c45 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 000000000..cc8468834 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 000000000..efb07d80e 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 000000000..d2dba09da 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 000000000..fd3868ad5 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 000000000..8cc742d63 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 000000000..aed9cc0d8 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 000000000..a5ebac835 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 000000000..ea253ccac 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 000000000..d879eab8b 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 000000000..6e470a108 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 000000000..3218fd20e 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 000000000..a61a9aa66 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 000000000..d88acd95e 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 000000000..f0de8796a 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 000000000..be6091d3f 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 000000000..8022e833a 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 000000000..3c20e771a 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 000000000..feb5b82cc 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 000000000..123cda9b9 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 000000000..902e04f7c 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 000000000..b94e3eaa6 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 000000000..7511a2e08 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 000000000..927aa4b8b 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 000000000..aa8698c1a 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 000000000..dbb6b856c 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 000000000..19711ae8c 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 000000000..e776b4e8a 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 000000000..ceea8e968 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 000000000..a7d3de46d 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 000000000..a05bac98b 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 000000000..88982fb47 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 000000000..be4369d07 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 000000000..23bffe9cf 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 000000000..5cbc6e164 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 000000000..40f6c7700 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 000000000..35e47e076 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 000000000..b26b595da 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 000000000..2d75c4aad 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 000000000..a7dbb4e04 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 000000000..324a0a646 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 000000000..addf901e1 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 000000000..b577dcecd Binary files /dev/null and b/graphics/items/icons/zygarde_cube.png differ diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index d15e50d5f..e0361795d 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -100,7 +100,7 @@ #define HOLD_EFFECT_ADAMANT_ORB 94 #define HOLD_EFFECT_LUSTROUS_ORB 95 #define HOLD_EFFECT_GRISEOUS_ORB 96 -#define HOLD_EFFECT_GRACIDEA 97 +#define HOLD_EFFECT_ENIGMA_BERRY 97 #define HOLD_EFFECT_RESIST_BERRY 98 #define HOLD_EFFECT_POWER_ITEM 99 #define HOLD_EFFECT_RESTORE_PCT_HP 100 diff --git a/include/graphics.h b/include/graphics.h index 2328535c2..24b86c705 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3491,23 +3491,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 @@ -3539,66 +3539,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[]; @@ -3612,12 +3573,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 @@ -3636,34 +3595,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[]; @@ -3682,24 +3640,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[]; @@ -3721,31 +3672,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[]; @@ -3761,14 +3706,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[]; @@ -3815,18 +3760,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[]; @@ -3849,20 +3791,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 @@ -3953,17 +3895,16 @@ 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[]; +extern const u32 gItemIcon_JadeOrb[]; +extern const u32 gItemIconPalette_JadeOrb[]; // Mega Stones extern const u32 gItemIcon_Venusaurite[]; extern const u32 gItemIconPalette_Venusaurite[]; @@ -4403,18 +4344,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[]; @@ -4536,8 +4477,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[]; @@ -4550,8 +4491,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[]; @@ -4578,38 +4517,37 @@ 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_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[]; // Misc. Key Items extern const u32 gItemIcon_Bicycle[]; extern const u32 gItemIconPalette_Bicycle[]; @@ -4633,16 +4571,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/data/graphics/items.h b/src/data/graphics/items.h index ccb874cbb..7924e5da3 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,8 +791,8 @@ 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"); +const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/jade_orb.4bpp.lz"); +const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/jade_orb.gbapal.lz"); // Mega Stones @@ -1562,23 +1463,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 +1663,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 +1684,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 +1734,55 @@ 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_KeyStone[] = INCBIN_U32("graphics/items/icons/key_stone.4bpp.lz"); +const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/key_stone.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_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_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_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_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_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 +1819,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 +1831,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 eb6c6142b..a6dfbd9a9 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,12 @@ 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 + [ITEM_JADE_ORB] = {gItemIcon_JadeOrb, gItemIconPalette_JadeOrb}, // Mega Stones [ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite}, [ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX}, @@ -547,12 +547,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 +614,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 +673,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 +734,23 @@ 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_KEY_STONE] = {gItemIcon_KeyStone, gItemIconPalette_KeyStone}, + [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 +763,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 8d458c078..643646555 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -744,39 +744,45 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, }, - [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, }, // 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, }, - [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, }, [ITEM_LAVA_COOKIE] = @@ -805,37 +811,43 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, }, - [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, }, - [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, }, - [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, }, [ITEM_BIG_MALASADA] = @@ -1023,248 +1035,249 @@ 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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, // Candy @@ -1280,70 +1293,70 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, // Medicinal Flutes @@ -1451,37 +1464,43 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_Repel, }, - [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, }, - [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, }, - [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, }, [ITEM_ESCAPE_ROPE] = @@ -1633,47 +1652,51 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, }, - [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, }, - [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 }, // 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, }, - [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, @@ -1690,12 +1713,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, @@ -1723,12 +1746,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, @@ -1756,12 +1779,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, @@ -1789,12 +1812,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, @@ -1921,89 +1944,89 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, @@ -2162,45 +2185,45 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, }, - [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, }, - [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, }, - [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, @@ -2208,92 +2231,92 @@ const struct Item gItems[] = // 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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, - [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 }, // Apricorns @@ -2375,45 +2398,45 @@ 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, // Todo + }, + + [ITEM_GALARICA_TWIG] = + { + .name = _("GalaricaTwig"), + .itemId = ITEM_GALARICA_TWIG, + .price = 40, + .description = sGalaricaTwigDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_GALARICA_TWIG] = // 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, }, - [ITEM_ARMORITE_ORE] = // Todo + [ITEM_DYNITE_ORE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_DYNITE_ORE] = // Todo - { - .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, @@ -2677,70 +2700,70 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, [ITEM_DRAGON_SCALE] = @@ -2867,78 +2890,78 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, @@ -3564,23 +3587,23 @@ const struct Item gItems[] = .secondaryId = TYPE_FAIRY, }, - [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,13 +3635,15 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_JADE_ORB] = // Todo + [ITEM_JADE_ORB] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Jade Orb"), + .itemId = ITEM_JADE_ORB, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sJadeOrbDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, @@ -6385,67 +6410,73 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, }, - [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, @@ -7211,13 +7242,14 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [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, }, @@ -8534,39 +8566,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] = @@ -8574,7 +8609,6 @@ const struct Item gItems[] = .name = _("Gracidea"), .itemId = ITEM_GRACIDEA, .price = 0, - .holdEffect = HOLD_EFFECT_GRACIDEA, .description = sGracideaDesc, .pocket = POCKET_KEY_ITEMS, #ifdef POKEMON_EXPANSION @@ -8587,99 +8621,136 @@ 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_KEY_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Key Stone"), + .itemId = ITEM_KEY_STONE, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sKeyStoneDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_MEGA_RING] = // Todo (Replaces ITEM_MEGA_BRACELET) + [ITEM_MEGA_RING] = { - .name = _("Mega Bracelet"), + .name = _("Mega Ring"), .itemId = ITEM_MEGA_RING, .price = 0, .importance = 1, @@ -8689,26 +8760,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, }, @@ -8863,15 +8933,17 @@ 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, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_COIN_CASE] = @@ -8911,15 +8983,17 @@ 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, + .unk19 = 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 5050367cf..ff621356e 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 8247b4e9d..e480658ec 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -302,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" @@ -321,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" @@ -411,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[] = _( @@ -484,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[] = _( @@ -544,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" @@ -646,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" @@ -677,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" @@ -690,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" @@ -703,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" @@ -761,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[] = _( @@ -841,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" @@ -913,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[] = _( @@ -1037,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" @@ -1109,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" @@ -1349,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[] = _( @@ -1366,8 +1535,10 @@ static const u8 sBlueOrbDesc[] = _( "said to contain an\n" "ancient power."); -static const u8 sJadeOrbDesc[] = _( // Todo - "?????"); +static const u8 sJadeOrbDesc[] = _( + "A green, shiny orb\n" + "said to have a leg-\n" + "end tied to it."); // Mega Stones static const u8 sVenusauriteDesc[] = _( @@ -2466,23 +2637,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[] = _( @@ -2791,8 +2974,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" @@ -3277,49 +3462,71 @@ 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 sKeyStoneDesc[] = _( + "A stone of untold\n" + "power that allows\n" + "Mega Evolution."); static const u8 sMegaRingDesc[] = _( "Enables {PKMN} holding\n" @@ -3331,8 +3538,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[] = _( @@ -3390,8 +3599,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" @@ -3407,8 +3618,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"