87 files changed, 86 insertions, 903 deletions

diff --git a/data/graphics/berries/berry_graphics.inc b/data/graphics/berries/berry_graphics.inc
index 01a7c776d..358cc8fc1 100644
--- a/data/graphics/berries/berry_graphics.inc
+++ b/data/graphics/berries/berry_graphics.inc
@@ -1,343 +1,343 @@
 	.align 2
 gBerryPic_Cheri:: @ 8D9C3A8
-	.incbin "graphics/berries/pics/cheri.4bpp.lz"
+	.incbin "graphics/berries/cheri.4bpp.lz"
 
 	.align 2
 gBerryPic_Oran:: @ 8D9C4FC
-	.incbin "graphics/berries/pics/oran.4bpp.lz"
+	.incbin "graphics/berries/oran.4bpp.lz"
 
 	.align 2
 gBerryPic_Pecha:: @ 8D9C670
-	.incbin "graphics/berries/pics/pecha.4bpp.lz"
+	.incbin "graphics/berries/pecha.4bpp.lz"
 
 	.align 2
 gBerryPic_Rawst:: @ 8D9C7E4
-	.incbin "graphics/berries/pics/rawst.4bpp.lz"
+	.incbin "graphics/berries/rawst.4bpp.lz"
 
 	.align 2
 gBerryPic_Aspear:: @ 8D9C97C
-	.incbin "graphics/berries/pics/aspear.4bpp.lz"
+	.incbin "graphics/berries/aspear.4bpp.lz"
 
 	.align 2
 gBerryPic_Leppa:: @ 8D9CB24
-	.incbin "graphics/berries/pics/leppa.4bpp.lz"
+	.incbin "graphics/berries/leppa.4bpp.lz"
 
 	.align 2
 gBerryPic_Chesto:: @ 8D9CC94
-	.incbin "graphics/berries/pics/chesto.4bpp.lz"
+	.incbin "graphics/berries/chesto.4bpp.lz"
 
 	.align 2
 gBerryPic_Persim:: @ 8D9CE78
-	.incbin "graphics/berries/pics/persim.4bpp.lz"
+	.incbin "graphics/berries/persim.4bpp.lz"
 
 	.align 2
 gBerryPic_Lum:: @ 8D9CFC8
-	.incbin "graphics/berries/pics/lum.4bpp.lz"
+	.incbin "graphics/berries/lum.4bpp.lz"
 
 	.align 2
 gBerryPic_Sitrus:: @ 8D9D0E4
-	.incbin "graphics/berries/pics/sitrus.4bpp.lz"
+	.incbin "graphics/berries/sitrus.4bpp.lz"
 
 	.align 2
 gBerryPic_Figy:: @ 8D9D288
-	.incbin "graphics/berries/pics/figy.4bpp.lz"
+	.incbin "graphics/berries/figy.4bpp.lz"
 
 	.align 2
 gBerryPic_Wiki:: @ 8D9D434
-	.incbin "graphics/berries/pics/wiki.4bpp.lz"
+	.incbin "graphics/berries/wiki.4bpp.lz"
 
 	.align 2
 gBerryPic_Mago:: @ 8D9D628
-	.incbin "graphics/berries/pics/mago.4bpp.lz"
+	.incbin "graphics/berries/mago.4bpp.lz"
 
 	.align 2
 gBerryPic_Aguav:: @ 8D9D7DC
-	.incbin "graphics/berries/pics/aguav.4bpp.lz"
+	.incbin "graphics/berries/aguav.4bpp.lz"
 
 	.align 2
 gBerryPic_Iapapa:: @ 8D9D950
-	.incbin "graphics/berries/pics/iapapa.4bpp.lz"
+	.incbin "graphics/berries/iapapa.4bpp.lz"
 
 	.align 2
 gBerryPic_Razz:: @ 8D9DC08
-	.incbin "graphics/berries/pics/razz.4bpp.lz"
+	.incbin "graphics/berries/razz.4bpp.lz"
 
 	.align 2
 gBerryPic_Bluk:: @ 8D9DE38
-	.incbin "graphics/berries/pics/bluk.4bpp.lz"
+	.incbin "graphics/berries/bluk.4bpp.lz"
 
 	.align 2
 gBerryPic_Nanab:: @ 8D9E020
-	.incbin "graphics/berries/pics/nanab.4bpp.lz"
+	.incbin "graphics/berries/nanab.4bpp.lz"
 
 	.align 2
 gBerryPic_Wepear:: @ 8D9E194
-	.incbin "graphics/berries/pics/wepear.4bpp.lz"
+	.incbin "graphics/berries/wepear.4bpp.lz"
 
 	.align 2
 gBerryPic_Pinap:: @ 8D9E35C
