summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/emerald.s2
-rw-r--r--data/data2.s12
-rw-r--r--data/graphics/berries/berry_graphics.s429
-rw-r--r--data/graphics/berries/berry_pic_table.s46
-rw-r--r--data/graphics/berries/palettes/aguav.pal19
-rw-r--r--data/graphics/berries/palettes/apicot.pal19
-rw-r--r--data/graphics/berries/palettes/aspear.pal19
-rw-r--r--data/graphics/berries/palettes/belue.pal19
-rw-r--r--data/graphics/berries/palettes/bluk.pal19
-rw-r--r--data/graphics/berries/palettes/cheri.pal19
-rw-r--r--data/graphics/berries/palettes/chesto.pal19
-rw-r--r--data/graphics/berries/palettes/cornn.pal19
-rw-r--r--data/graphics/berries/palettes/durin.pal19
-rw-r--r--data/graphics/berries/palettes/enigma.pal19
-rw-r--r--data/graphics/berries/palettes/figy.pal19
-rw-r--r--data/graphics/berries/palettes/ganlon.pal19
-rw-r--r--data/graphics/berries/palettes/grepa.pal19
-rw-r--r--data/graphics/berries/palettes/hondew.pal19
-rw-r--r--data/graphics/berries/palettes/iapapa.pal19
-rw-r--r--data/graphics/berries/palettes/kelpsy.pal19
-rw-r--r--data/graphics/berries/palettes/lansat.pal19
-rw-r--r--data/graphics/berries/palettes/leppa.pal19
-rw-r--r--data/graphics/berries/palettes/liechi.pal19
-rw-r--r--data/graphics/berries/palettes/lum.pal19
-rw-r--r--data/graphics/berries/palettes/mago.pal19
-rw-r--r--data/graphics/berries/palettes/magost.pal19
-rw-r--r--data/graphics/berries/palettes/nanab.pal19
-rw-r--r--data/graphics/berries/palettes/nomel.pal19
-rw-r--r--data/graphics/berries/palettes/oran.pal19
-rw-r--r--data/graphics/berries/palettes/pamtre.pal19
-rw-r--r--data/graphics/berries/palettes/pecha.pal19
-rw-r--r--data/graphics/berries/palettes/persim.pal19
-rw-r--r--data/graphics/berries/palettes/petaya.pal19
-rw-r--r--data/graphics/berries/palettes/pinap.pal19
-rw-r--r--data/graphics/berries/palettes/pomeg.pal19
-rw-r--r--data/graphics/berries/palettes/qualot.pal19
-rw-r--r--data/graphics/berries/palettes/rabuta.pal19
-rw-r--r--data/graphics/berries/palettes/rawst.pal19
-rw-r--r--data/graphics/berries/palettes/razz.pal19
-rw-r--r--data/graphics/berries/palettes/salac.pal19
-rw-r--r--data/graphics/berries/palettes/sitrus.pal19
-rw-r--r--data/graphics/berries/palettes/spelon.pal19
-rw-r--r--data/graphics/berries/palettes/starf.pal19
-rw-r--r--data/graphics/berries/palettes/tamato.pal19
-rw-r--r--data/graphics/berries/palettes/watmel.pal19
-rw-r--r--data/graphics/berries/palettes/wepear.pal19
-rw-r--r--data/graphics/berries/palettes/wiki.pal19
-rw-r--r--data/graphics/berries/pics/aguav.pngbin0 -> 380 bytes
-rw-r--r--data/graphics/berries/pics/apicot.pngbin0 -> 397 bytes
-rw-r--r--data/graphics/berries/pics/aspear.pngbin0 -> 422 bytes
-rw-r--r--data/graphics/berries/pics/belue.pngbin0 -> 644 bytes
-rw-r--r--data/graphics/berries/pics/bluk.pngbin0 -> 444 bytes
-rw-r--r--data/graphics/berries/pics/cheri.pngbin0 -> 355 bytes
-rw-r--r--data/graphics/berries/pics/chesto.pngbin0 -> 458 bytes
-rw-r--r--data/graphics/berries/pics/cornn.pngbin0 -> 485 bytes
-rw-r--r--data/graphics/berries/pics/durin.pngbin0 -> 801 bytes
-rw-r--r--data/graphics/berries/pics/enigma.pngbin0 -> 497 bytes
-rw-r--r--data/graphics/berries/pics/figy.pngbin0 -> 418 bytes
-rw-r--r--data/graphics/berries/pics/ganlon.pngbin0 -> 387 bytes
-rw-r--r--data/graphics/berries/pics/grepa.pngbin0 -> 397 bytes
-rw-r--r--data/graphics/berries/pics/hondew.pngbin0 -> 534 bytes
-rw-r--r--data/graphics/berries/pics/iapapa.pngbin0 -> 624 bytes
-rw-r--r--data/graphics/berries/pics/kelpsy.pngbin0 -> 412 bytes
-rw-r--r--data/graphics/berries/pics/lansat.pngbin0 -> 474 bytes
-rw-r--r--data/graphics/berries/pics/leppa.pngbin0 -> 369 bytes
-rw-r--r--data/graphics/berries/pics/liechi.pngbin0 -> 561 bytes
-rw-r--r--data/graphics/berries/pics/lum.pngbin0 -> 289 bytes
-rw-r--r--data/graphics/berries/pics/mago.pngbin0 -> 409 bytes
-rw-r--r--data/graphics/berries/pics/magost.pngbin0 -> 392 bytes
-rw-r--r--data/graphics/berries/pics/nanab.pngbin0 -> 363 bytes
-rw-r--r--data/graphics/berries/pics/nomel.pngbin0 -> 430 bytes
-rw-r--r--data/graphics/berries/pics/oran.pngbin0 -> 340 bytes
-rw-r--r--data/graphics/berries/pics/pamtre.pngbin0 -> 539 bytes
-rw-r--r--data/graphics/berries/pics/pecha.pngbin0 -> 363 bytes
-rw-r--r--data/graphics/berries/pics/persim.pngbin0 -> 330 bytes
-rw-r--r--data/graphics/berries/pics/petaya.pngbin0 -> 639 bytes
-rw-r--r--data/graphics/berries/pics/pinap.pngbin0 -> 491 bytes
-rw-r--r--data/graphics/berries/pics/pomeg.pngbin0 -> 406 bytes
-rw-r--r--data/graphics/berries/pics/qualot.pngbin0 -> 422 bytes
-rw-r--r--data/graphics/berries/pics/rabuta.pngbin0 -> 710 bytes
-rw-r--r--data/graphics/berries/pics/rawst.pngbin0 -> 414 bytes
-rw-r--r--data/graphics/berries/pics/razz.pngbin0 -> 520 bytes
-rw-r--r--data/graphics/berries/pics/salac.pngbin0 -> 519 bytes
-rw-r--r--data/graphics/berries/pics/sitrus.pngbin0 -> 404 bytes
-rw-r--r--data/graphics/berries/pics/spelon.pngbin0 -> 467 bytes
-rw-r--r--data/graphics/berries/pics/starf.pngbin0 -> 440 bytes
-rw-r--r--data/graphics/berries/pics/tamato.pngbin0 -> 642 bytes
-rw-r--r--data/graphics/berries/pics/watmel.pngbin0 -> 636 bytes
-rw-r--r--data/graphics/berries/pics/wepear.pngbin0 -> 400 bytes
-rw-r--r--data/graphics/berries/pics/wiki.pngbin0 -> 429 bytes
90 files changed, 1302 insertions, 4 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 3441d542b..9509c3ebc 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -403637,7 +403637,7 @@ sub_80D5070: ; 80D5070
bne @080D5082
bl sub_80E162C
@080D5082:
- ldr r5, =gUnknown_0857FC94
+ ldr r5, =gBerryPicTable
lsls r4, 3
adds r0, r5, 0x4
adds r0, r4, r0
diff --git a/data/data2.s b/data/data2.s
index 638c77b1c..58805c664 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -4103,8 +4103,8 @@ gUnknown_0857FBEC: ; 857FBEC
gUnknown_0857FC7C: ; 857FC7C
.incbin "base_emerald.gba", 0x57fc7c, 0x18
-gUnknown_0857FC94: ; 857FC94
- .incbin "base_emerald.gba", 0x57fc94, 0x158
+; 857FC94
+ .include "data/graphics/berries/berry_pic_table.s"
gUnknown_0857FDEC: ; 857FDEC
.incbin "base_emerald.gba", 0x57fdec, 0x8
@@ -12740,7 +12740,13 @@ gUnknown_08D9BF98: ; 8D9BF98
.incbin "base_emerald.gba", 0xd9bf98, 0x1a4
gUnknown_08D9C13C: ; 8D9C13C
- .incbin "base_emerald.gba", 0xd9c13c, 0x7284
+ .incbin "base_emerald.gba", 0xd9c13c, 0x26c
+
+; 8D9C3A8
+ .include "data/graphics/berries/berry_graphics.s"
+
+; 8DA1E78
+ .incbin "base_emerald.gba", 0xda1e78, 0x1548
gUnknown_08DA33C0: ; 8DA33C0
.incbin "base_emerald.gba", 0xda33c0, 0x428
diff --git a/data/graphics/berries/berry_graphics.s b/data/graphics/berries/berry_graphics.s
new file mode 100644
index 000000000..99d86fdf3
--- /dev/null
+++ b/data/graphics/berries/berry_graphics.s
@@ -0,0 +1,429 @@
+ .align 2, 0
+
+gBerryPic_Cheri: ; 8D9C3A8
+ .incbin "data/graphics/berries/pics/cheri.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Oran: ; 8D9C4FC
+ .incbin "data/graphics/berries/pics/oran.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Pecha: ; 8D9C670
+ .incbin "data/graphics/berries/pics/pecha.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Rawst: ; 8D9C7E4
+ .incbin "data/graphics/berries/pics/rawst.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Aspear: ; 8D9C97C
+ .incbin "data/graphics/berries/pics/aspear.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Leppa: ; 8D9CB24
+ .incbin "data/graphics/berries/pics/leppa.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Chesto: ; 8D9CC94
+ .incbin "data/graphics/berries/pics/chesto.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Persim: ; 8D9CE78
+ .incbin "data/graphics/berries/pics/persim.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Lum: ; 8D9CFC8
+ .incbin "data/graphics/berries/pics/lum.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Sitrus: ; 8D9D0E4
+ .incbin "data/graphics/berries/pics/sitrus.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Figy: ; 8D9D288
+ .incbin "data/graphics/berries/pics/figy.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Wiki: ; 8D9D434
+ .incbin "data/graphics/berries/pics/wiki.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Mago: ; 8D9D628
+ .incbin "data/graphics/berries/pics/mago.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Aguav: ; 8D9D7DC
+ .incbin "data/graphics/berries/pics/aguav.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Iapapa: ; 8D9D950
+ .incbin "data/graphics/berries/pics/iapapa.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Razz: ; 8D9DC08
+ .incbin "data/graphics/berries/pics/razz.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Bluk: ; 8D9DE38
+ .incbin "data/graphics/berries/pics/bluk.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Nanab: ; 8D9E020
+ .incbin "data/graphics/berries/pics/nanab.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Wepear: ; 8D9E194
+ .incbin "data/graphics/berries/pics/wepear.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Pinap: ; 8D9E35C
+ .incbin "data/graphics/berries/pics/pinap.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Pomeg: ; 8D9E570
+ .incbin "data/graphics/berries/pics/pomeg.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Kelpsy: ; 8D9E718
+ .incbin "data/graphics/berries/pics/kelpsy.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Qualot: ; 8D9E8C0
+ .incbin "data/graphics/berries/pics/qualot.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Hondew: ; 8D9EA8C
+ .incbin "data/graphics/berries/pics/hondew.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Grepa: ; 8D9ECE4
+ .incbin "data/graphics/berries/pics/grepa.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Tamato: ; 8D9EE74
+ .incbin "data/graphics/berries/pics/tamato.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Cornn: ; 8D9F138
+ .incbin "data/graphics/berries/pics/cornn.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Magost: ; 8D9F33C
+ .incbin "data/graphics/berries/pics/magost.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Rabuta: ; 8D9F4E0
+ .incbin "data/graphics/berries/pics/rabuta.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Nomel: ; 8D9F7D4
+ .incbin "data/graphics/berries/pics/nomel.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Spelon: ; 8D9F9B0
+ .incbin "data/graphics/berries/pics/spelon.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Pamtre: ; 8D9FBA0
+ .incbin "data/graphics/berries/pics/pamtre.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Watmel: ; 8D9FDF0
+ .incbin "data/graphics/berries/pics/watmel.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Durin: ; 8DA00D4
+ .incbin "data/graphics/berries/pics/durin.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Belue: ; 8DA04A0
+ .incbin "data/graphics/berries/pics/belue.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Liechi: ; 8DA0778
+ .incbin "data/graphics/berries/pics/liechi.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Ganlon: ; 8DA09D0
+ .incbin "data/graphics/berries/pics/ganlon.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Salac: ; 8DA0B68
+ .incbin "data/graphics/berries/pics/salac.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Petaya: ; 8DA0DAC
+ .incbin "data/graphics/berries/pics/petaya.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Apicot: ; 8DA1054
+ .incbin "data/graphics/berries/pics/apicot.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Lansat: ; 8DA11E4
+ .incbin "data/graphics/berries/pics/lansat.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Starf: ; 8DA13D8
+ .incbin "data/graphics/berries/pics/starf.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPic_Enigma: ; 8DA15A8
+ .incbin "data/graphics/berries/pics/enigma.4bpp.lz"
+
+ .align 2, 0
+
+gBerryPalette_Cheri: ; 8DA17C0
+ .incbin "data/graphics/berries/palettes/cheri.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Oran: ; 8DA17E8
+ .incbin "data/graphics/berries/palettes/oran.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Pecha: ; 8DA1810
+ .incbin "data/graphics/berries/palettes/pecha.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Rawst: ; 8DA1838
+ .incbin "data/graphics/berries/palettes/rawst.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Aspear: ; 8DA1860
+ .incbin "data/graphics/berries/palettes/aspear.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Leppa: ; 8DA1888
+ .incbin "data/graphics/berries/palettes/leppa.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Chesto: ; 8DA18B0
+ .incbin "data/graphics/berries/palettes/chesto.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Persim: ; 8DA18D8
+ .incbin "data/graphics/berries/palettes/persim.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Lum: ; 8DA1900
+ .incbin "data/graphics/berries/palettes/lum.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Sitrus: ; 8DA1928
+ .incbin "data/graphics/berries/palettes/sitrus.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Figy: ; 8DA1950
+ .incbin "data/graphics/berries/palettes/figy.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Wiki: ; 8DA1978
+ .incbin "data/graphics/berries/palettes/wiki.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Mago: ; 8DA19A0
+ .incbin "data/graphics/berries/palettes/mago.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Aguav: ; 8DA19C8
+ .incbin "data/graphics/berries/palettes/aguav.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Iapapa: ; 8DA19F0
+ .incbin "data/graphics/berries/palettes/iapapa.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Razz: ; 8DA1A18
+ .incbin "data/graphics/berries/palettes/razz.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Bluk: ; 8DA1A40
+ .incbin "data/graphics/berries/palettes/bluk.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Nanab: ; 8DA1A68
+ .incbin "data/graphics/berries/palettes/nanab.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Wepear: ; 8DA1A90
+ .incbin "data/graphics/berries/palettes/wepear.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Pinap: ; 8DA1AB8
+ .incbin "data/graphics/berries/palettes/pinap.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Pomeg: ; 8DA1AE0
+ .incbin "data/graphics/berries/palettes/pomeg.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Kelpsy: ; 8DA1B08
+ .incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Qualot: ; 8DA1B30
+ .incbin "data/graphics/berries/palettes/qualot.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Hondew: ; 8DA1B58
+ .incbin "data/graphics/berries/palettes/hondew.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Grepa: ; 8DA1B80
+ .incbin "data/graphics/berries/palettes/grepa.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Tamato: ; 8DA1BA8
+ .incbin "data/graphics/berries/palettes/tamato.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Cornn: ; 8DA1BD0
+ .incbin "data/graphics/berries/palettes/cornn.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Magost: ; 8DA1BF8
+ .incbin "data/graphics/berries/palettes/magost.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Rabuta: ; 8DA1C20
+ .incbin "data/graphics/berries/palettes/rabuta.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Nomel: ; 8DA1C48
+ .incbin "data/graphics/berries/palettes/nomel.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Spelon: ; 8DA1C70
+ .incbin "data/graphics/berries/palettes/spelon.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Pamtre: ; 8DA1C98
+ .incbin "data/graphics/berries/palettes/pamtre.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Watmel: ; 8DA1CC0
+ .incbin "data/graphics/berries/palettes/watmel.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Durin: ; 8DA1CE8
+ .incbin "data/graphics/berries/palettes/durin.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Belue: ; 8DA1D10
+ .incbin "data/graphics/berries/palettes/belue.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Liechi: ; 8DA1D38
+ .incbin "data/graphics/berries/palettes/liechi.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Ganlon: ; 8DA1D60
+ .incbin "data/graphics/berries/palettes/ganlon.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Salac: ; 8DA1D88
+ .incbin "data/graphics/berries/palettes/salac.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Petaya: ; 8DA1DB0
+ .incbin "data/graphics/berries/palettes/petaya.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Apicot: ; 8DA1DD8
+ .incbin "data/graphics/berries/palettes/apicot.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Lansat: ; 8DA1E00
+ .incbin "data/graphics/berries/palettes/lansat.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Starf: ; 8DA1E28
+ .incbin "data/graphics/berries/palettes/starf.gbapal.lz"
+
+ .align 2, 0
+
+gBerryPalette_Enigma: ; 8DA1E50
+ .incbin "data/graphics/berries/palettes/enigma.gbapal.lz"
diff --git a/data/graphics/berries/berry_pic_table.s b/data/graphics/berries/berry_pic_table.s
new file mode 100644
index 000000000..333678ec2
--- /dev/null
+++ b/data/graphics/berries/berry_pic_table.s
@@ -0,0 +1,46 @@
+ .align 2, 0
+
+gBerryPicTable: ; 857FC94
+ .4byte gBerryPic_Cheri, gBerryPalette_Cheri
+ .4byte gBerryPic_Chesto, gBerryPalette_Chesto
+ .4byte gBerryPic_Pecha, gBerryPalette_Pecha
+ .4byte gBerryPic_Rawst, gBerryPalette_Rawst
+ .4byte gBerryPic_Aspear, gBerryPalette_Aspear
+ .4byte gBerryPic_Leppa, gBerryPalette_Leppa
+ .4byte gBerryPic_Oran, gBerryPalette_Oran
+ .4byte gBerryPic_Persim, gBerryPalette_Persim
+ .4byte gBerryPic_Lum, gBerryPalette_Lum
+ .4byte gBerryPic_Sitrus, gBerryPalette_Sitrus
+ .4byte gBerryPic_Figy, gBerryPalette_Figy
+ .4byte gBerryPic_Wiki, gBerryPalette_Wiki
+ .4byte gBerryPic_Mago, gBerryPalette_Mago
+ .4byte gBerryPic_Aguav, gBerryPalette_Aguav
+ .4byte gBerryPic_Iapapa, gBerryPalette_Iapapa
+ .4byte gBerryPic_Razz, gBerryPalette_Razz
+ .4byte gBerryPic_Bluk, gBerryPalette_Bluk
+ .4byte gBerryPic_Nanab, gBerryPalette_Nanab
+ .4byte gBerryPic_Wepear, gBerryPalette_Wepear
+ .4byte gBerryPic_Pinap, gBerryPalette_Pinap
+ .4byte gBerryPic_Pomeg, gBerryPalette_Pomeg
+ .4byte gBerryPic_Kelpsy, gBerryPalette_Kelpsy
+ .4byte gBerryPic_Qualot, gBerryPalette_Qualot
+ .4byte gBerryPic_Hondew, gBerryPalette_Hondew
+ .4byte gBerryPic_Grepa, gBerryPalette_Grepa
+ .4byte gBerryPic_Tamato, gBerryPalette_Tamato
+ .4byte gBerryPic_Cornn, gBerryPalette_Cornn
+ .4byte gBerryPic_Magost, gBerryPalette_Magost
+ .4byte gBerryPic_Rabuta, gBerryPalette_Rabuta
+ .4byte gBerryPic_Nomel, gBerryPalette_Nomel
+ .4byte gBerryPic_Spelon, gBerryPalette_Spelon
+ .4byte gBerryPic_Pamtre, gBerryPalette_Pamtre
+ .4byte gBerryPic_Watmel, gBerryPalette_Watmel
+ .4byte gBerryPic_Durin, gBerryPalette_Durin
+ .4byte gBerryPic_Belue, gBerryPalette_Belue
+ .4byte gBerryPic_Liechi, gBerryPalette_Liechi
+ .4byte gBerryPic_Ganlon, gBerryPalette_Ganlon
+ .4byte gBerryPic_Salac, gBerryPalette_Salac
+ .4byte gBerryPic_Petaya, gBerryPalette_Petaya
+ .4byte gBerryPic_Apicot, gBerryPalette_Apicot
+ .4byte gBerryPic_Lansat, gBerryPalette_Lansat
+ .4byte gBerryPic_Starf, gBerryPalette_Starf
+ .4byte gBerryPic_Enigma, gBerryPalette_Enigma
diff --git a/data/graphics/berries/palettes/aguav.pal b/data/graphics/berries/palettes/aguav.pal
new file mode 100644
index 000000000..fa20daf24
--- /dev/null
+++ b/data/graphics/berries/palettes/aguav.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/apicot.pal b/data/graphics/berries/palettes/apicot.pal
new file mode 100644
index 000000000..82cb76d5a
--- /dev/null
+++ b/data/graphics/berries/palettes/apicot.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/aspear.pal b/data/graphics/berries/palettes/aspear.pal
new file mode 100644
index 000000000..52842fd55
--- /dev/null
+++ b/data/graphics/berries/palettes/aspear.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/belue.pal b/data/graphics/berries/palettes/belue.pal
new file mode 100644
index 000000000..0d348b27e
--- /dev/null
+++ b/data/graphics/berries/palettes/belue.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/bluk.pal b/data/graphics/berries/palettes/bluk.pal
new file mode 100644
index 000000000..88586d6b5
--- /dev/null
+++ b/data/graphics/berries/palettes/bluk.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/cheri.pal b/data/graphics/berries/palettes/cheri.pal
new file mode 100644
index 000000000..01acf52c9
--- /dev/null
+++ b/data/graphics/berries/palettes/cheri.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/chesto.pal b/data/graphics/berries/palettes/chesto.pal
new file mode 100644
index 000000000..3a4e0964f
--- /dev/null
+++ b/data/graphics/berries/palettes/chesto.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/cornn.pal b/data/graphics/berries/palettes/cornn.pal
new file mode 100644
index 000000000..5096389e0
--- /dev/null
+++ b/data/graphics/berries/palettes/cornn.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/durin.pal b/data/graphics/berries/palettes/durin.pal
new file mode 100644
index 000000000..8b636135d
--- /dev/null
+++ b/data/graphics/berries/palettes/durin.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/enigma.pal b/data/graphics/berries/palettes/enigma.pal
new file mode 100644
index 000000000..349ecc7f4
--- /dev/null
+++ b/data/graphics/berries/palettes/enigma.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/figy.pal b/data/graphics/berries/palettes/figy.pal
new file mode 100644
index 000000000..e427ea1e9
--- /dev/null
+++ b/data/graphics/berries/palettes/figy.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/ganlon.pal b/data/graphics/berries/palettes/ganlon.pal
new file mode 100644
index 000000000..381974125
--- /dev/null
+++ b/data/graphics/berries/palettes/ganlon.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/grepa.pal b/data/graphics/berries/palettes/grepa.pal
new file mode 100644
index 000000000..42ff8830f
--- /dev/null
+++ b/data/graphics/berries/palettes/grepa.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/hondew.pal b/data/graphics/berries/palettes/hondew.pal
new file mode 100644
index 000000000..db2739961
--- /dev/null
+++ b/data/graphics/berries/palettes/hondew.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/iapapa.pal b/data/graphics/berries/palettes/iapapa.pal
new file mode 100644
index 000000000..31fac9dde
--- /dev/null
+++ b/data/graphics/berries/palettes/iapapa.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/kelpsy.pal b/data/graphics/berries/palettes/kelpsy.pal
new file mode 100644
index 000000000..67ad7a21c
--- /dev/null
+++ b/data/graphics/berries/palettes/kelpsy.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/lansat.pal b/data/graphics/berries/palettes/lansat.pal
new file mode 100644
index 000000000..66621677d
--- /dev/null
+++ b/data/graphics/berries/palettes/lansat.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/leppa.pal b/data/graphics/berries/palettes/leppa.pal
new file mode 100644
index 000000000..4fab82d6c
--- /dev/null
+++ b/data/graphics/berries/palettes/leppa.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/liechi.pal b/data/graphics/berries/palettes/liechi.pal
new file mode 100644
index 000000000..c12737deb
--- /dev/null
+++ b/data/graphics/berries/palettes/liechi.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/lum.pal b/data/graphics/berries/palettes/lum.pal
new file mode 100644
index 000000000..237ef0dc4
--- /dev/null
+++ b/data/graphics/berries/palettes/lum.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/mago.pal b/data/graphics/berries/palettes/mago.pal
new file mode 100644
index 000000000..4441e4564
--- /dev/null
+++ b/data/graphics/berries/palettes/mago.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/magost.pal b/data/graphics/berries/palettes/magost.pal
new file mode 100644
index 000000000..2393be3d6
--- /dev/null
+++ b/data/graphics/berries/palettes/magost.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/nanab.pal b/data/graphics/berries/palettes/nanab.pal
new file mode 100644
index 000000000..4441e4564
--- /dev/null
+++ b/data/graphics/berries/palettes/nanab.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/nomel.pal b/data/graphics/berries/palettes/nomel.pal
new file mode 100644
index 000000000..6844ddcc3
--- /dev/null
+++ b/data/graphics/berries/palettes/nomel.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/oran.pal b/data/graphics/berries/palettes/oran.pal
new file mode 100644
index 000000000..ac06d0224
--- /dev/null
+++ b/data/graphics/berries/palettes/oran.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/pamtre.pal b/data/graphics/berries/palettes/pamtre.pal
new file mode 100644
index 000000000..fa2cb87a7
--- /dev/null
+++ b/data/graphics/berries/palettes/pamtre.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/pecha.pal b/data/graphics/berries/palettes/pecha.pal
new file mode 100644
index 000000000..b0743cc64
--- /dev/null
+++ b/data/graphics/berries/palettes/pecha.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/persim.pal b/data/graphics/berries/palettes/persim.pal
new file mode 100644
index 000000000..389fac638
--- /dev/null
+++ b/data/graphics/berries/palettes/persim.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/petaya.pal b/data/graphics/berries/palettes/petaya.pal
new file mode 100644
index 000000000..c6eefb076
--- /dev/null
+++ b/data/graphics/berries/palettes/petaya.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/pinap.pal b/data/graphics/berries/palettes/pinap.pal
new file mode 100644
index 000000000..e62f61e20
--- /dev/null
+++ b/data/graphics/berries/palettes/pinap.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/pomeg.pal b/data/graphics/berries/palettes/pomeg.pal
new file mode 100644
index 000000000..01acf52c9
--- /dev/null
+++ b/data/graphics/berries/palettes/pomeg.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/qualot.pal b/data/graphics/berries/palettes/qualot.pal
new file mode 100644
index 000000000..4441e4564
--- /dev/null
+++ b/data/graphics/berries/palettes/qualot.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/rabuta.pal b/data/graphics/berries/palettes/rabuta.pal
new file mode 100644
index 000000000..251beeb2d
--- /dev/null
+++ b/data/graphics/berries/palettes/rabuta.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/rawst.pal b/data/graphics/berries/palettes/rawst.pal
new file mode 100644
index 000000000..a7a4576b5
--- /dev/null
+++ b/data/graphics/berries/palettes/rawst.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/razz.pal b/data/graphics/berries/palettes/razz.pal
new file mode 100644
index 000000000..01acf52c9
--- /dev/null
+++ b/data/graphics/berries/palettes/razz.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/salac.pal b/data/graphics/berries/palettes/salac.pal
new file mode 100644
index 000000000..c0849c6bc
--- /dev/null
+++ b/data/graphics/berries/palettes/salac.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/sitrus.pal b/data/graphics/berries/palettes/sitrus.pal
new file mode 100644
index 000000000..b80481ae1
--- /dev/null
+++ b/data/graphics/berries/palettes/sitrus.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/spelon.pal b/data/graphics/berries/palettes/spelon.pal
new file mode 100644
index 000000000..01acf52c9
--- /dev/null
+++ b/data/graphics/berries/palettes/spelon.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/starf.pal b/data/graphics/berries/palettes/starf.pal
new file mode 100644
index 000000000..68525b6a6
--- /dev/null
+++ b/data/graphics/berries/palettes/starf.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/tamato.pal b/data/graphics/berries/palettes/tamato.pal
new file mode 100644
index 000000000..01acf52c9
--- /dev/null
+++ b/data/graphics/berries/palettes/tamato.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/watmel.pal b/data/graphics/berries/palettes/watmel.pal
new file mode 100644
index 000000000..786c0a848
--- /dev/null
+++ b/data/graphics/berries/palettes/watmel.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/wepear.pal b/data/graphics/berries/palettes/wepear.pal
new file mode 100644
index 000000000..dac1511ff
--- /dev/null
+++ b/data/graphics/berries/palettes/wepear.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/palettes/wiki.pal b/data/graphics/berries/palettes/wiki.pal
new file mode 100644
index 000000000..88586d6b5
--- /dev/null
+++ b/data/graphics/berries/palettes/wiki.pal
@@ -0,0 +1,19 @@
+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/data/graphics/berries/pics/aguav.png b/data/graphics/berries/pics/aguav.png
new file mode 100644
index 000000000..0661fe8d3
--- /dev/null
+++ b/data/graphics/berries/pics/aguav.png
Binary files differ
diff --git a/data/graphics/berries/pics/apicot.png b/data/graphics/berries/pics/apicot.png
new file mode 100644
index 000000000..b7098fc90
--- /dev/null
+++ b/data/graphics/berries/pics/apicot.png
Binary files differ
diff --git a/data/graphics/berries/pics/aspear.png b/data/graphics/berries/pics/aspear.png
new file mode 100644
index 000000000..b5e2c5061
--- /dev/null
+++ b/data/graphics/berries/pics/aspear.png
Binary files differ
diff --git a/data/graphics/berries/pics/belue.png b/data/graphics/berries/pics/belue.png
new file mode 100644
index 000000000..81ddaa9bb
--- /dev/null
+++ b/data/graphics/berries/pics/belue.png
Binary files differ
diff --git a/data/graphics/berries/pics/bluk.png b/data/graphics/berries/pics/bluk.png
new file mode 100644
index 000000000..fc7e6c128
--- /dev/null
+++ b/data/graphics/berries/pics/bluk.png
Binary files differ
diff --git a/data/graphics/berries/pics/cheri.png b/data/graphics/berries/pics/cheri.png
new file mode 100644
index 000000000..f70a1ad74
--- /dev/null
+++ b/data/graphics/berries/pics/cheri.png
Binary files differ
diff --git a/data/graphics/berries/pics/chesto.png b/data/graphics/berries/pics/chesto.png
new file mode 100644
index 000000000..db1fe9e73
--- /dev/null
+++ b/data/graphics/berries/pics/chesto.png
Binary files differ
diff --git a/data/graphics/berries/pics/cornn.png b/data/graphics/berries/pics/cornn.png
new file mode 100644
index 000000000..e124fc599
--- /dev/null
+++ b/data/graphics/berries/pics/cornn.png
Binary files differ
diff --git a/data/graphics/berries/pics/durin.png b/data/graphics/berries/pics/durin.png
new file mode 100644
index 000000000..5bbb97e1f
--- /dev/null
+++ b/data/graphics/berries/pics/durin.png
Binary files differ
diff --git a/data/graphics/berries/pics/enigma.png b/data/graphics/berries/pics/enigma.png
new file mode 100644
index 000000000..af369550a
--- /dev/null
+++ b/data/graphics/berries/pics/enigma.png
Binary files differ
diff --git a/data/graphics/berries/pics/figy.png b/data/graphics/berries/pics/figy.png
new file mode 100644
index 000000000..9ec8425d5
--- /dev/null
+++ b/data/graphics/berries/pics/figy.png
Binary files differ
diff --git a/data/graphics/berries/pics/ganlon.png b/data/graphics/berries/pics/ganlon.png
new file mode 100644
index 000000000..ec5e38319
--- /dev/null
+++ b/data/graphics/berries/pics/ganlon.png
Binary files differ
diff --git a/data/graphics/berries/pics/grepa.png b/data/graphics/berries/pics/grepa.png
new file mode 100644
index 000000000..136a86df2
--- /dev/null
+++ b/data/graphics/berries/pics/grepa.png
Binary files differ
diff --git a/data/graphics/berries/pics/hondew.png b/data/graphics/berries/pics/hondew.png
new file mode 100644
index 000000000..ab1add813
--- /dev/null
+++ b/data/graphics/berries/pics/hondew.png
Binary files differ
diff --git a/data/graphics/berries/pics/iapapa.png b/data/graphics/berries/pics/iapapa.png
new file mode 100644
index 000000000..243e23d29
--- /dev/null
+++ b/data/graphics/berries/pics/iapapa.png
Binary files differ
diff --git a/data/graphics/berries/pics/kelpsy.png b/data/graphics/berries/pics/kelpsy.png
new file mode 100644
index 000000000..17b509c04
--- /dev/null
+++ b/data/graphics/berries/pics/kelpsy.png
Binary files differ
diff --git a/data/graphics/berries/pics/lansat.png b/data/graphics/berries/pics/lansat.png
new file mode 100644
index 000000000..c63a590ec
--- /dev/null
+++ b/data/graphics/berries/pics/lansat.png
Binary files differ
diff --git a/data/graphics/berries/pics/leppa.png b/data/graphics/berries/pics/leppa.png
new file mode 100644
index 000000000..228bc9c3a
--- /dev/null
+++ b/data/graphics/berries/pics/leppa.png
Binary files differ
diff --git a/data/graphics/berries/pics/liechi.png b/data/graphics/berries/pics/liechi.png
new file mode 100644
index 000000000..dbfea58ca
--- /dev/null
+++ b/data/graphics/berries/pics/liechi.png
Binary files differ
diff --git a/data/graphics/berries/pics/lum.png b/data/graphics/berries/pics/lum.png
new file mode 100644
index 000000000..52a97fe4b
--- /dev/null
+++ b/data/graphics/berries/pics/lum.png
Binary files differ
diff --git a/data/graphics/berries/pics/mago.png b/data/graphics/berries/pics/mago.png
new file mode 100644
index 000000000..b83c4cc3e
--- /dev/null
+++ b/data/graphics/berries/pics/mago.png
Binary files differ
diff --git a/data/graphics/berries/pics/magost.png b/data/graphics/berries/pics/magost.png
new file mode 100644
index 000000000..d3332bc26
--- /dev/null
+++ b/data/graphics/berries/pics/magost.png
Binary files differ
diff --git a/data/graphics/berries/pics/nanab.png b/data/graphics/berries/pics/nanab.png
new file mode 100644
index 000000000..88fa1368e
--- /dev/null
+++ b/data/graphics/berries/pics/nanab.png
Binary files differ
diff --git a/data/graphics/berries/pics/nomel.png b/data/graphics/berries/pics/nomel.png
new file mode 100644
index 000000000..828674f62
--- /dev/null
+++ b/data/graphics/berries/pics/nomel.png
Binary files differ
diff --git a/data/graphics/berries/pics/oran.png b/data/graphics/berries/pics/oran.png
new file mode 100644
index 000000000..bc9517fac
--- /dev/null
+++ b/data/graphics/berries/pics/oran.png
Binary files differ
diff --git a/data/graphics/berries/pics/pamtre.png b/data/graphics/berries/pics/pamtre.png
new file mode 100644
index 000000000..d066ab74c
--- /dev/null
+++ b/data/graphics/berries/pics/pamtre.png
Binary files differ
diff --git a/data/graphics/berries/pics/pecha.png b/data/graphics/berries/pics/pecha.png
new file mode 100644
index 000000000..76543a044
--- /dev/null
+++ b/data/graphics/berries/pics/pecha.png
Binary files differ
diff --git a/data/graphics/berries/pics/persim.png b/data/graphics/berries/pics/persim.png
new file mode 100644
index 000000000..6c0ba368a
--- /dev/null
+++ b/data/graphics/berries/pics/persim.png
Binary files differ
diff --git a/data/graphics/berries/pics/petaya.png b/data/graphics/berries/pics/petaya.png
new file mode 100644
index 000000000..04198ba39
--- /dev/null
+++ b/data/graphics/berries/pics/petaya.png
Binary files differ
diff --git a/data/graphics/berries/pics/pinap.png b/data/graphics/berries/pics/pinap.png
new file mode 100644
index 000000000..71144554a
--- /dev/null
+++ b/data/graphics/berries/pics/pinap.png
Binary files differ
diff --git a/data/graphics/berries/pics/pomeg.png b/data/graphics/berries/pics/pomeg.png
new file mode 100644
index 000000000..394f8558a
--- /dev/null
+++ b/data/graphics/berries/pics/pomeg.png
Binary files differ
diff --git a/data/graphics/berries/pics/qualot.png b/data/graphics/berries/pics/qualot.png
new file mode 100644
index 000000000..15f51d4d8
--- /dev/null
+++ b/data/graphics/berries/pics/qualot.png
Binary files differ
diff --git a/data/graphics/berries/pics/rabuta.png b/data/graphics/berries/pics/rabuta.png
new file mode 100644
index 000000000..cf620f906
--- /dev/null
+++ b/data/graphics/berries/pics/rabuta.png
Binary files differ
diff --git a/data/graphics/berries/pics/rawst.png b/data/graphics/berries/pics/rawst.png
new file mode 100644
index 000000000..c0e3e23a6
--- /dev/null
+++ b/data/graphics/berries/pics/rawst.png
Binary files differ
diff --git a/data/graphics/berries/pics/razz.png b/data/graphics/berries/pics/razz.png
new file mode 100644
index 000000000..5c415012d
--- /dev/null
+++ b/data/graphics/berries/pics/razz.png
Binary files differ
diff --git a/data/graphics/berries/pics/salac.png b/data/graphics/berries/pics/salac.png
new file mode 100644
index 000000000..557ab1742
--- /dev/null
+++ b/data/graphics/berries/pics/salac.png
Binary files differ
diff --git a/data/graphics/berries/pics/sitrus.png b/data/graphics/berries/pics/sitrus.png
new file mode 100644
index 000000000..d98327ae1
--- /dev/null
+++ b/data/graphics/berries/pics/sitrus.png
Binary files differ
diff --git a/data/graphics/berries/pics/spelon.png b/data/graphics/berries/pics/spelon.png
new file mode 100644
index 000000000..996f743db
--- /dev/null
+++ b/data/graphics/berries/pics/spelon.png
Binary files differ
diff --git a/data/graphics/berries/pics/starf.png b/data/graphics/berries/pics/starf.png
new file mode 100644
index 000000000..8cca44ee2
--- /dev/null
+++ b/data/graphics/berries/pics/starf.png
Binary files differ
diff --git a/data/graphics/berries/pics/tamato.png b/data/graphics/berries/pics/tamato.png
new file mode 100644
index 000000000..9f2c14d4a
--- /dev/null
+++ b/data/graphics/berries/pics/tamato.png
Binary files differ
diff --git a/data/graphics/berries/pics/watmel.png b/data/graphics/berries/pics/watmel.png
new file mode 100644
index 000000000..6da099327
--- /dev/null
+++ b/data/graphics/berries/pics/watmel.png
Binary files differ
diff --git a/data/graphics/berries/pics/wepear.png b/data/graphics/berries/pics/wepear.png
new file mode 100644
index 000000000..468231651
--- /dev/null
+++ b/data/graphics/berries/pics/wepear.png
Binary files differ
diff --git a/data/graphics/berries/pics/wiki.png b/data/graphics/berries/pics/wiki.png
new file mode 100644
index 000000000..d13c76f5b
--- /dev/null
+++ b/data/graphics/berries/pics/wiki.png
Binary files differ