summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/graphics/berries/graphics.inc172
-rw-r--r--graphics/berries/aguav.png (renamed from graphics/berries/aguav/pic.png)bin380 -> 380 bytes
-rw-r--r--graphics/berries/aguav/palette.pal19
-rw-r--r--graphics/berries/apicot.png (renamed from graphics/berries/apicot/pic.png)bin397 -> 397 bytes
-rw-r--r--graphics/berries/apicot/palette.pal19
-rw-r--r--graphics/berries/aspear.png (renamed from graphics/berries/aspear/pic.png)bin422 -> 422 bytes
-rw-r--r--graphics/berries/aspear/palette.pal19
-rw-r--r--graphics/berries/belue.png (renamed from graphics/berries/belue/pic.png)bin644 -> 644 bytes
-rw-r--r--graphics/berries/belue/palette.pal19
-rw-r--r--graphics/berries/bluk.png (renamed from graphics/berries/bluk/pic.png)bin444 -> 444 bytes
-rw-r--r--graphics/berries/bluk/palette.pal19
-rw-r--r--graphics/berries/cheri.png (renamed from graphics/berries/cheri/pic.png)bin355 -> 355 bytes
-rw-r--r--graphics/berries/cheri/palette.pal19
-rw-r--r--graphics/berries/chesto.png (renamed from graphics/berries/chesto/pic.png)bin458 -> 458 bytes
-rw-r--r--graphics/berries/chesto/palette.pal19
-rw-r--r--graphics/berries/cornn.png (renamed from graphics/berries/cornn/pic.png)bin485 -> 485 bytes
-rw-r--r--graphics/berries/cornn/palette.pal19
-rw-r--r--graphics/berries/durin.png (renamed from graphics/berries/durin/pic.png)bin801 -> 801 bytes
-rw-r--r--graphics/berries/durin/palette.pal19
-rw-r--r--graphics/berries/enigma.png (renamed from graphics/berries/enigma/pic.png)bin497 -> 497 bytes
-rw-r--r--graphics/berries/enigma/palette.pal19
-rw-r--r--graphics/berries/figy.png (renamed from graphics/berries/figy/pic.png)bin418 -> 418 bytes
-rw-r--r--graphics/berries/figy/palette.pal19
-rw-r--r--graphics/berries/ganlon.png (renamed from graphics/berries/ganlon/pic.png)bin387 -> 387 bytes
-rw-r--r--graphics/berries/ganlon/palette.pal19
-rw-r--r--graphics/berries/grepa.png (renamed from graphics/berries/grepa/pic.png)bin397 -> 397 bytes
-rw-r--r--graphics/berries/grepa/palette.pal19
-rw-r--r--graphics/berries/hondew.png (renamed from graphics/berries/hondew/pic.png)bin534 -> 534 bytes
-rw-r--r--graphics/berries/hondew/palette.pal19
-rw-r--r--graphics/berries/iapapa.png (renamed from graphics/berries/iapapa/pic.png)bin624 -> 624 bytes
-rw-r--r--graphics/berries/iapapa/palette.pal19
-rw-r--r--graphics/berries/kelpsy.png (renamed from graphics/berries/kelpsy/pic.png)bin412 -> 412 bytes
-rw-r--r--graphics/berries/kelpsy/palette.pal19
-rw-r--r--graphics/berries/lansat.png (renamed from graphics/berries/lansat/pic.png)bin474 -> 474 bytes
-rw-r--r--graphics/berries/lansat/palette.pal19
-rw-r--r--graphics/berries/leppa.png (renamed from graphics/berries/leppa/pic.png)bin369 -> 369 bytes
-rw-r--r--graphics/berries/leppa/palette.pal19
-rw-r--r--graphics/berries/liechi.png (renamed from graphics/berries/liechi/pic.png)bin561 -> 561 bytes
-rw-r--r--graphics/berries/liechi/palette.pal19
-rw-r--r--graphics/berries/lum.png (renamed from graphics/berries/lum/pic.png)bin289 -> 289 bytes
-rw-r--r--graphics/berries/lum/palette.pal19
-rw-r--r--graphics/berries/mago.png (renamed from graphics/berries/mago/pic.png)bin409 -> 409 bytes
-rw-r--r--graphics/berries/mago/palette.pal19
-rw-r--r--graphics/berries/magost.png (renamed from graphics/berries/magost/pic.png)bin392 -> 392 bytes
-rw-r--r--graphics/berries/magost/palette.pal19
-rw-r--r--graphics/berries/nanab.png (renamed from graphics/berries/nanab/pic.png)bin363 -> 363 bytes
-rw-r--r--graphics/berries/nanab/palette.pal19
-rw-r--r--graphics/berries/nomel.png (renamed from graphics/berries/nomel/pic.png)bin430 -> 430 bytes
-rw-r--r--graphics/berries/nomel/palette.pal19
-rw-r--r--graphics/berries/oran.png (renamed from graphics/berries/oran/pic.png)bin340 -> 340 bytes
-rw-r--r--graphics/berries/oran/palette.pal19
-rw-r--r--graphics/berries/pamtre.png (renamed from graphics/berries/pamtre/pic.png)bin539 -> 539 bytes
-rw-r--r--graphics/berries/pamtre/palette.pal19
-rw-r--r--graphics/berries/pecha.png (renamed from graphics/berries/pecha/pic.png)bin363 -> 363 bytes
-rw-r--r--graphics/berries/pecha/palette.pal19
-rw-r--r--graphics/berries/persim.png (renamed from graphics/berries/persim/pic.png)bin330 -> 330 bytes
-rw-r--r--graphics/berries/persim/palette.pal19
-rw-r--r--graphics/berries/petaya.png (renamed from graphics/berries/petaya/pic.png)bin639 -> 639 bytes
-rw-r--r--graphics/berries/petaya/palette.pal19
-rw-r--r--graphics/berries/pinap.png (renamed from graphics/berries/pinap/pic.png)bin491 -> 491 bytes
-rw-r--r--graphics/berries/pinap/palette.pal19
-rw-r--r--graphics/berries/pomeg.png (renamed from graphics/berries/pomeg/pic.png)bin406 -> 406 bytes
-rw-r--r--graphics/berries/pomeg/palette.pal19
-rw-r--r--graphics/berries/qualot.png (renamed from graphics/berries/qualot/pic.png)bin422 -> 422 bytes
-rw-r--r--graphics/berries/qualot/palette.pal19
-rw-r--r--graphics/berries/rabuta.png (renamed from graphics/berries/rabuta/pic.png)bin710 -> 710 bytes
-rw-r--r--graphics/berries/rabuta/palette.pal19
-rw-r--r--graphics/berries/rawst.png (renamed from graphics/berries/rawst/pic.png)bin414 -> 414 bytes
-rw-r--r--graphics/berries/rawst/palette.pal19
-rw-r--r--graphics/berries/razz.png (renamed from graphics/berries/razz/pic.png)bin520 -> 520 bytes
-rw-r--r--graphics/berries/razz/palette.pal19
-rw-r--r--graphics/berries/salac.png (renamed from graphics/berries/salac/pic.png)bin519 -> 519 bytes
-rw-r--r--graphics/berries/salac/palette.pal19
-rw-r--r--graphics/berries/sitrus.png (renamed from graphics/berries/sitrus/pic.png)bin404 -> 404 bytes
-rw-r--r--graphics/berries/sitrus/palette.pal19
-rw-r--r--graphics/berries/spelon.png (renamed from graphics/berries/spelon/pic.png)bin467 -> 467 bytes
-rw-r--r--graphics/berries/spelon/palette.pal19
-rw-r--r--graphics/berries/starf.png (renamed from graphics/berries/starf/pic.png)bin440 -> 440 bytes
-rw-r--r--graphics/berries/starf/palette.pal19
-rw-r--r--graphics/berries/tamato.png (renamed from graphics/berries/tamato/pic.png)bin642 -> 642 bytes
-rw-r--r--graphics/berries/tamato/palette.pal19
-rw-r--r--graphics/berries/watmel.png (renamed from graphics/berries/watmel/pic.png)bin636 -> 636 bytes
-rw-r--r--graphics/berries/watmel/palette.pal19
-rw-r--r--graphics/berries/wepear.png (renamed from graphics/berries/wepear/pic.png)bin400 -> 400 bytes
-rw-r--r--graphics/berries/wepear/palette.pal19
-rw-r--r--graphics/berries/wiki.png (renamed from graphics/berries/wiki/pic.png)bin429 -> 429 bytes
-rw-r--r--graphics/berries/wiki/palette.pal19
87 files changed, 86 insertions, 903 deletions
diff --git a/data/graphics/berries/graphics.inc b/data/graphics/berries/graphics.inc
index 19207ee32..e8edf9a3b 100644
--- a/data/graphics/berries/graphics.inc
+++ b/data/graphics/berries/graphics.inc
@@ -1,343 +1,343 @@
.align 2
gBerryPic_Cheri:: @ 8E78D00
- .incbin "graphics/berries/cheri/pic.4bpp.lz"
+ .incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8E78E54
- .incbin "graphics/berries/oran/pic.4bpp.lz"
+ .incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8E78FC8
- .incbin "graphics/berries/pecha/pic.4bpp.lz"
+ .incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8E7913C
- .incbin "graphics/berries/rawst/pic.4bpp.lz"
+ .incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8E792D4
- .incbin "graphics/berries/aspear/pic.4bpp.lz"
+ .incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8E7947C
- .incbin "graphics/berries/leppa/pic.4bpp.lz"
+ .incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8E795EC
- .incbin "graphics/berries/chesto/pic.4bpp.lz"
+ .incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8E797D0
- .incbin "graphics/berries/persim/pic.4bpp.lz"
+ .incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8E79920
- .incbin "graphics/berries/lum/pic.4bpp.lz"
+ .incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8E79A3C
- .incbin "graphics/berries/sitrus/pic.4bpp.lz"
+ .incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8E79BE0
- .incbin "graphics/berries/figy/pic.4bpp.lz"
+ .incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8E79D8C
- .incbin "graphics/berries/wiki/pic.4bpp.lz"
+ .incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8E79F80
- .incbin "graphics/berries/mago/pic.4bpp.lz"
+ .incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8E7A134
- .incbin "graphics/berries/aguav/pic.4bpp.lz"
+ .incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8E7A2A8
- .incbin "graphics/berries/iapapa/pic.4bpp.lz"
+ .incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8E7A560
- .incbin "graphics/berries/razz/pic.4bpp.lz"
+ .incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8E7A790
- .incbin "graphics/berries/bluk/pic.4bpp.lz"
+ .incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8E7A978
- .incbin "graphics/berries/nanab/pic.4bpp.lz"
+ .incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8E7AAEC
- .incbin "graphics/berries/wepear/pic.4bpp.lz"
+ .incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8E7ACB4
- .incbin "graphics/berries/pinap/pic.4bpp.lz"
+ .incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8E7AEC8
- .incbin "graphics/berries/pomeg/pic.4bpp.lz"
+ .incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8E7B070
- .incbin "graphics/berries/kelpsy/pic.4bpp.lz"
+ .incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8E7B218
- .incbin "graphics/berries/qualot/pic.4bpp.lz"
+ .incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8E7B3E4
- .incbin "graphics/berries/hondew/pic.4bpp.lz"
+ .incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8E7B63C
- .incbin "graphics/berries/grepa/pic.4bpp.lz"
+ .incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8E7B7CC
- .incbin "graphics/berries/tamato/pic.4bpp.lz"
+ .incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8E7BA90
- .incbin "graphics/berries/cornn/pic.4bpp.lz"
+ .incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8E7BC94
- .incbin "graphics/berries/magost/pic.4bpp.lz"
+ .incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8E7BE38
- .incbin "graphics/berries/rabuta/pic.4bpp.lz"
+ .incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8E7C12C
- .incbin "graphics/berries/nomel/pic.4bpp.lz"
+ .incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8E7C308
- .incbin "graphics/berries/spelon/pic.4bpp.lz"
+ .incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8E7C4F8
- .incbin "graphics/berries/pamtre/pic.4bpp.lz"
+ .incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8E7C748
- .incbin "graphics/berries/watmel/pic.4bpp.lz"
+ .incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8E7CA2C
- .incbin "graphics/berries/durin/pic.4bpp.lz"
+ .incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8E7CDF8
- .incbin "graphics/berries/belue/pic.4bpp.lz"
+ .incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8E7D0D0
- .incbin "graphics/berries/liechi/pic.4bpp.lz"
+ .incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8E7D328
- .incbin "graphics/berries/ganlon/pic.4bpp.lz"
+ .incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8E7D4C0
- .incbin "graphics/berries/salac/pic.4bpp.lz"
+ .incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8E7D704
- .incbin "graphics/berries/petaya/pic.4bpp.lz"
+ .incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8E7D9AC
- .incbin "graphics/berries/apicot/pic.4bpp.lz"
+ .incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8E7DB3C
- .incbin "graphics/berries/lansat/pic.4bpp.lz"
+ .incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8E7DD30
- .incbin "graphics/berries/starf/pic.4bpp.lz"
+ .incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8E7DF00
- .incbin "graphics/berries/enigma/pic.4bpp.lz"
+ .incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8E7E118
- .incbin "graphics/berries/cheri/palette.gbapal.lz"
+ .incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8E7E140
- .incbin "graphics/berries/oran/palette.gbapal.lz"
+ .incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8E7E168
- .incbin "graphics/berries/pecha/palette.gbapal.lz"
+ .incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8E7E190
- .incbin "graphics/berries/rawst/palette.gbapal.lz"
+ .incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8E7E1B8
- .incbin "graphics/berries/aspear/palette.gbapal.lz"
+ .incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8E7E1E0
- .incbin "graphics/berries/leppa/palette.gbapal.lz"
+ .incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8E7E208
- .incbin "graphics/berries/chesto/palette.gbapal.lz"
+ .incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8E7E230
- .incbin "graphics/berries/persim/palette.gbapal.lz"
+ .incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8E7E258
- .incbin "graphics/berries/lum/palette.gbapal.lz"
+ .incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8E7E280
- .incbin "graphics/berries/sitrus/palette.gbapal.lz"
+ .incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8E7E2A8
- .incbin "graphics/berries/figy/palette.gbapal.lz"
+ .incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8E7E2D0
- .incbin "graphics/berries/wiki/palette.gbapal.lz"
+ .incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8E7E2F8
- .incbin "graphics/berries/mago/palette.gbapal.lz"
+ .incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8E7E320
- .incbin "graphics/berries/aguav/palette.gbapal.lz"
+ .incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8E7E348
- .incbin "graphics/berries/iapapa/palette.gbapal.lz"
+ .incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8E7E370
- .incbin "graphics/berries/razz/palette.gbapal.lz"
+ .incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8E7E398
- .incbin "graphics/berries/bluk/palette.gbapal.lz"
+ .incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8E7E3C0
- .incbin "graphics/berries/nanab/palette.gbapal.lz"
+ .incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8E7E3E8
- .incbin "graphics/berries/wepear/palette.gbapal.lz"
+ .incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8E7E410
- .incbin "graphics/berries/pinap/palette.gbapal.lz"
+ .incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8E7E438
- .incbin "graphics/berries/pomeg/palette.gbapal.lz"
+ .incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8E7E460
- .incbin "graphics/berries/kelpsy/palette.gbapal.lz"
+ .incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8E7E488
- .incbin "graphics/berries/qualot/palette.gbapal.lz"
+ .incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8E7E4B0
- .incbin "graphics/berries/hondew/palette.gbapal.lz"
+ .incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8E7E4D8
- .incbin "graphics/berries/grepa/palette.gbapal.lz"
+ .incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8E7E500
- .incbin "graphics/berries/tamato/palette.gbapal.lz"
+ .incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8E7E528
- .incbin "graphics/berries/cornn/palette.gbapal.lz"
+ .incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8E7E550
- .incbin "graphics/berries/magost/palette.gbapal.lz"
+ .incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8E7E578
- .incbin "graphics/berries/rabuta/palette.gbapal.lz"
+ .incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8E7E5A0
- .incbin "graphics/berries/nomel/palette.gbapal.lz"
+ .incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8E7E5C8
- .incbin "graphics/berries/spelon/palette.gbapal.lz"
+ .incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8E7E5F0
- .incbin "graphics/berries/pamtre/palette.gbapal.lz"
+ .incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8E7E618
- .incbin "graphics/berries/watmel/palette.gbapal.lz"
+ .incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8E7E640
- .incbin "graphics/berries/durin/palette.gbapal.lz"
+ .incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8E7E668
- .incbin "graphics/berries/belue/palette.gbapal.lz"
+ .incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8E7E690
- .incbin "graphics/berries/liechi/palette.gbapal.lz"
+ .incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8E7E6B8
- .incbin "graphics/berries/ganlon/palette.gbapal.lz"
+ .incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8E7E6E0
- .incbin "graphics/berries/salac/palette.gbapal.lz"
+ .incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8E7E708
- .incbin "graphics/berries/petaya/palette.gbapal.lz"
+ .incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8E7E730
- .incbin "graphics/berries/apicot/palette.gbapal.lz"
+ .incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8E7E758
- .incbin "graphics/berries/lansat/palette.gbapal.lz"
+ .incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8E7E780
- .incbin "graphics/berries/starf/palette.gbapal.lz"
+ .incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8E7E7A8
- .incbin "graphics/berries/enigma/palette.gbapal.lz"
+ .incbin "graphics/berries/enigma.gbapal.lz"
diff --git a/graphics/berries/aguav/pic.png b/graphics/berries/aguav.png
index 0661fe8d3..0661fe8d3 100644
--- a/graphics/berries/aguav/pic.png
+++ b/graphics/berries/aguav.png
Binary files differ
diff --git a/graphics/berries/aguav/palette.pal b/graphics/berries/aguav/palette.pal
deleted file mode 100644
index fa20daf24..000000000
--- a/graphics/berries/aguav/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-74 148 41
-57 115 32
-41 82 24
-255 238 189
-222 197 148
-189 164 106
-156 131 74
-197 197 139
-148 172 98
-90 139 82
diff --git a/graphics/berries/apicot/pic.png b/graphics/berries/apicot.png
index b7098fc90..b7098fc90 100644
--- a/graphics/berries/apicot/pic.png
+++ b/graphics/berries/apicot.png
Binary files differ
diff --git a/graphics/berries/apicot/palette.pal b/graphics/berries/apicot/palette.pal
deleted file mode 100644
index 82cb76d5a..000000000
--- a/graphics/berries/apicot/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-238 238 255
-189 205 238
-148 180 230
-106 148 222
-65 123 213
-65 98 148
-222 255 131
-197 230 123
-172 213 115
-148 189 106
-123 172 98
-90 131 82
-57 164 156
-255 230 98
-205 164 98
diff --git a/graphics/berries/aspear/pic.png b/graphics/berries/aspear.png
index b5e2c5061..b5e2c5061 100644
--- a/graphics/berries/aspear/pic.png
+++ b/graphics/berries/aspear.png
Binary files differ
diff --git a/graphics/berries/aspear/palette.pal b/graphics/berries/aspear/palette.pal
deleted file mode 100644
index 52842fd55..000000000
--- a/graphics/berries/aspear/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-246 238 222
-246 238 189
-246 238 156
-246 238 123
-230 213 115
-213 197 106
-197 180 98
-180 156 90
-164 139 82
-148 123 74
-180 189 148
-156 164 131
-131 139 123
-106 123 115
-0 0 0
diff --git a/graphics/berries/belue/pic.png b/graphics/berries/belue.png
index 81ddaa9bb..81ddaa9bb 100644
--- a/graphics/berries/belue/pic.png
+++ b/graphics/berries/belue.png
Binary files differ
diff --git a/graphics/berries/belue/palette.pal b/graphics/berries/belue/palette.pal
deleted file mode 100644
index 0d348b27e..000000000
--- a/graphics/berries/belue/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-164 172 197
-148 148 180
-131 123 172
-123 98 156
-106 74 148
-98 57 139
-82 41 82
-255 213 164
-230 189 148
-205 164 131
-180 139 123
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/bluk/pic.png b/graphics/berries/bluk.png
index fc7e6c128..fc7e6c128 100644
--- a/graphics/berries/bluk/pic.png
+++ b/graphics/berries/bluk.png
Binary files differ
diff --git a/graphics/berries/bluk/palette.pal b/graphics/berries/bluk/palette.pal
deleted file mode 100644
index 88586d6b5..000000000
--- a/graphics/berries/bluk/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-189 205 213
-164 156 197
-139 115 180
-115 74 172
-98 57 139
-90 49 106
-82 41 82
-180 139 123
-148 106 82
-115 74 41
-0 0 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/cheri/pic.png b/graphics/berries/cheri.png
index f70a1ad74..f70a1ad74 100644
--- a/graphics/berries/cheri/pic.png
+++ b/graphics/berries/cheri.png
Binary files differ
diff --git a/graphics/berries/cheri/palette.pal b/graphics/berries/cheri/palette.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/cheri/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 49 41
-180 57 32
-148 65 24
-115 82 24
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/chesto/pic.png b/graphics/berries/chesto.png
index db1fe9e73..db1fe9e73 100644
--- a/graphics/berries/chesto/pic.png
+++ b/graphics/berries/chesto.png
Binary files differ
diff --git a/graphics/berries/chesto/palette.pal b/graphics/berries/chesto/palette.pal
deleted file mode 100644
index 3a4e0964f..000000000
--- a/graphics/berries/chesto/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-148 205 255
-123 172 238
-98 148 222
-82 123 213
-65 98 180
-57 74 148
-230 197 164
-213 172 148
-197 156 131
-180 131 115
-164 115 98
-148 98 82
-156 205 115
-74 106 197
-90 139 82
diff --git a/graphics/berries/cornn/pic.png b/graphics/berries/cornn.png
index e124fc599..e124fc599 100644
--- a/graphics/berries/cornn/pic.png
+++ b/graphics/berries/cornn.png
Binary files differ
diff --git a/graphics/berries/cornn/palette.pal b/graphics/berries/cornn/palette.pal
deleted file mode 100644
index 5096389e0..000000000
--- a/graphics/berries/cornn/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-189 205 213
-164 156 197
-139 115 180
-115 74 172
-98 57 139
-90 49 106
-82 41 82
-180 139 123
-180 189 123
-115 74 41
-49 90 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/durin/pic.png b/graphics/berries/durin.png
index 5bbb97e1f..5bbb97e1f 100644
--- a/graphics/berries/durin/pic.png
+++ b/graphics/berries/durin.png
Binary files differ
diff --git a/graphics/berries/durin/palette.pal b/graphics/berries/durin/palette.pal
deleted file mode 100644
index 8b636135d..000000000
--- a/graphics/berries/durin/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 246
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-98 164 57
-98 139 57
-255 246 197
-255 222 148
-139 98 49
-222 172 98
-189 148 98
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/enigma/pic.png b/graphics/berries/enigma.png
index af369550a..af369550a 100644
--- a/graphics/berries/enigma/pic.png
+++ b/graphics/berries/enigma.png
Binary files differ
diff --git a/graphics/berries/enigma/palette.pal b/graphics/berries/enigma/palette.pal
deleted file mode 100644
index 349ecc7f4..000000000
--- a/graphics/berries/enigma/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 246 246
-148 131 123
-115 98 98
-82 74 74
-57 49 49
-24 24 24
-0 0 0
-246 238 222
-222 205 197
-205 180 172
-180 156 156
-164 131 131
-148 106 115
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/figy/pic.png b/graphics/berries/figy.png
index 9ec8425d5..9ec8425d5 100644
--- a/graphics/berries/figy/pic.png
+++ b/graphics/berries/figy.png
Binary files differ
diff --git a/graphics/berries/figy/palette.pal b/graphics/berries/figy/palette.pal
deleted file mode 100644
index e427ea1e9..000000000
--- a/graphics/berries/figy/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 197 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 41 49
-180 41 49
-255 246 205
-230 213 172
-205 189 139
-180 164 115
-123 106 74
-197 123 90
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/ganlon/pic.png b/graphics/berries/ganlon.png
index ec5e38319..ec5e38319 100644
--- a/graphics/berries/ganlon/pic.png
+++ b/graphics/berries/ganlon.png
Binary files differ
diff --git a/graphics/berries/ganlon/palette.pal b/graphics/berries/ganlon/palette.pal
deleted file mode 100644
index 381974125..000000000
--- a/graphics/berries/ganlon/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-222 255 255
-189 230 255
-164 197 238
-139 172 222
-115 148 213
-90 123 197
-65 98 189
-65 65 123
-246 238 164
-222 205 139
-205 180 123
-180 156 106
-164 131 90
-123 172 98
-90 139 82
diff --git a/graphics/berries/grepa/pic.png b/graphics/berries/grepa.png
index 136a86df2..136a86df2 100644
--- a/graphics/berries/grepa/pic.png
+++ b/graphics/berries/grepa.png
Binary files differ
diff --git a/graphics/berries/grepa/palette.pal b/graphics/berries/grepa/palette.pal
deleted file mode 100644
index 42ff8830f..000000000
--- a/graphics/berries/grepa/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-246 238 222
-246 230 180
-246 230 148
-246 222 106
-255 222 74
-222 197 65
-197 172 65
-172 148 65
-148 123 65
-123 98 65
-172 255 74
-131 213 65
-90 180 65
-49 148 65
-238 205 65
diff --git a/graphics/berries/hondew/pic.png b/graphics/berries/hondew.png
index ab1add813..ab1add813 100644
--- a/graphics/berries/hondew/pic.png
+++ b/graphics/berries/hondew.png
Binary files differ
diff --git a/graphics/berries/hondew/palette.pal b/graphics/berries/hondew/palette.pal
deleted file mode 100644
index db2739961..000000000
--- a/graphics/berries/hondew/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 246
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-98 164 57
-98 139 57
-255 246 197
-255 222 148
-255 197 98
-222 172 98
-189 148 98
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/iapapa/pic.png b/graphics/berries/iapapa.png
index 243e23d29..243e23d29 100644
--- a/graphics/berries/iapapa/pic.png
+++ b/graphics/berries/iapapa.png
Binary files differ
diff --git a/graphics/berries/iapapa/palette.pal b/graphics/berries/iapapa/palette.pal
deleted file mode 100644
index 31fac9dde..000000000
--- a/graphics/berries/iapapa/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 197 197
-246 238 222
-246 238 172
-238 213 148
-230 197 131
-222 180 115
-213 164 98
-205 148 82
-139 90 57
-230 164 90
-238 123 74
-255 90 57
-222 90 57
-197 90 57
-172 90 57
-90 139 82
diff --git a/graphics/berries/kelpsy/pic.png b/graphics/berries/kelpsy.png
index 17b509c04..17b509c04 100644
--- a/graphics/berries/kelpsy/pic.png
+++ b/graphics/berries/kelpsy.png
Binary files differ
diff --git a/graphics/berries/kelpsy/palette.pal b/graphics/berries/kelpsy/palette.pal
deleted file mode 100644
index 67ad7a21c..000000000
--- a/graphics/berries/kelpsy/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-189 205 213
-164 156 197
-139 115 180
-115 74 172
-98 57 139
-90 49 106
-82 41 82
-180 139 123
-148 106 82
-115 74 41
-0 0 0
-189 222 255
-156 197 230
-131 172 205
-106 148 189
diff --git a/graphics/berries/lansat/pic.png b/graphics/berries/lansat.png
index c63a590ec..c63a590ec 100644
--- a/graphics/berries/lansat/pic.png
+++ b/graphics/berries/lansat.png
Binary files differ
diff --git a/graphics/berries/lansat/palette.pal b/graphics/berries/lansat/palette.pal
deleted file mode 100644
index 66621677d..000000000
--- a/graphics/berries/lansat/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 246 246
-189 222 148
-148 197 123
-115 180 106
-82 164 90
-49 148 74
-255 222 164
-246 180 139
-238 148 115
-230 106 90
-222 74 65
-213 41 49
-189 41 49
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/leppa/pic.png b/graphics/berries/leppa.png
index 228bc9c3a..228bc9c3a 100644
--- a/graphics/berries/leppa/pic.png
+++ b/graphics/berries/leppa.png
Binary files differ
diff --git a/graphics/berries/leppa/palette.pal b/graphics/berries/leppa/palette.pal
deleted file mode 100644
index 4fab82d6c..000000000
--- a/graphics/berries/leppa/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 41 49
-180 41 49
-148 41 49
-197 148 98
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/liechi/pic.png b/graphics/berries/liechi.png
index dbfea58ca..dbfea58ca 100644
--- a/graphics/berries/liechi/pic.png
+++ b/graphics/berries/liechi.png
Binary files differ
diff --git a/graphics/berries/liechi/palette.pal b/graphics/berries/liechi/palette.pal
deleted file mode 100644
index c12737deb..000000000
--- a/graphics/berries/liechi/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 41 49
-180 41 49
-255 255 255
-238 230 213
-222 205 172
-205 180 131
-197 164 90
-255 205 131
-238 164 98
-222 123 65
-213 90 32
diff --git a/graphics/berries/lum/pic.png b/graphics/berries/lum.png
index 52a97fe4b..52a97fe4b 100644
--- a/graphics/berries/lum/pic.png
+++ b/graphics/berries/lum.png
Binary files differ
diff --git a/graphics/berries/lum/palette.pal b/graphics/berries/lum/palette.pal
deleted file mode 100644
index 237ef0dc4..000000000
--- a/graphics/berries/lum/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-98 246 246
-255 255 222
-238 255 189
-230 255 156
-197 230 131
-172 205 115
-148 180 90
-123 156 74
-115 115 74
-106 82 74
-0 0 0
-0 0 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/mago/pic.png b/graphics/berries/mago.png
index b83c4cc3e..b83c4cc3e 100644
--- a/graphics/berries/mago/pic.png
+++ b/graphics/berries/mago.png
Binary files differ
diff --git a/graphics/berries/mago/palette.pal b/graphics/berries/mago/palette.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/mago/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-197 106 106
-148 74 74
-98 41 49
-255 246 197
-230 205 148
-213 164 106
-197 131 65
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/magost/pic.png b/graphics/berries/magost.png
index d3332bc26..d3332bc26 100644
--- a/graphics/berries/magost/pic.png
+++ b/graphics/berries/magost.png
Binary files differ
diff --git a/graphics/berries/magost/palette.pal b/graphics/berries/magost/palette.pal
deleted file mode 100644
index 2393be3d6..000000000
--- a/graphics/berries/magost/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-222 123 123
-197 106 106
-180 90 90
-255 246 197
-230 131 131
-246 148 148
-197 131 65
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/nanab/pic.png b/graphics/berries/nanab.png
index 88fa1368e..88fa1368e 100644
--- a/graphics/berries/nanab/pic.png
+++ b/graphics/berries/nanab.png
Binary files differ
diff --git a/graphics/berries/nanab/palette.pal b/graphics/berries/nanab/palette.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/nanab/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-197 106 106
-148 74 74
-98 41 49
-255 246 197
-230 205 148
-213 164 106
-197 131 65
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/nomel/pic.png b/graphics/berries/nomel.png
index 828674f62..828674f62 100644
--- a/graphics/berries/nomel/pic.png
+++ b/graphics/berries/nomel.png
Binary files differ
diff --git a/graphics/berries/nomel/palette.pal b/graphics/berries/nomel/palette.pal
deleted file mode 100644
index 6844ddcc3..000000000
--- a/graphics/berries/nomel/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-246 238 222
-246 230 180
-246 230 148
-246 222 106
-255 222 74
-238 197 65
-222 180 65
-205 156 65
-189 139 65
-123 98 65
-172 255 74
-131 213 65
-90 180 65
-246 205 65
-238 205 65
diff --git a/graphics/berries/oran/pic.png b/graphics/berries/oran.png
index bc9517fac..bc9517fac 100644
--- a/graphics/berries/oran/pic.png
+++ b/graphics/berries/oran.png
Binary files differ
diff --git a/graphics/berries/oran/palette.pal b/graphics/berries/oran/palette.pal
deleted file mode 100644
index ac06d0224..000000000
--- a/graphics/berries/oran/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-189 205 213
-156 172 213
-123 148 213
-90 123 213
-65 98 213
-65 82 180
-65 65 148
-74 49 115
-148 106 82
-115 74 41
-0 0 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/pamtre/pic.png b/graphics/berries/pamtre.png
index d066ab74c..d066ab74c 100644
--- a/graphics/berries/pamtre/pic.png
+++ b/graphics/berries/pamtre.png
Binary files differ
diff --git a/graphics/berries/pamtre/palette.pal b/graphics/berries/pamtre/palette.pal
deleted file mode 100644
index fa2cb87a7..000000000
--- a/graphics/berries/pamtre/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-189 205 213
-172 180 205
-156 148 189
-131 106 180
-115 74 172
-98 57 139
-90 49 106
-82 41 82
-238 189 213
-205 164 172
-180 139 139
-156 115 106
-131 90 74
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/pecha/pic.png b/graphics/berries/pecha.png
index 76543a044..76543a044 100644
--- a/graphics/berries/pecha/pic.png
+++ b/graphics/berries/pecha.png
Binary files differ
diff --git a/graphics/berries/pecha/palette.pal b/graphics/berries/pecha/palette.pal
deleted file mode 100644
index b0743cc64..000000000
--- a/graphics/berries/pecha/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 255
-255 222 197
-255 197 148
-222 172 123
-197 148 106
-172 123 90
-148 98 74
-0 0 0
-255 205 172
-238 180 131
-123 246 0
-90 213 0
-57 180 0
-24 148 0
-0 0 0
diff --git a/graphics/berries/persim/pic.png b/graphics/berries/persim.png
index 6c0ba368a..6c0ba368a 100644
--- a/graphics/berries/persim/pic.png
+++ b/graphics/berries/persim.png
Binary files differ
diff --git a/graphics/berries/persim/palette.pal b/graphics/berries/persim/palette.pal
deleted file mode 100644
index 389fac638..000000000
--- a/graphics/berries/persim/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-197 106 106
-148 74 74
-98 41 49
-0 0 0
-0 0 0
-0 0 0
-90 98 82
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/petaya/pic.png b/graphics/berries/petaya.png
index 04198ba39..04198ba39 100644
--- a/graphics/berries/petaya/pic.png
+++ b/graphics/berries/petaya.png
Binary files differ
diff --git a/graphics/berries/petaya/palette.pal b/graphics/berries/petaya/palette.pal
deleted file mode 100644
index c6eefb076..000000000
--- a/graphics/berries/petaya/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 246 246
-255 197 205
-246 164 180
-246 131 156
-246 106 139
-189 74 90
-139 41 49
-230 197 148
-205 172 123
-189 148 98
-172 123 74
-156 98 49
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/pinap/pic.png b/graphics/berries/pinap.png
index 71144554a..71144554a 100644
--- a/graphics/berries/pinap/pic.png
+++ b/graphics/berries/pinap.png
Binary files differ
diff --git a/graphics/berries/pinap/palette.pal b/graphics/berries/pinap/palette.pal
deleted file mode 100644
index e62f61e20..000000000
--- a/graphics/berries/pinap/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-246 238 222
-246 238 189
-246 238 156
-246 238 123
-222 205 106
-197 180 98
-172 156 90
-148 123 74
-123 98 65
-106 74 57
-148 255 172
-115 213 148
-82 180 123
-49 148 98
-0 0 0
diff --git a/graphics/berries/pomeg/pic.png b/graphics/berries/pomeg.png
index 394f8558a..394f8558a 100644
--- a/graphics/berries/pomeg/pic.png
+++ b/graphics/berries/pomeg.png
Binary files differ
diff --git a/graphics/berries/pomeg/palette.pal b/graphics/berries/pomeg/palette.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/pomeg/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 49 41
-180 57 32
-148 65 24
-115 82 24
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/qualot/pic.png b/graphics/berries/qualot.png
index 15f51d4d8..15f51d4d8 100644
--- a/graphics/berries/qualot/pic.png
+++ b/graphics/berries/qualot.png
Binary files differ
diff --git a/graphics/berries/qualot/palette.pal b/graphics/berries/qualot/palette.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/qualot/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-197 106 106
-148 74 74
-98 41 49
-255 246 197
-230 205 148
-213 164 106
-197 131 65
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/rabuta/pic.png b/graphics/berries/rabuta.png
index cf620f906..cf620f906 100644
--- a/graphics/berries/rabuta/pic.png
+++ b/graphics/berries/rabuta.png
Binary files differ
diff --git a/graphics/berries/rabuta/palette.pal b/graphics/berries/rabuta/palette.pal
deleted file mode 100644
index 251beeb2d..000000000
--- a/graphics/berries/rabuta/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 246
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-98 164 57
-98 139 57
-255 246 197
-230 213 172
-205 189 156
-180 164 131
-156 139 115
-139 115 98
-90 106 57
-90 139 82
diff --git a/graphics/berries/rawst/pic.png b/graphics/berries/rawst.png
index c0e3e23a6..c0e3e23a6 100644
--- a/graphics/berries/rawst/pic.png
+++ b/graphics/berries/rawst.png
Binary files differ
diff --git a/graphics/berries/rawst/palette.pal b/graphics/berries/rawst/palette.pal
deleted file mode 100644
index a7a4576b5..000000000
--- a/graphics/berries/rawst/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 98 246
-255 255 255
-213 230 222
-172 205 189
-131 189 156
-90 164 123
-49 148 98
-49 131 82
-57 115 74
-65 98 65
-74 82 57
-98 197 0
-49 148 0
-0 98 0
-148 205 0
-0 0 0
diff --git a/graphics/berries/razz/pic.png b/graphics/berries/razz.png
index 5c415012d..5c415012d 100644
--- a/graphics/berries/razz/pic.png
+++ b/graphics/berries/razz.png
Binary files differ
diff --git a/graphics/berries/razz/palette.pal b/graphics/berries/razz/palette.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/razz/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 49 41
-180 57 32
-148 65 24
-115 82 24
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/salac/pic.png b/graphics/berries/salac.png
index 557ab1742..557ab1742 100644
--- a/graphics/berries/salac/pic.png
+++ b/graphics/berries/salac.png
Binary files differ
diff --git a/graphics/berries/salac/palette.pal b/graphics/berries/salac/palette.pal
deleted file mode 100644
index c0849c6bc..000000000
--- a/graphics/berries/salac/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 255 255
-255 255 255
-246 255 222
-238 255 189
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-90 156 41
-82 123 24
-74 98 8
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/sitrus/pic.png b/graphics/berries/sitrus.png
index d98327ae1..d98327ae1 100644
--- a/graphics/berries/sitrus/pic.png
+++ b/graphics/berries/sitrus.png
Binary files differ
diff --git a/graphics/berries/sitrus/palette.pal b/graphics/berries/sitrus/palette.pal
deleted file mode 100644
index b80481ae1..000000000
--- a/graphics/berries/sitrus/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-98 246 246
-246 238 222
-246 238 172
-246 238 123
-222 213 106
-197 189 90
-172 164 82
-148 139 65
-123 115 57
-246 197 90
-246 172 32
-189 131 32
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/spelon/pic.png b/graphics/berries/spelon.png
index 996f743db..996f743db 100644
--- a/graphics/berries/spelon/pic.png
+++ b/graphics/berries/spelon.png
Binary files differ
diff --git a/graphics/berries/spelon/palette.pal b/graphics/berries/spelon/palette.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/spelon/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 49 41
-180 57 32
-148 65 24
-115 82 24
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/starf/pic.png b/graphics/berries/starf.png
index 8cca44ee2..8cca44ee2 100644
--- a/graphics/berries/starf/pic.png
+++ b/graphics/berries/starf.png
Binary files differ
diff --git a/graphics/berries/starf/palette.pal b/graphics/berries/starf/palette.pal
deleted file mode 100644
index 68525b6a6..000000000
--- a/graphics/berries/starf/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 238 246
-246 139 90
-230 255 213
-205 255 180
-180 255 139
-156 255 106
-131 205 106
-106 164 106
-90 123 106
-246 41 41
-156 106 106
-255 156 156
-98 123 205
-164 213 41
-255 205 8
-0 0 0
diff --git a/graphics/berries/tamato/pic.png b/graphics/berries/tamato.png
index 9f2c14d4a..9f2c14d4a 100644
--- a/graphics/berries/tamato/pic.png
+++ b/graphics/berries/tamato.png
Binary files differ
diff --git a/graphics/berries/tamato/palette.pal b/graphics/berries/tamato/palette.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/tamato/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 255 123
-246 180 98
-246 106 74
-246 41 49
-213 49 41
-180 57 32
-148 65 24
-115 82 24
-189 238 131
-156 205 115
-123 172 98
-90 139 82
-115 90 74
-82 90 49
-57 98 32
diff --git a/graphics/berries/watmel/pic.png b/graphics/berries/watmel.png
index 6da099327..6da099327 100644
--- a/graphics/berries/watmel/pic.png
+++ b/graphics/berries/watmel.png
Binary files differ
diff --git a/graphics/berries/watmel/palette.pal b/graphics/berries/watmel/palette.pal
deleted file mode 100644
index 786c0a848..000000000
--- a/graphics/berries/watmel/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 246 246
-255 222 205
-246 189 180
-246 164 156
-246 139 139
-213 115 115
-180 90 90
-148 74 74
-255 246 197
-230 205 148
-238 255 180
-213 246 156
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/wepear/pic.png b/graphics/berries/wepear.png
index 468231651..468231651 100644
--- a/graphics/berries/wepear/pic.png
+++ b/graphics/berries/wepear.png
Binary files differ
diff --git a/graphics/berries/wepear/palette.pal b/graphics/berries/wepear/palette.pal
deleted file mode 100644
index dac1511ff..000000000
--- a/graphics/berries/wepear/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 255 255
-230 255 156
-197 238 131
-164 222 106
-131 205 82
-98 189 57
-98 156 57
-98 123 57
-98 90 57
-0 0 0
-180 230 115
-0 0 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82
diff --git a/graphics/berries/wiki/pic.png b/graphics/berries/wiki.png
index d13c76f5b..d13c76f5b 100644
--- a/graphics/berries/wiki/pic.png
+++ b/graphics/berries/wiki.png
Binary files differ
diff --git a/graphics/berries/wiki/palette.pal b/graphics/berries/wiki/palette.pal
deleted file mode 100644
index 88586d6b5..000000000
--- a/graphics/berries/wiki/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 197
-189 205 213
-164 156 197
-139 115 180
-115 74 172
-98 57 139
-90 49 106
-82 41 82
-180 139 123
-148 106 82
-115 74 41
-0 0 0
-189 238 131
-156 205 115
-123 172 98
-90 139 82