-	.incbin "graphics/berries/pics/pinap.4bpp.lz"
+	.incbin "graphics/berries/pinap.4bpp.lz"
 
 	.align 2
 gBerryPic_Pomeg:: @ 8D9E570
-	.incbin "graphics/berries/pics/pomeg.4bpp.lz"
+	.incbin "graphics/berries/pomeg.4bpp.lz"
 
 	.align 2
 gBerryPic_Kelpsy:: @ 8D9E718
-	.incbin "graphics/berries/pics/kelpsy.4bpp.lz"
+	.incbin "graphics/berries/kelpsy.4bpp.lz"
 
 	.align 2
 gBerryPic_Qualot:: @ 8D9E8C0
-	.incbin "graphics/berries/pics/qualot.4bpp.lz"
+	.incbin "graphics/berries/qualot.4bpp.lz"
 
 	.align 2
 gBerryPic_Hondew:: @ 8D9EA8C
-	.incbin "graphics/berries/pics/hondew.4bpp.lz"
+	.incbin "graphics/berries/hondew.4bpp.lz"
 
 	.align 2
 gBerryPic_Grepa:: @ 8D9ECE4
-	.incbin "graphics/berries/pics/grepa.4bpp.lz"
+	.incbin "graphics/berries/grepa.4bpp.lz"
 
 	.align 2
 gBerryPic_Tamato:: @ 8D9EE74
-	.incbin "graphics/berries/pics/tamato.4bpp.lz"
+	.incbin "graphics/berries/tamato.4bpp.lz"
 
 	.align 2
 gBerryPic_Cornn:: @ 8D9F138
-	.incbin "graphics/berries/pics/cornn.4bpp.lz"
+	.incbin "graphics/berries/cornn.4bpp.lz"
 
 	.align 2
 gBerryPic_Magost:: @ 8D9F33C
-	.incbin "graphics/berries/pics/magost.4bpp.lz"
+	.incbin "graphics/berries/magost.4bpp.lz"
 
 	.align 2
 gBerryPic_Rabuta:: @ 8D9F4E0
-	.incbin "graphics/berries/pics/rabuta.4bpp.lz"
+	.incbin "graphics/berries/rabuta.4bpp.lz"
 
 	.align 2
 gBerryPic_Nomel:: @ 8D9F7D4
-	.incbin "graphics/berries/pics/nomel.4bpp.lz"
+	.incbin "graphics/berries/nomel.4bpp.lz"
 
 	.align 2
 gBerryPic_Spelon:: @ 8D9F9B0
-	.incbin "graphics/berries/pics/spelon.4bpp.lz"
+	.incbin "graphics/berries/spelon.4bpp.lz"
 
 	.align 2
 gBerryPic_Pamtre:: @ 8D9FBA0
-	.incbin "graphics/berries/pics/pamtre.4bpp.lz"
+	.incbin "graphics/berries/pamtre.4bpp.lz"
 
 	.align 2
 gBerryPic_Watmel:: @ 8D9FDF0
-	.incbin "graphics/berries/pics/watmel.4bpp.lz"
+	.incbin "graphics/berries/watmel.4bpp.lz"
 
 	.align 2
 gBerryPic_Durin:: @ 8DA00D4
-	.incbin "graphics/berries/pics/durin.4bpp.lz"
+	.incbin "graphics/berries/durin.4bpp.lz"
 
 	.align 2
 gBerryPic_Belue:: @ 8DA04A0
-	.incbin "graphics/berries/pics/belue.4bpp.lz"
+	.incbin "graphics/berries/belue.4bpp.lz"
 
 	.align 2
 gBerryPic_Liechi:: @ 8DA0778
-	.incbin "graphics/berries/pics/liechi.4bpp.lz"
+	.incbin "graphics/berries/liechi.4bpp.lz"
 
 	.align 2
 gBerryPic_Ganlon:: @ 8DA09D0
-	.incbin "graphics/berries/pics/ganlon.4bpp.lz"
+	.incbin "graphics/berries/ganlon.4bpp.lz"
 
 	.align 2
 gBerryPic_Salac:: @ 8DA0B68
-	.incbin "graphics/berries/pics/salac.4bpp.lz"
+	.incbin "graphics/berries/salac.4bpp.lz"
 
 	.align 2
 gBerryPic_Petaya:: @ 8DA0DAC
-	.incbin "graphics/berries/pics/petaya.4bpp.lz"
+	.incbin "graphics/berries/petaya.4bpp.lz"
 
 	.align 2
 gBerryPic_Apicot:: @ 8DA1054
-	.incbin "graphics/berries/pics/apicot.4bpp.lz"
+	.incbin "graphics/berries/apicot.4bpp.lz"
 
 	.align 2
 gBerryPic_Lansat:: @ 8DA11E4
-	.incbin "graphics/berries/pics/lansat.4bpp.lz"
+	.incbin "graphics/berries/lansat.4bpp.lz"
 
 	.align 2
 gBerryPic_Starf:: @ 8DA13D8
-	.incbin "graphics/berries/pics/starf.4bpp.lz"
+	.incbin "graphics/berries/starf.4bpp.lz"
 
 	.align 2
 gBerryPic_Enigma:: @ 8DA15A8
-	.incbin "graphics/berries/pics/enigma.4bpp.lz"
+	.incbin "graphics/berries/enigma.4bpp.lz"
 
 	.align 2
 gBerryPalette_Cheri:: @ 8DA17C0
-	.incbin "graphics/berries/palettes/cheri.gbapal.lz"
+	.incbin "graphics/berries/cheri.gbapal.lz"
 
 	.align 2
 gBerryPalette_Oran:: @ 8DA17E8
-	.incbin "graphics/berries/palettes/oran.gbapal.lz"
+	.incbin "graphics/berries/oran.gbapal.lz"
 
 	.align 2
 gBerryPalette_Pecha:: @ 8DA1810
-	.incbin "graphics/berries/palettes/pecha.gbapal.lz"
+	.incbin "graphics/berries/pecha.gbapal.lz"
 
 	.align 2
 gBerryPalette_Rawst:: @ 8DA1838
-	.incbin "graphics/berries/palettes/rawst.gbapal.lz"
+	.incbin "graphics/berries/rawst.gbapal.lz"
 
 	.align 2
 gBerryPalette_Aspear:: @ 8DA1860
-	.incbin "graphics/berries/palettes/aspear.gbapal.lz"
+	.incbin "graphics/berries/aspear.gbapal.lz"
 
 	.align 2
 gBerryPalette_Leppa:: @ 8DA1888
-	.incbin "graphics/berries/palettes/leppa.gbapal.lz"
+	.incbin "graphics/berries/leppa.gbapal.lz"
 
 	.align 2
 gBerryPalette_Chesto:: @ 8DA18B0
-	.incbin "graphics/berries/palettes/chesto.gbapal.lz"
+	.incbin "graphics/berries/chesto.gbapal.lz"
 
 	.align 2
 gBerryPalette_Persim:: @ 8DA18D8
-	.incbin "graphics/berries/palettes/persim.gbapal.lz"
+	.incbin "graphics/berries/persim.gbapal.lz"
 
 	.align 2
 gBerryPalette_Lum:: @ 8DA1900
-	.incbin "graphics/berries/palettes/lum.gbapal.lz"
+	.incbin "graphics/berries/lum.gbapal.lz"
 
 	.align 2
 gBerryPalette_Sitrus:: @ 8DA1928
-	.incbin "graphics/berries/palettes/sitrus.gbapal.lz"
+	.incbin "graphics/berries/sitrus.gbapal.lz"
 
 	.align 2
 gBerryPalette_Figy:: @ 8DA1950
-	.incbin "graphics/berries/palettes/figy.gbapal.lz"
+	.incbin "graphics/berries/figy.gbapal.lz"
 
 	.align 2
 gBerryPalette_Wiki:: @ 8DA1978
-	.incbin "graphics/berries/palettes/wiki.gbapal.lz"
+	.incbin "graphics/berries/wiki.gbapal.lz"
 
 	.align 2
 gBerryPalette_Mago:: @ 8DA19A0
-	.incbin "graphics/berries/palettes/mago.gbapal.lz"
+	.incbin "graphics/berries/mago.gbapal.lz"
 
 	.align 2
 gBerryPalette_Aguav:: @ 8DA19C8
-	.incbin "graphics/berries/palettes/aguav.gbapal.lz"
+	.incbin "graphics/berries/aguav.gbapal.lz"
 
 	.align 2
 gBerryPalette_Iapapa:: @ 8DA19F0
-	.incbin "graphics/berries/palettes/iapapa.gbapal.lz"
+	.incbin "graphics/berries/iapapa.gbapal.lz"
 
 	.align 2
 gBerryPalette_Razz:: @ 8DA1A18
-	.incbin "graphics/berries/palettes/razz.gbapal.lz"
+	.incbin "graphics/berries/razz.gbapal.lz"
 
 	.align 2
 gBerryPalette_Bluk:: @ 8DA1A40
-	.incbin "graphics/berries/palettes/bluk.gbapal.lz"
+	.incbin "graphics/berries/bluk.gbapal.lz"
 
 	.align 2
 gBerryPalette_Nanab:: @ 8DA1A68
-	.incbin "graphics/berries/palettes/nanab.gbapal.lz"
+	.incbin "graphics/berries/nanab.gbapal.lz"
 
 	.align 2
 gBerryPalette_Wepear:: @ 8DA1A90
-	.incbin "graphics/berries/palettes/wepear.gbapal.lz"
+	.incbin "graphics/berries/wepear.gbapal.lz"
 
 	.align 2
 gBerryPalette_Pinap:: @ 8DA1AB8
-	.incbin "graphics/berries/palettes/pinap.gbapal.lz"
+	.incbin "graphics/berries/pinap.gbapal.lz"
 
 	.align 2
 gBerryPalette_Pomeg:: @ 8DA1AE0
-	.incbin "graphics/berries/palettes/pomeg.gbapal.lz"
+	.incbin "graphics/berries/pomeg.gbapal.lz"
 
 	.align 2
 gBerryPalette_Kelpsy:: @ 8DA1B08
-	.incbin "graphics/berries/palettes/kelpsy.gbapal.lz"
+	.incbin "graphics/berries/kelpsy.gbapal.lz"
 
 	.align 2
 gBerryPalette_Qualot:: @ 8DA1B30
-	.incbin "graphics/berries/palettes/qualot.gbapal.lz"
+	.incbin "graphics/berries/qualot.gbapal.lz"
 
 	.align 2
 gBerryPalette_Hondew:: @ 8DA1B58
-	.incbin "graphics/berries/palettes/hondew.gbapal.lz"
+	.incbin "graphics/berries/hondew.gbapal.lz"
 
 	.align 2
 gBerryPalette_Grepa:: @ 8DA1B80
-	.incbin "graphics/berries/palettes/grepa.gbapal.lz"
+	.incbin "graphics/berries/grepa.gbapal.lz"
 
 	.align 2
 gBerryPalette_Tamato:: @ 8DA1BA8
-	.incbin "graphics/berries/palettes/tamato.gbapal.lz"
+	.incbin "graphics/berries/tamato.gbapal.lz"
 
 	.align 2
 gBerryPalette_Cornn:: @ 8DA1BD0
-	.incbin "graphics/berries/palettes/cornn.gbapal.lz"
+	.incbin "graphics/berries/cornn.gbapal.lz"
 
 	.align 2
 gBerryPalette_Magost:: @ 8DA1BF8
-	.incbin "graphics/berries/palettes/magost.gbapal.lz"
+	.incbin "graphics/berries/magost.gbapal.lz"
 
 	.align 2
 gBerryPalette_Rabuta:: @ 8DA1C20
-	.incbin "graphics/berries/palettes/rabuta.gbapal.lz"
+	.incbin "graphics/berries/rabuta.gbapal.lz"
 
 	.align 2
 gBerryPalette_Nomel:: @ 8DA1C48
-	.incbin "graphics/berries/palettes/nomel.gbapal.lz"
+	.incbin "graphics/berries/nomel.gbapal.lz"
 
 	.align 2
 gBerryPalette_Spelon:: @ 8DA1C70
-	.incbin "graphics/berries/palettes/spelon.gbapal.lz"
+	.incbin "graphics/berries/spelon.gbapal.lz"
 
 	.align 2
 gBerryPalette_Pamtre:: @ 8DA1C98
-	.incbin "graphics/berries/palettes/pamtre.gbapal.lz"
+	.incbin "graphics/berries/pamtre.gbapal.lz"
 
 	.align 2
 gBerryPalette_Watmel:: @ 8DA1CC0
-	.incbin "graphics/berries/palettes/watmel.gbapal.lz"
+	.incbin "graphics/berries/watmel.gbapal.lz"
 
 	.align 2
 gBerryPalette_Durin:: @ 8DA1CE8
-	.incbin "graphics/berries/palettes/durin.gbapal.lz"
+	.incbin "graphics/berries/durin.gbapal.lz"
 
 	.align 2
 gBerryPalette_Belue:: @ 8DA1D10
-	.incbin "graphics/berries/palettes/belue.gbapal.lz"
+	.incbin "graphics/berries/belue.gbapal.lz"
 
 	.align 2
 gBerryPalette_Liechi:: @ 8DA1D38
-	.incbin "graphics/berries/palettes/liechi.gbapal.lz"
+	.incbin "graphics/berries/liechi.gbapal.lz"
 
 	.align 2
 gBerryPalette_Ganlon:: @ 8DA1D60
-	.incbin "graphics/berries/palettes/ganlon.gbapal.lz"
+	.incbin "graphics/berries/ganlon.gbapal.lz"
 
 	.align 2
 gBerryPalette_Salac:: @ 8DA1D88
-	.incbin "graphics/berries/palettes/salac.gbapal.lz"
+	.incbin "graphics/berries/salac.gbapal.lz"
 
 	.align 2
 gBerryPalette_Petaya:: @ 8DA1DB0
-	.incbin "graphics/berries/palettes/petaya.gbapal.lz"
+	.incbin "graphics/berries/petaya.gbapal.lz"
 
 	.align 2
 gBerryPalette_Apicot:: @ 8DA1DD8
-	.incbin "graphics/berries/palettes/apicot.gbapal.lz"
+	.incbin "graphics/berries/apicot.gbapal.lz"
 
 	.align 2
 gBerryPalette_Lansat:: @ 8DA1E00
-	.incbin "graphics/berries/palettes/lansat.gbapal.lz"
+	.incbin "graphics/berries/lansat.gbapal.lz"
 
 	.align 2
 gBerryPalette_Starf:: @ 8DA1E28
-	.incbin "graphics/berries/palettes/starf.gbapal.lz"
+	.incbin "graphics/berries/starf.gbapal.lz"
 
 	.align 2
 gBerryPalette_Enigma:: @ 8DA1E50
-	.incbin "graphics/berries/palettes/enigma.gbapal.lz"
+	.incbin "graphics/berries/enigma.gbapal.lz"
diff --git a/graphics/berries/pics/aguav.png b/graphics/berries/aguav.png
index 0661fe8d3..0661fe8d3 100644
--- a/graphics/berries/pics/aguav.png
+++ b/graphics/berries/aguav.png
diff --git a/graphics/berries/pics/apicot.png b/graphics/berries/apicot.png
index b7098fc90..b7098fc90 100644
--- a/graphics/berries/pics/apicot.png
+++ b/graphics/berries/apicot.png
diff --git a/graphics/berries/pics/aspear.png b/graphics/berries/aspear.png
index b5e2c5061..b5e2c5061 100644
--- a/graphics/berries/pics/aspear.png
+++ b/graphics/berries/aspear.png
diff --git a/graphics/berries/pics/belue.png b/graphics/berries/belue.png
index 81ddaa9bb..81ddaa9bb 100644
--- a/graphics/berries/pics/belue.png
+++ b/graphics/berries/belue.png
diff --git a/graphics/berries/pics/bluk.png b/graphics/berries/bluk.png
index fc7e6c128..fc7e6c128 100644
--- a/graphics/berries/pics/bluk.png
+++ b/graphics/berries/bluk.png
diff --git a/graphics/berries/pics/cheri.png b/graphics/berries/cheri.png
index f70a1ad74..f70a1ad74 100644
--- a/graphics/berries/pics/cheri.png
+++ b/graphics/berries/cheri.png
diff --git a/graphics/berries/pics/chesto.png b/graphics/berries/chesto.png
index db1fe9e73..db1fe9e73 100644
--- a/graphics/berries/pics/chesto.png
+++ b/graphics/berries/chesto.png
diff --git a/graphics/berries/pics/cornn.png b/graphics/berries/cornn.png
index e124fc599..e124fc599 100644
--- a/graphics/berries/pics/cornn.png
+++ b/graphics/berries/cornn.png
diff --git a/graphics/berries/pics/durin.png b/graphics/berries/durin.png
index 5bbb97e1f..5bbb97e1f 100644
--- a/graphics/berries/pics/durin.png
+++ b/graphics/berries/durin.png
diff --git a/graphics/berries/pics/enigma.png b/graphics/berries/enigma.png
index af369550a..af369550a 100644
--- a/graphics/berries/pics/enigma.png
+++ b/graphics/berries/enigma.png
diff --git a/graphics/berries/pics/figy.png b/graphics/berries/figy.png
index 9ec8425d5..9ec8425d5 100644
--- a/graphics/berries/pics/figy.png
+++ b/graphics/berries/figy.png
diff --git a/graphics/berries/pics/ganlon.png b/graphics/berries/ganlon.png
index ec5e38319..ec5e38319 100644
--- a/graphics/berries/pics/ganlon.png
+++ b/graphics/berries/ganlon.png
diff --git a/graphics/berries/pics/grepa.png b/graphics/berries/grepa.png
index 136a86df2..136a86df2 100644
--- a/graphics/berries/pics/grepa.png
+++ b/graphics/berries/grepa.png
diff --git a/graphics/berries/pics/hondew.png b/graphics/berries/hondew.png
index ab1add813..ab1add813 100644
--- a/graphics/berries/pics/hondew.png
+++ b/graphics/berries/hondew.png
diff --git a/graphics/berries/pics/iapapa.png b/graphics/berries/iapapa.png
index 243e23d29..243e23d29 100644
--- a/graphics/berries/pics/iapapa.png
+++ b/graphics/berries/iapapa.png
diff --git a/graphics/berries/pics/kelpsy.png b/graphics/berries/kelpsy.png
index 17b509c04..17b509c04 100644
--- a/graphics/berries/pics/kelpsy.png
+++ b/graphics/berries/kelpsy.png
diff --git a/graphics/berries/pics/lansat.png b/graphics/berries/lansat.png
index c63a590ec..c63a590ec 100644
--- a/graphics/berries/pics/lansat.png
+++ b/graphics/berries/lansat.png
diff --git a/graphics/berries/pics/leppa.png b/graphics/berries/leppa.png
index 228bc9c3a..228bc9c3a 100644
--- a/graphics/berries/pics/leppa.png
+++ b/graphics/berries/leppa.png
diff --git a/graphics/berries/pics/liechi.png b/graphics/berries/liechi.png
index dbfea58ca..dbfea58ca 100644
--- a/graphics/berries/pics/liechi.png
+++ b/graphics/berries/liechi.png
diff --git a/graphics/berries/pics/lum.png b/graphics/berries/lum.png
index 52a97fe4b..52a97fe4b 100644
--- a/graphics/berries/pics/lum.png
+++ b/graphics/berries/lum.png
diff --git a/graphics/berries/pics/mago.png b/graphics/berries/mago.png
index b83c4cc3e..b83c4cc3e 100644
--- a/graphics/berries/pics/mago.png
+++ b/graphics/berries/mago.png
diff --git a/graphics/berries/pics/magost.png b/graphics/berries/magost.png
index d3332bc26..d3332bc26 100644
--- a/graphics/berries/pics/magost.png
+++ b/graphics/berries/magost.png
diff --git a/graphics/berries/pics/nanab.png b/graphics/berries/nanab.png
index 88fa1368e..88fa1368e 100644
--- a/graphics/berries/pics/nanab.png
+++ b/graphics/berries/nanab.png
diff --git a/graphics/berries/pics/nomel.png b/graphics/berries/nomel.png
index 828674f62..828674f62 100644
--- a/graphics/berries/pics/nomel.png
+++ b/graphics/berries/nomel.png
diff --git a/graphics/berries/pics/oran.png b/graphics/berries/oran.png
index bc9517fac..bc9517fac 100644
--- a/graphics/berries/pics/oran.png
+++ b/graphics/berries/oran.png
diff --git a/graphics/berries/palettes/aguav.pal b/graphics/berries/palettes/aguav.pal
deleted file mode 100644
index fa20daf24..000000000
--- a/graphics/berries/palettes/aguav.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/palettes/apicot.pal b/graphics/berries/palettes/apicot.pal
deleted file mode 100644
index 82cb76d5a..000000000
--- a/graphics/berries/palettes/apicot.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/palettes/aspear.pal b/graphics/berries/palettes/aspear.pal
deleted file mode 100644
index 52842fd55..000000000
--- a/graphics/berries/palettes/aspear.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/palettes/belue.pal b/graphics/berries/palettes/belue.pal
deleted file mode 100644
index 0d348b27e..000000000
--- a/graphics/berries/palettes/belue.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/palettes/bluk.pal b/graphics/berries/palettes/bluk.pal
deleted file mode 100644
index 88586d6b5..000000000
--- a/graphics/berries/palettes/bluk.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/palettes/cheri.pal b/graphics/berries/palettes/cheri.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/palettes/cheri.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/palettes/chesto.pal b/graphics/berries/palettes/chesto.pal
deleted file mode 100644
index 3a4e0964f..000000000
--- a/graphics/berries/palettes/chesto.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/palettes/cornn.pal b/graphics/berries/palettes/cornn.pal
deleted file mode 100644
index 5096389e0..000000000
--- a/graphics/berries/palettes/cornn.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/palettes/durin.pal b/graphics/berries/palettes/durin.pal
deleted file mode 100644
index 8b636135d..000000000
--- a/graphics/berries/palettes/durin.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/palettes/enigma.pal b/graphics/berries/palettes/enigma.pal
deleted file mode 100644
index 349ecc7f4..000000000
--- a/graphics/berries/palettes/enigma.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/palettes/figy.pal b/graphics/berries/palettes/figy.pal
deleted file mode 100644
index e427ea1e9..000000000
--- a/graphics/berries/palettes/figy.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/palettes/ganlon.pal b/graphics/berries/palettes/ganlon.pal
deleted file mode 100644
index 381974125..000000000
--- a/graphics/berries/palettes/ganlon.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/palettes/grepa.pal b/graphics/berries/palettes/grepa.pal
deleted file mode 100644
index 42ff8830f..000000000
--- a/graphics/berries/palettes/grepa.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/palettes/hondew.pal b/graphics/berries/palettes/hondew.pal
deleted file mode 100644
index db2739961..000000000
--- a/graphics/berries/palettes/hondew.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/palettes/iapapa.pal b/graphics/berries/palettes/iapapa.pal
deleted file mode 100644
index 31fac9dde..000000000
--- a/graphics/berries/palettes/iapapa.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/palettes/kelpsy.pal b/graphics/berries/palettes/kelpsy.pal
deleted file mode 100644
index 67ad7a21c..000000000
--- a/graphics/berries/palettes/kelpsy.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/palettes/lansat.pal b/graphics/berries/palettes/lansat.pal
deleted file mode 100644
index 66621677d..000000000
--- a/graphics/berries/palettes/lansat.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/palettes/leppa.pal b/graphics/berries/palettes/leppa.pal
deleted file mode 100644
index 4fab82d6c..000000000
--- a/graphics/berries/palettes/leppa.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/palettes/liechi.pal b/graphics/berries/palettes/liechi.pal
deleted file mode 100644
index c12737deb..000000000
--- a/graphics/berries/palettes/liechi.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/palettes/lum.pal b/graphics/berries/palettes/lum.pal
deleted file mode 100644
index 237ef0dc4..000000000
--- a/graphics/berries/palettes/lum.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/palettes/mago.pal b/graphics/berries/palettes/mago.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/palettes/mago.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/palettes/magost.pal b/graphics/berries/palettes/magost.pal
deleted file mode 100644
index 2393be3d6..000000000
--- a/graphics/berries/palettes/magost.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/palettes/nanab.pal b/graphics/berries/palettes/nanab.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/palettes/nanab.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/palettes/nomel.pal b/graphics/berries/palettes/nomel.pal
deleted file mode 100644
index 6844ddcc3..000000000
--- a/graphics/berries/palettes/nomel.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/palettes/oran.pal b/graphics/berries/palettes/oran.pal
deleted file mode 100644
index ac06d0224..000000000
--- a/graphics/berries/palettes/oran.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/palettes/pamtre.pal b/graphics/berries/palettes/pamtre.pal
deleted file mode 100644
index fa2cb87a7..000000000
--- a/graphics/berries/palettes/pamtre.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/palettes/pecha.pal b/graphics/berries/palettes/pecha.pal
deleted file mode 100644
index b0743cc64..000000000
--- a/graphics/berries/palettes/pecha.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/palettes/persim.pal b/graphics/berries/palettes/persim.pal
deleted file mode 100644
index 389fac638..000000000
--- a/graphics/berries/palettes/persim.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/palettes/petaya.pal b/graphics/berries/palettes/petaya.pal
deleted file mode 100644
index c6eefb076..000000000
--- a/graphics/berries/palettes/petaya.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/palettes/pinap.pal b/graphics/berries/palettes/pinap.pal
deleted file mode 100644
index e62f61e20..000000000
--- a/graphics/berries/palettes/pinap.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/palettes/pomeg.pal b/graphics/berries/palettes/pomeg.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/palettes/pomeg.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/palettes/qualot.pal b/graphics/berries/palettes/qualot.pal
deleted file mode 100644
index 4441e4564..000000000
--- a/graphics/berries/palettes/qualot.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/palettes/rabuta.pal b/graphics/berries/palettes/rabuta.pal
deleted file mode 100644
index 251beeb2d..000000000
--- a/graphics/berries/palettes/rabuta.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/palettes/rawst.pal b/graphics/berries/palettes/rawst.pal
deleted file mode 100644
index a7a4576b5..000000000
--- a/graphics/berries/palettes/rawst.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/palettes/razz.pal b/graphics/berries/palettes/razz.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/palettes/razz.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/palettes/salac.pal b/graphics/berries/palettes/salac.pal
deleted file mode 100644
index c0849c6bc..000000000
--- a/graphics/berries/palettes/salac.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/palettes/sitrus.pal b/graphics/berries/palettes/sitrus.pal
deleted file mode 100644
index b80481ae1..000000000
--- a/graphics/berries/palettes/sitrus.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/palettes/spelon.pal b/graphics/berries/palettes/spelon.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/palettes/spelon.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/palettes/starf.pal b/graphics/berries/palettes/starf.pal
deleted file mode 100644
index 68525b6a6..000000000
--- a/graphics/berries/palettes/starf.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/palettes/tamato.pal b/graphics/berries/palettes/tamato.pal
deleted file mode 100644
index 01acf52c9..000000000
--- a/graphics/berries/palettes/tamato.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/palettes/watmel.pal b/graphics/berries/palettes/watmel.pal
deleted file mode 100644
index 786c0a848..000000000
--- a/graphics/berries/palettes/watmel.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/palettes/wepear.pal b/graphics/berries/palettes/wepear.pal
deleted file mode 100644
index dac1511ff..000000000
--- a/graphics/berries/palettes/wepear.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/palettes/wiki.pal b/graphics/berries/palettes/wiki.pal
deleted file mode 100644
index 88586d6b5..000000000
--- a/graphics/berries/palettes/wiki.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/pics/pamtre.png b/graphics/berries/pamtre.png
index d066ab74c..d066ab74c 100644
--- a/graphics/berries/pics/pamtre.png
+++ b/graphics/berries/pamtre.png
diff --git a/graphics/berries/pics/pecha.png b/graphics/berries/pecha.png
index 76543a044..76543a044 100644
--- a/graphics/berries/pics/pecha.png
+++ b/graphics/berries/pecha.png
diff --git a/graphics/berries/pics/persim.png b/graphics/berries/persim.png
index 6c0ba368a..6c0ba368a 100644
--- a/graphics/berries/pics/persim.png
+++ b/graphics/berries/persim.png
diff --git a/graphics/berries/pics/petaya.png b/graphics/berries/petaya.png
index 04198ba39..04198ba39 100644
--- a/graphics/berries/pics/petaya.png
+++ b/graphics/berries/petaya.png
diff --git a/graphics/berries/pics/pinap.png b/graphics/berries/pinap.png
index 71144554a..71144554a 100644
--- a/graphics/berries/pics/pinap.png
+++ b/graphics/berries/pinap.png
diff --git a/graphics/berries/pics/pomeg.png b/graphics/berries/pomeg.png
index 394f8558a..394f8558a 100644
--- a/graphics/berries/pics/pomeg.png
+++ b/graphics/berries/pomeg.png
diff --git a/graphics/berries/pics/qualot.png b/graphics/berries/qualot.png
index 15f51d4d8..15f51d4d8 100644
--- a/graphics/berries/pics/qualot.png
+++ b/graphics/berries/qualot.png
diff --git a/graphics/berries/pics/rabuta.png b/graphics/berries/rabuta.png
index cf620f906..cf620f906 100644
--- a/graphics/berries/pics/rabuta.png
+++ b/graphics/berries/rabuta.png
diff --git a/graphics/berries/pics/rawst.png b/graphics/berries/rawst.png
index c0e3e23a6..c0e3e23a6 100644
--- a/graphics/berries/pics/rawst.png
+++ b/graphics/berries/rawst.png
diff --git a/graphics/berries/pics/razz.png b/graphics/berries/razz.png
index 5c415012d..5c415012d 100644
--- a/graphics/berries/pics/razz.png
+++ b/graphics/berries/razz.png
diff --git a/graphics/berries/pics/salac.png b/graphics/berries/salac.png
index 557ab1742..557ab1742 100644
--- a/graphics/berries/pics/salac.png
+++ b/graphics/berries/salac.png
diff --git a/graphics/berries/pics/sitrus.png b/graphics/berries/sitrus.png
index d98327ae1..d98327ae1 100644
--- a/graphics/berries/pics/sitrus.png
+++ b/graphics/berries/sitrus.png
diff --git a/graphics/berries/pics/spelon.png b/graphics/berries/spelon.png
index 996f743db..996f743db 100644
--- a/graphics/berries/pics/spelon.png
+++ b/graphics/berries/spelon.png
diff --git a/graphics/berries/pics/starf.png b/graphics/berries/starf.png
index 8cca44ee2..8cca44ee2 100644
--- a/graphics/berries/pics/starf.png
+++ b/graphics/berries/starf.png
diff --git a/graphics/berries/pics/tamato.png b/graphics/berries/tamato.png
index 9f2c14d4a..9f2c14d4a 100644
--- a/graphics/berries/pics/tamato.png
+++ b/graphics/berries/tamato.png
diff --git a/graphics/berries/pics/watmel.png b/graphics/berries/watmel.png
index 6da099327..6da099327 100644
--- a/graphics/berries/pics/watmel.png
+++ b/graphics/berries/watmel.png
diff --git a/graphics/berries/pics/wepear.png b/graphics/berries/wepear.png
index 468231651..468231651 100644
--- a/graphics/berries/pics/wepear.png
+++ b/graphics/berries/wepear.png
diff --git a/graphics/berries/pics/wiki.png b/graphics/berries/wiki.png
index d13c76f5b..d13c76f5b 100644
--- a/graphics/berries/pics/wiki.png
+++ b/graphics/berries/wiki.png