From 0a89eb1e664e2575ef8f5dca1be3493df24efa64 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 3 Sep 2016 10:38:37 -0700 Subject: [PATCH] move berry graphics --- data/graphics/berries/berry_graphics.s | 172 +++++++++--------- .../berries/palettes/aguav.pal | 0 .../berries/palettes/apicot.pal | 0 .../berries/palettes/aspear.pal | 0 .../berries/palettes/belue.pal | 0 .../berries/palettes/bluk.pal | 0 .../berries/palettes/cheri.pal | 0 .../berries/palettes/chesto.pal | 0 .../berries/palettes/cornn.pal | 0 .../berries/palettes/durin.pal | 0 .../berries/palettes/enigma.pal | 0 .../berries/palettes/figy.pal | 0 .../berries/palettes/ganlon.pal | 0 .../berries/palettes/grepa.pal | 0 .../berries/palettes/hondew.pal | 0 .../berries/palettes/iapapa.pal | 0 .../berries/palettes/kelpsy.pal | 0 .../berries/palettes/lansat.pal | 0 .../berries/palettes/leppa.pal | 0 .../berries/palettes/liechi.pal | 0 .../berries/palettes/lum.pal | 0 .../berries/palettes/mago.pal | 0 .../berries/palettes/magost.pal | 0 .../berries/palettes/nanab.pal | 0 .../berries/palettes/nomel.pal | 0 .../berries/palettes/oran.pal | 0 .../berries/palettes/pamtre.pal | 0 .../berries/palettes/pecha.pal | 0 .../berries/palettes/persim.pal | 0 .../berries/palettes/petaya.pal | 0 .../berries/palettes/pinap.pal | 0 .../berries/palettes/pomeg.pal | 0 .../berries/palettes/qualot.pal | 0 .../berries/palettes/rabuta.pal | 0 .../berries/palettes/rawst.pal | 0 .../berries/palettes/razz.pal | 0 .../berries/palettes/salac.pal | 0 .../berries/palettes/sitrus.pal | 0 .../berries/palettes/spelon.pal | 0 .../berries/palettes/starf.pal | 0 .../berries/palettes/tamato.pal | 0 .../berries/palettes/watmel.pal | 0 .../berries/palettes/wepear.pal | 0 .../berries/palettes/wiki.pal | 0 .../berries/pics/aguav.png | Bin .../berries/pics/apicot.png | Bin .../berries/pics/aspear.png | Bin .../berries/pics/belue.png | Bin .../berries/pics/bluk.png | Bin .../berries/pics/cheri.png | Bin .../berries/pics/chesto.png | Bin .../berries/pics/cornn.png | Bin .../berries/pics/durin.png | Bin .../berries/pics/enigma.png | Bin .../berries/pics/figy.png | Bin .../berries/pics/ganlon.png | Bin .../berries/pics/grepa.png | Bin .../berries/pics/hondew.png | Bin .../berries/pics/iapapa.png | Bin .../berries/pics/kelpsy.png | Bin .../berries/pics/lansat.png | Bin .../berries/pics/leppa.png | Bin .../berries/pics/liechi.png | Bin .../berries/pics/lum.png | Bin .../berries/pics/mago.png | Bin .../berries/pics/magost.png | Bin .../berries/pics/nanab.png | Bin .../berries/pics/nomel.png | Bin .../berries/pics/oran.png | Bin .../berries/pics/pamtre.png | Bin .../berries/pics/pecha.png | Bin .../berries/pics/persim.png | Bin .../berries/pics/petaya.png | Bin .../berries/pics/pinap.png | Bin .../berries/pics/pomeg.png | Bin .../berries/pics/qualot.png | Bin .../berries/pics/rabuta.png | Bin .../berries/pics/rawst.png | Bin .../berries/pics/razz.png | Bin .../berries/pics/salac.png | Bin .../berries/pics/sitrus.png | Bin .../berries/pics/spelon.png | Bin .../berries/pics/starf.png | Bin .../berries/pics/tamato.png | Bin .../berries/pics/watmel.png | Bin .../berries/pics/wepear.png | Bin .../berries/pics/wiki.png | Bin 87 files changed, 86 insertions(+), 86 deletions(-) rename {data/graphics => graphics}/berries/palettes/aguav.pal (100%) rename {data/graphics => graphics}/berries/palettes/apicot.pal (100%) rename {data/graphics => graphics}/berries/palettes/aspear.pal (100%) rename {data/graphics => graphics}/berries/palettes/belue.pal (100%) rename {data/graphics => graphics}/berries/palettes/bluk.pal (100%) rename {data/graphics => graphics}/berries/palettes/cheri.pal (100%) rename {data/graphics => graphics}/berries/palettes/chesto.pal (100%) rename {data/graphics => graphics}/berries/palettes/cornn.pal (100%) rename {data/graphics => graphics}/berries/palettes/durin.pal (100%) rename {data/graphics => graphics}/berries/palettes/enigma.pal (100%) rename {data/graphics => graphics}/berries/palettes/figy.pal (100%) rename {data/graphics => graphics}/berries/palettes/ganlon.pal (100%) rename {data/graphics => graphics}/berries/palettes/grepa.pal (100%) rename {data/graphics => graphics}/berries/palettes/hondew.pal (100%) rename {data/graphics => graphics}/berries/palettes/iapapa.pal (100%) rename {data/graphics => graphics}/berries/palettes/kelpsy.pal (100%) rename {data/graphics => graphics}/berries/palettes/lansat.pal (100%) rename {data/graphics => graphics}/berries/palettes/leppa.pal (100%) rename {data/graphics => graphics}/berries/palettes/liechi.pal (100%) rename {data/graphics => graphics}/berries/palettes/lum.pal (100%) rename {data/graphics => graphics}/berries/palettes/mago.pal (100%) rename {data/graphics => graphics}/berries/palettes/magost.pal (100%) rename {data/graphics => graphics}/berries/palettes/nanab.pal (100%) rename {data/graphics => graphics}/berries/palettes/nomel.pal (100%) rename {data/graphics => graphics}/berries/palettes/oran.pal (100%) rename {data/graphics => graphics}/berries/palettes/pamtre.pal (100%) rename {data/graphics => graphics}/berries/palettes/pecha.pal (100%) rename {data/graphics => graphics}/berries/palettes/persim.pal (100%) rename {data/graphics => graphics}/berries/palettes/petaya.pal (100%) rename {data/graphics => graphics}/berries/palettes/pinap.pal (100%) rename {data/graphics => graphics}/berries/palettes/pomeg.pal (100%) rename {data/graphics => graphics}/berries/palettes/qualot.pal (100%) rename {data/graphics => graphics}/berries/palettes/rabuta.pal (100%) rename {data/graphics => graphics}/berries/palettes/rawst.pal (100%) rename {data/graphics => graphics}/berries/palettes/razz.pal (100%) rename {data/graphics => graphics}/berries/palettes/salac.pal (100%) rename {data/graphics => graphics}/berries/palettes/sitrus.pal (100%) rename {data/graphics => graphics}/berries/palettes/spelon.pal (100%) rename {data/graphics => graphics}/berries/palettes/starf.pal (100%) rename {data/graphics => graphics}/berries/palettes/tamato.pal (100%) rename {data/graphics => graphics}/berries/palettes/watmel.pal (100%) rename {data/graphics => graphics}/berries/palettes/wepear.pal (100%) rename {data/graphics => graphics}/berries/palettes/wiki.pal (100%) rename {data/graphics => graphics}/berries/pics/aguav.png (100%) rename {data/graphics => graphics}/berries/pics/apicot.png (100%) rename {data/graphics => graphics}/berries/pics/aspear.png (100%) rename {data/graphics => graphics}/berries/pics/belue.png (100%) rename {data/graphics => graphics}/berries/pics/bluk.png (100%) rename {data/graphics => graphics}/berries/pics/cheri.png (100%) rename {data/graphics => graphics}/berries/pics/chesto.png (100%) rename {data/graphics => graphics}/berries/pics/cornn.png (100%) rename {data/graphics => graphics}/berries/pics/durin.png (100%) rename {data/graphics => graphics}/berries/pics/enigma.png (100%) rename {data/graphics => graphics}/berries/pics/figy.png (100%) rename {data/graphics => graphics}/berries/pics/ganlon.png (100%) rename {data/graphics => graphics}/berries/pics/grepa.png (100%) rename {data/graphics => graphics}/berries/pics/hondew.png (100%) rename {data/graphics => graphics}/berries/pics/iapapa.png (100%) rename {data/graphics => graphics}/berries/pics/kelpsy.png (100%) rename {data/graphics => graphics}/berries/pics/lansat.png (100%) rename {data/graphics => graphics}/berries/pics/leppa.png (100%) rename {data/graphics => graphics}/berries/pics/liechi.png (100%) rename {data/graphics => graphics}/berries/pics/lum.png (100%) rename {data/graphics => graphics}/berries/pics/mago.png (100%) rename {data/graphics => graphics}/berries/pics/magost.png (100%) rename {data/graphics => graphics}/berries/pics/nanab.png (100%) rename {data/graphics => graphics}/berries/pics/nomel.png (100%) rename {data/graphics => graphics}/berries/pics/oran.png (100%) rename {data/graphics => graphics}/berries/pics/pamtre.png (100%) rename {data/graphics => graphics}/berries/pics/pecha.png (100%) rename {data/graphics => graphics}/berries/pics/persim.png (100%) rename {data/graphics => graphics}/berries/pics/petaya.png (100%) rename {data/graphics => graphics}/berries/pics/pinap.png (100%) rename {data/graphics => graphics}/berries/pics/pomeg.png (100%) rename {data/graphics => graphics}/berries/pics/qualot.png (100%) rename {data/graphics => graphics}/berries/pics/rabuta.png (100%) rename {data/graphics => graphics}/berries/pics/rawst.png (100%) rename {data/graphics => graphics}/berries/pics/razz.png (100%) rename {data/graphics => graphics}/berries/pics/salac.png (100%) rename {data/graphics => graphics}/berries/pics/sitrus.png (100%) rename {data/graphics => graphics}/berries/pics/spelon.png (100%) rename {data/graphics => graphics}/berries/pics/starf.png (100%) rename {data/graphics => graphics}/berries/pics/tamato.png (100%) rename {data/graphics => graphics}/berries/pics/watmel.png (100%) rename {data/graphics => graphics}/berries/pics/wepear.png (100%) rename {data/graphics => graphics}/berries/pics/wiki.png (100%) diff --git a/data/graphics/berries/berry_graphics.s b/data/graphics/berries/berry_graphics.s index ee9ca7c8f..c178b1478 100644 --- a/data/graphics/berries/berry_graphics.s +++ b/data/graphics/berries/berry_graphics.s @@ -1,429 +1,429 @@ .align 2, 0 gBerryPic_Cheri:: @ 8D9C3A8 - .incbin "data/graphics/berries/pics/cheri.4bpp.lz" + .incbin "graphics/berries/pics/cheri.4bpp.lz" .align 2, 0 gBerryPic_Oran:: @ 8D9C4FC - .incbin "data/graphics/berries/pics/oran.4bpp.lz" + .incbin "graphics/berries/pics/oran.4bpp.lz" .align 2, 0 gBerryPic_Pecha:: @ 8D9C670 - .incbin "data/graphics/berries/pics/pecha.4bpp.lz" + .incbin "graphics/berries/pics/pecha.4bpp.lz" .align 2, 0 gBerryPic_Rawst:: @ 8D9C7E4 - .incbin "data/graphics/berries/pics/rawst.4bpp.lz" + .incbin "graphics/berries/pics/rawst.4bpp.lz" .align 2, 0 gBerryPic_Aspear:: @ 8D9C97C - .incbin "data/graphics/berries/pics/aspear.4bpp.lz" + .incbin "graphics/berries/pics/aspear.4bpp.lz" .align 2, 0 gBerryPic_Leppa:: @ 8D9CB24 - .incbin "data/graphics/berries/pics/leppa.4bpp.lz" + .incbin "graphics/berries/pics/leppa.4bpp.lz" .align 2, 0 gBerryPic_Chesto:: @ 8D9CC94 - .incbin "data/graphics/berries/pics/chesto.4bpp.lz" + .incbin "graphics/berries/pics/chesto.4bpp.lz" .align 2, 0 gBerryPic_Persim:: @ 8D9CE78 - .incbin "data/graphics/berries/pics/persim.4bpp.lz" + .incbin "graphics/berries/pics/persim.4bpp.lz" .align 2, 0 gBerryPic_Lum:: @ 8D9CFC8 - .incbin "data/graphics/berries/pics/lum.4bpp.lz" + .incbin "graphics/berries/pics/lum.4bpp.lz" .align 2, 0 gBerryPic_Sitrus:: @ 8D9D0E4 - .incbin "data/graphics/berries/pics/sitrus.4bpp.lz" + .incbin "graphics/berries/pics/sitrus.4bpp.lz" .align 2, 0 gBerryPic_Figy:: @ 8D9D288 - .incbin "data/graphics/berries/pics/figy.4bpp.lz" + .incbin "graphics/berries/pics/figy.4bpp.lz" .align 2, 0 gBerryPic_Wiki:: @ 8D9D434 - .incbin "data/graphics/berries/pics/wiki.4bpp.lz" + .incbin "graphics/berries/pics/wiki.4bpp.lz" .align 2, 0 gBerryPic_Mago:: @ 8D9D628 - .incbin "data/graphics/berries/pics/mago.4bpp.lz" + .incbin "graphics/berries/pics/mago.4bpp.lz" .align 2, 0 gBerryPic_Aguav:: @ 8D9D7DC - .incbin "data/graphics/berries/pics/aguav.4bpp.lz" + .incbin "graphics/berries/pics/aguav.4bpp.lz" .align 2, 0 gBerryPic_Iapapa:: @ 8D9D950 - .incbin "data/graphics/berries/pics/iapapa.4bpp.lz" + .incbin "graphics/berries/pics/iapapa.4bpp.lz" .align 2, 0 gBerryPic_Razz:: @ 8D9DC08 - .incbin "data/graphics/berries/pics/razz.4bpp.lz" + .incbin "graphics/berries/pics/razz.4bpp.lz" .align 2, 0 gBerryPic_Bluk:: @ 8D9DE38 - .incbin "data/graphics/berries/pics/bluk.4bpp.lz" + .incbin "graphics/berries/pics/bluk.4bpp.lz" .align 2, 0 gBerryPic_Nanab:: @ 8D9E020 - .incbin "data/graphics/berries/pics/nanab.4bpp.lz" + .incbin "graphics/berries/pics/nanab.4bpp.lz" .align 2, 0 gBerryPic_Wepear:: @ 8D9E194 - .incbin "data/graphics/berries/pics/wepear.4bpp.lz" + .incbin "graphics/berries/pics/wepear.4bpp.lz" .align 2, 0 gBerryPic_Pinap:: @ 8D9E35C - .incbin "data/graphics/berries/pics/pinap.4bpp.lz" + .incbin "graphics/berries/pics/pinap.4bpp.lz" .align 2, 0 gBerryPic_Pomeg:: @ 8D9E570 - .incbin "data/graphics/berries/pics/pomeg.4bpp.lz" + .incbin "graphics/berries/pics/pomeg.4bpp.lz" .align 2, 0 gBerryPic_Kelpsy:: @ 8D9E718 - .incbin "data/graphics/berries/pics/kelpsy.4bpp.lz" + .incbin "graphics/berries/pics/kelpsy.4bpp.lz" .align 2, 0 gBerryPic_Qualot:: @ 8D9E8C0 - .incbin "data/graphics/berries/pics/qualot.4bpp.lz" + .incbin "graphics/berries/pics/qualot.4bpp.lz" .align 2, 0 gBerryPic_Hondew:: @ 8D9EA8C - .incbin "data/graphics/berries/pics/hondew.4bpp.lz" + .incbin "graphics/berries/pics/hondew.4bpp.lz" .align 2, 0 gBerryPic_Grepa:: @ 8D9ECE4 - .incbin "data/graphics/berries/pics/grepa.4bpp.lz" + .incbin "graphics/berries/pics/grepa.4bpp.lz" .align 2, 0 gBerryPic_Tamato:: @ 8D9EE74 - .incbin "data/graphics/berries/pics/tamato.4bpp.lz" + .incbin "graphics/berries/pics/tamato.4bpp.lz" .align 2, 0 gBerryPic_Cornn:: @ 8D9F138 - .incbin "data/graphics/berries/pics/cornn.4bpp.lz" + .incbin "graphics/berries/pics/cornn.4bpp.lz" .align 2, 0 gBerryPic_Magost:: @ 8D9F33C - .incbin "data/graphics/berries/pics/magost.4bpp.lz" + .incbin "graphics/berries/pics/magost.4bpp.lz" .align 2, 0 gBerryPic_Rabuta:: @ 8D9F4E0 - .incbin "data/graphics/berries/pics/rabuta.4bpp.lz" + .incbin "graphics/berries/pics/rabuta.4bpp.lz" .align 2, 0 gBerryPic_Nomel:: @ 8D9F7D4 - .incbin "data/graphics/berries/pics/nomel.4bpp.lz" + .incbin "graphics/berries/pics/nomel.4bpp.lz" .align 2, 0 gBerryPic_Spelon:: @ 8D9F9B0 - .incbin "data/graphics/berries/pics/spelon.4bpp.lz" + .incbin "graphics/berries/pics/spelon.4bpp.lz" .align 2, 0 gBerryPic_Pamtre:: @ 8D9FBA0 - .incbin "data/graphics/berries/pics/pamtre.4bpp.lz" + .incbin "graphics/berries/pics/pamtre.4bpp.lz" .align 2, 0 gBerryPic_Watmel:: @ 8D9FDF0 - .incbin "data/graphics/berries/pics/watmel.4bpp.lz" + .incbin "graphics/berries/pics/watmel.4bpp.lz" .align 2, 0 gBerryPic_Durin:: @ 8DA00D4 - .incbin "data/graphics/berries/pics/durin.4bpp.lz" + .incbin "graphics/berries/pics/durin.4bpp.lz" .align 2, 0 gBerryPic_Belue:: @ 8DA04A0 - .incbin "data/graphics/berries/pics/belue.4bpp.lz" + .incbin "graphics/berries/pics/belue.4bpp.lz" .align 2, 0 gBerryPic_Liechi:: @ 8DA0778 - .incbin "data/graphics/berries/pics/liechi.4bpp.lz" + .incbin "graphics/berries/pics/liechi.4bpp.lz" .align 2, 0 gBerryPic_Ganlon:: @ 8DA09D0 - .incbin "data/graphics/berries/pics/ganlon.4bpp.lz" + .incbin "graphics/berries/pics/ganlon.4bpp.lz" .align 2, 0 gBerryPic_Salac:: @ 8DA0B68 - .incbin "data/graphics/berries/pics/salac.4bpp.lz" + .incbin "graphics/berries/pics/salac.4bpp.lz" .align 2, 0 gBerryPic_Petaya:: @ 8DA0DAC - .incbin "data/graphics/berries/pics/petaya.4bpp.lz" + .incbin "graphics/berries/pics/petaya.4bpp.lz" .align 2, 0 gBerryPic_Apicot:: @ 8DA1054 - .incbin "data/graphics/berries/pics/apicot.4bpp.lz" + .incbin "graphics/berries/pics/apicot.4bpp.lz" .align 2, 0 gBerryPic_Lansat:: @ 8DA11E4 - .incbin "data/graphics/berries/pics/lansat.4bpp.lz" + .incbin "graphics/berries/pics/lansat.4bpp.lz" .align 2, 0 gBerryPic_Starf:: @ 8DA13D8 - .incbin "data/graphics/berries/pics/starf.4bpp.lz" + .incbin "graphics/berries/pics/starf.4bpp.lz" .align 2, 0 gBerryPic_Enigma:: @ 8DA15A8 - .incbin "data/graphics/berries/pics/enigma.4bpp.lz" + .incbin "graphics/berries/pics/enigma.4bpp.lz" .align 2, 0 gBerryPalette_Cheri:: @ 8DA17C0 - .incbin "data/graphics/berries/palettes/cheri.gbapal.lz" + .incbin "graphics/berries/palettes/cheri.gbapal.lz" .align 2, 0 gBerryPalette_Oran:: @ 8DA17E8 - .incbin "data/graphics/berries/palettes/oran.gbapal.lz" + .incbin "graphics/berries/palettes/oran.gbapal.lz" .align 2, 0 gBerryPalette_Pecha:: @ 8DA1810 - .incbin "data/graphics/berries/palettes/pecha.gbapal.lz" + .incbin "graphics/berries/palettes/pecha.gbapal.lz" .align 2, 0 gBerryPalette_Rawst:: @ 8DA1838 - .incbin "data/graphics/berries/palettes/rawst.gbapal.lz" + .incbin "graphics/berries/palettes/rawst.gbapal.lz" .align 2, 0 gBerryPalette_Aspear:: @ 8DA1860 - .incbin "data/graphics/berries/palettes/aspear.gbapal.lz" + .incbin "graphics/berries/palettes/aspear.gbapal.lz" .align 2, 0 gBerryPalette_Leppa:: @ 8DA1888 - .incbin "data/graphics/berries/palettes/leppa.gbapal.lz" + .incbin "graphics/berries/palettes/leppa.gbapal.lz" .align 2, 0 gBerryPalette_Chesto:: @ 8DA18B0 - .incbin "data/graphics/berries/palettes/chesto.gbapal.lz" + .incbin "graphics/berries/palettes/chesto.gbapal.lz" .align 2, 0 gBerryPalette_Persim:: @ 8DA18D8 - .incbin "data/graphics/berries/palettes/persim.gbapal.lz" + .incbin "graphics/berries/palettes/persim.gbapal.lz" .align 2, 0 gBerryPalette_Lum:: @ 8DA1900 - .incbin "data/graphics/berries/palettes/lum.gbapal.lz" + .incbin "graphics/berries/palettes/lum.gbapal.lz" .align 2, 0 gBerryPalette_Sitrus:: @ 8DA1928 - .incbin "data/graphics/berries/palettes/sitrus.gbapal.lz" + .incbin "graphics/berries/palettes/sitrus.gbapal.lz" .align 2, 0 gBerryPalette_Figy:: @ 8DA1950 - .incbin "data/graphics/berries/palettes/figy.gbapal.lz" + .incbin "graphics/berries/palettes/figy.gbapal.lz" .align 2, 0 gBerryPalette_Wiki:: @ 8DA1978 - .incbin "data/graphics/berries/palettes/wiki.gbapal.lz" + .incbin "graphics/berries/palettes/wiki.gbapal.lz" .align 2, 0 gBerryPalette_Mago:: @ 8DA19A0 - .incbin "data/graphics/berries/palettes/mago.gbapal.lz" + .incbin "graphics/berries/palettes/mago.gbapal.lz" .align 2, 0 gBerryPalette_Aguav:: @ 8DA19C8 - .incbin "data/graphics/berries/palettes/aguav.gbapal.lz" + .incbin "graphics/berries/palettes/aguav.gbapal.lz" .align 2, 0 gBerryPalette_Iapapa:: @ 8DA19F0 - .incbin "data/graphics/berries/palettes/iapapa.gbapal.lz" + .incbin "graphics/berries/palettes/iapapa.gbapal.lz" .align 2, 0 gBerryPalette_Razz:: @ 8DA1A18 - .incbin "data/graphics/berries/palettes/razz.gbapal.lz" + .incbin "graphics/berries/palettes/razz.gbapal.lz" .align 2, 0 gBerryPalette_Bluk:: @ 8DA1A40 - .incbin "data/graphics/berries/palettes/bluk.gbapal.lz" + .incbin "graphics/berries/palettes/bluk.gbapal.lz" .align 2, 0 gBerryPalette_Nanab:: @ 8DA1A68 - .incbin "data/graphics/berries/palettes/nanab.gbapal.lz" + .incbin "graphics/berries/palettes/nanab.gbapal.lz" .align 2, 0 gBerryPalette_Wepear:: @ 8DA1A90 - .incbin "data/graphics/berries/palettes/wepear.gbapal.lz" + .incbin "graphics/berries/palettes/wepear.gbapal.lz" .align 2, 0 gBerryPalette_Pinap:: @ 8DA1AB8 - .incbin "data/graphics/berries/palettes/pinap.gbapal.lz" + .incbin "graphics/berries/palettes/pinap.gbapal.lz" .align 2, 0 gBerryPalette_Pomeg:: @ 8DA1AE0 - .incbin "data/graphics/berries/palettes/pomeg.gbapal.lz" + .incbin "graphics/berries/palettes/pomeg.gbapal.lz" .align 2, 0 gBerryPalette_Kelpsy:: @ 8DA1B08 - .incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz" + .incbin "graphics/berries/palettes/kelpsy.gbapal.lz" .align 2, 0 gBerryPalette_Qualot:: @ 8DA1B30 - .incbin "data/graphics/berries/palettes/qualot.gbapal.lz" + .incbin "graphics/berries/palettes/qualot.gbapal.lz" .align 2, 0 gBerryPalette_Hondew:: @ 8DA1B58 - .incbin "data/graphics/berries/palettes/hondew.gbapal.lz" + .incbin "graphics/berries/palettes/hondew.gbapal.lz" .align 2, 0 gBerryPalette_Grepa:: @ 8DA1B80 - .incbin "data/graphics/berries/palettes/grepa.gbapal.lz" + .incbin "graphics/berries/palettes/grepa.gbapal.lz" .align 2, 0 gBerryPalette_Tamato:: @ 8DA1BA8 - .incbin "data/graphics/berries/palettes/tamato.gbapal.lz" + .incbin "graphics/berries/palettes/tamato.gbapal.lz" .align 2, 0 gBerryPalette_Cornn:: @ 8DA1BD0 - .incbin "data/graphics/berries/palettes/cornn.gbapal.lz" + .incbin "graphics/berries/palettes/cornn.gbapal.lz" .align 2, 0 gBerryPalette_Magost:: @ 8DA1BF8 - .incbin "data/graphics/berries/palettes/magost.gbapal.lz" + .incbin "graphics/berries/palettes/magost.gbapal.lz" .align 2, 0 gBerryPalette_Rabuta:: @ 8DA1C20 - .incbin "data/graphics/berries/palettes/rabuta.gbapal.lz" + .incbin "graphics/berries/palettes/rabuta.gbapal.lz" .align 2, 0 gBerryPalette_Nomel:: @ 8DA1C48 - .incbin "data/graphics/berries/palettes/nomel.gbapal.lz" + .incbin "graphics/berries/palettes/nomel.gbapal.lz" .align 2, 0 gBerryPalette_Spelon:: @ 8DA1C70 - .incbin "data/graphics/berries/palettes/spelon.gbapal.lz" + .incbin "graphics/berries/palettes/spelon.gbapal.lz" .align 2, 0 gBerryPalette_Pamtre:: @ 8DA1C98 - .incbin "data/graphics/berries/palettes/pamtre.gbapal.lz" + .incbin "graphics/berries/palettes/pamtre.gbapal.lz" .align 2, 0 gBerryPalette_Watmel:: @ 8DA1CC0 - .incbin "data/graphics/berries/palettes/watmel.gbapal.lz" + .incbin "graphics/berries/palettes/watmel.gbapal.lz" .align 2, 0 gBerryPalette_Durin:: @ 8DA1CE8 - .incbin "data/graphics/berries/palettes/durin.gbapal.lz" + .incbin "graphics/berries/palettes/durin.gbapal.lz" .align 2, 0 gBerryPalette_Belue:: @ 8DA1D10 - .incbin "data/graphics/berries/palettes/belue.gbapal.lz" + .incbin "graphics/berries/palettes/belue.gbapal.lz" .align 2, 0 gBerryPalette_Liechi:: @ 8DA1D38 - .incbin "data/graphics/berries/palettes/liechi.gbapal.lz" + .incbin "graphics/berries/palettes/liechi.gbapal.lz" .align 2, 0 gBerryPalette_Ganlon:: @ 8DA1D60 - .incbin "data/graphics/berries/palettes/ganlon.gbapal.lz" + .incbin "graphics/berries/palettes/ganlon.gbapal.lz" .align 2, 0 gBerryPalette_Salac:: @ 8DA1D88 - .incbin "data/graphics/berries/palettes/salac.gbapal.lz" + .incbin "graphics/berries/palettes/salac.gbapal.lz" .align 2, 0 gBerryPalette_Petaya:: @ 8DA1DB0 - .incbin "data/graphics/berries/palettes/petaya.gbapal.lz" + .incbin "graphics/berries/palettes/petaya.gbapal.lz" .align 2, 0 gBerryPalette_Apicot:: @ 8DA1DD8 - .incbin "data/graphics/berries/palettes/apicot.gbapal.lz" + .incbin "graphics/berries/palettes/apicot.gbapal.lz" .align 2, 0 gBerryPalette_Lansat:: @ 8DA1E00 - .incbin "data/graphics/berries/palettes/lansat.gbapal.lz" + .incbin "graphics/berries/palettes/lansat.gbapal.lz" .align 2, 0 gBerryPalette_Starf:: @ 8DA1E28 - .incbin "data/graphics/berries/palettes/starf.gbapal.lz" + .incbin "graphics/berries/palettes/starf.gbapal.lz" .align 2, 0 gBerryPalette_Enigma:: @ 8DA1E50 - .incbin "data/graphics/berries/palettes/enigma.gbapal.lz" + .incbin "graphics/berries/palettes/enigma.gbapal.lz" diff --git a/data/graphics/berries/palettes/aguav.pal b/graphics/berries/palettes/aguav.pal similarity index 100% rename from data/graphics/berries/palettes/aguav.pal rename to graphics/berries/palettes/aguav.pal diff --git a/data/graphics/berries/palettes/apicot.pal b/graphics/berries/palettes/apicot.pal similarity index 100% rename from data/graphics/berries/palettes/apicot.pal rename to graphics/berries/palettes/apicot.pal diff --git a/data/graphics/berries/palettes/aspear.pal b/graphics/berries/palettes/aspear.pal similarity index 100% rename from data/graphics/berries/palettes/aspear.pal rename to graphics/berries/palettes/aspear.pal diff --git a/data/graphics/berries/palettes/belue.pal b/graphics/berries/palettes/belue.pal similarity index 100% rename from data/graphics/berries/palettes/belue.pal rename to graphics/berries/palettes/belue.pal diff --git a/data/graphics/berries/palettes/bluk.pal b/graphics/berries/palettes/bluk.pal similarity index 100% rename from data/graphics/berries/palettes/bluk.pal rename to graphics/berries/palettes/bluk.pal diff --git a/data/graphics/berries/palettes/cheri.pal b/graphics/berries/palettes/cheri.pal similarity index 100% rename from data/graphics/berries/palettes/cheri.pal rename to graphics/berries/palettes/cheri.pal diff --git a/data/graphics/berries/palettes/chesto.pal b/graphics/berries/palettes/chesto.pal similarity index 100% rename from data/graphics/berries/palettes/chesto.pal rename to graphics/berries/palettes/chesto.pal diff --git a/data/graphics/berries/palettes/cornn.pal b/graphics/berries/palettes/cornn.pal similarity index 100% rename from data/graphics/berries/palettes/cornn.pal rename to graphics/berries/palettes/cornn.pal diff --git a/data/graphics/berries/palettes/durin.pal b/graphics/berries/palettes/durin.pal similarity index 100% rename from data/graphics/berries/palettes/durin.pal rename to graphics/berries/palettes/durin.pal diff --git a/data/graphics/berries/palettes/enigma.pal b/graphics/berries/palettes/enigma.pal similarity index 100% rename from data/graphics/berries/palettes/enigma.pal rename to graphics/berries/palettes/enigma.pal diff --git a/data/graphics/berries/palettes/figy.pal b/graphics/berries/palettes/figy.pal similarity index 100% rename from data/graphics/berries/palettes/figy.pal rename to graphics/berries/palettes/figy.pal diff --git a/data/graphics/berries/palettes/ganlon.pal b/graphics/berries/palettes/ganlon.pal similarity index 100% rename from data/graphics/berries/palettes/ganlon.pal rename to graphics/berries/palettes/ganlon.pal diff --git a/data/graphics/berries/palettes/grepa.pal b/graphics/berries/palettes/grepa.pal similarity index 100% rename from data/graphics/berries/palettes/grepa.pal rename to graphics/berries/palettes/grepa.pal diff --git a/data/graphics/berries/palettes/hondew.pal b/graphics/berries/palettes/hondew.pal similarity index 100% rename from data/graphics/berries/palettes/hondew.pal rename to graphics/berries/palettes/hondew.pal diff --git a/data/graphics/berries/palettes/iapapa.pal b/graphics/berries/palettes/iapapa.pal similarity index 100% rename from data/graphics/berries/palettes/iapapa.pal rename to graphics/berries/palettes/iapapa.pal diff --git a/data/graphics/berries/palettes/kelpsy.pal b/graphics/berries/palettes/kelpsy.pal similarity index 100% rename from data/graphics/berries/palettes/kelpsy.pal rename to graphics/berries/palettes/kelpsy.pal diff --git a/data/graphics/berries/palettes/lansat.pal b/graphics/berries/palettes/lansat.pal similarity index 100% rename from data/graphics/berries/palettes/lansat.pal rename to graphics/berries/palettes/lansat.pal diff --git a/data/graphics/berries/palettes/leppa.pal b/graphics/berries/palettes/leppa.pal similarity index 100% rename from data/graphics/berries/palettes/leppa.pal rename to graphics/berries/palettes/leppa.pal diff --git a/data/graphics/berries/palettes/liechi.pal b/graphics/berries/palettes/liechi.pal similarity index 100% rename from data/graphics/berries/palettes/liechi.pal rename to graphics/berries/palettes/liechi.pal diff --git a/data/graphics/berries/palettes/lum.pal b/graphics/berries/palettes/lum.pal similarity index 100% rename from data/graphics/berries/palettes/lum.pal rename to graphics/berries/palettes/lum.pal diff --git a/data/graphics/berries/palettes/mago.pal b/graphics/berries/palettes/mago.pal similarity index 100% rename from data/graphics/berries/palettes/mago.pal rename to graphics/berries/palettes/mago.pal diff --git a/data/graphics/berries/palettes/magost.pal b/graphics/berries/palettes/magost.pal similarity index 100% rename from data/graphics/berries/palettes/magost.pal rename to graphics/berries/palettes/magost.pal diff --git a/data/graphics/berries/palettes/nanab.pal b/graphics/berries/palettes/nanab.pal similarity index 100% rename from data/graphics/berries/palettes/nanab.pal rename to graphics/berries/palettes/nanab.pal diff --git a/data/graphics/berries/palettes/nomel.pal b/graphics/berries/palettes/nomel.pal similarity index 100% rename from data/graphics/berries/palettes/nomel.pal rename to graphics/berries/palettes/nomel.pal diff --git a/data/graphics/berries/palettes/oran.pal b/graphics/berries/palettes/oran.pal similarity index 100% rename from data/graphics/berries/palettes/oran.pal rename to graphics/berries/palettes/oran.pal diff --git a/data/graphics/berries/palettes/pamtre.pal b/graphics/berries/palettes/pamtre.pal similarity index 100% rename from data/graphics/berries/palettes/pamtre.pal rename to graphics/berries/palettes/pamtre.pal diff --git a/data/graphics/berries/palettes/pecha.pal b/graphics/berries/palettes/pecha.pal similarity index 100% rename from data/graphics/berries/palettes/pecha.pal rename to graphics/berries/palettes/pecha.pal diff --git a/data/graphics/berries/palettes/persim.pal b/graphics/berries/palettes/persim.pal similarity index 100% rename from data/graphics/berries/palettes/persim.pal rename to graphics/berries/palettes/persim.pal diff --git a/data/graphics/berries/palettes/petaya.pal b/graphics/berries/palettes/petaya.pal similarity index 100% rename from data/graphics/berries/palettes/petaya.pal rename to graphics/berries/palettes/petaya.pal diff --git a/data/graphics/berries/palettes/pinap.pal b/graphics/berries/palettes/pinap.pal similarity index 100% rename from data/graphics/berries/palettes/pinap.pal rename to graphics/berries/palettes/pinap.pal diff --git a/data/graphics/berries/palettes/pomeg.pal b/graphics/berries/palettes/pomeg.pal similarity index 100% rename from data/graphics/berries/palettes/pomeg.pal rename to graphics/berries/palettes/pomeg.pal diff --git a/data/graphics/berries/palettes/qualot.pal b/graphics/berries/palettes/qualot.pal similarity index 100% rename from data/graphics/berries/palettes/qualot.pal rename to graphics/berries/palettes/qualot.pal diff --git a/data/graphics/berries/palettes/rabuta.pal b/graphics/berries/palettes/rabuta.pal similarity index 100% rename from data/graphics/berries/palettes/rabuta.pal rename to graphics/berries/palettes/rabuta.pal diff --git a/data/graphics/berries/palettes/rawst.pal b/graphics/berries/palettes/rawst.pal similarity index 100% rename from data/graphics/berries/palettes/rawst.pal rename to graphics/berries/palettes/rawst.pal diff --git a/data/graphics/berries/palettes/razz.pal b/graphics/berries/palettes/razz.pal similarity index 100% rename from data/graphics/berries/palettes/razz.pal rename to graphics/berries/palettes/razz.pal diff --git a/data/graphics/berries/palettes/salac.pal b/graphics/berries/palettes/salac.pal similarity index 100% rename from data/graphics/berries/palettes/salac.pal rename to graphics/berries/palettes/salac.pal diff --git a/data/graphics/berries/palettes/sitrus.pal b/graphics/berries/palettes/sitrus.pal similarity index 100% rename from data/graphics/berries/palettes/sitrus.pal rename to graphics/berries/palettes/sitrus.pal diff --git a/data/graphics/berries/palettes/spelon.pal b/graphics/berries/palettes/spelon.pal similarity index 100% rename from data/graphics/berries/palettes/spelon.pal rename to graphics/berries/palettes/spelon.pal diff --git a/data/graphics/berries/palettes/starf.pal b/graphics/berries/palettes/starf.pal similarity index 100% rename from data/graphics/berries/palettes/starf.pal rename to graphics/berries/palettes/starf.pal diff --git a/data/graphics/berries/palettes/tamato.pal b/graphics/berries/palettes/tamato.pal similarity index 100% rename from data/graphics/berries/palettes/tamato.pal rename to graphics/berries/palettes/tamato.pal diff --git a/data/graphics/berries/palettes/watmel.pal b/graphics/berries/palettes/watmel.pal similarity index 100% rename from data/graphics/berries/palettes/watmel.pal rename to graphics/berries/palettes/watmel.pal diff --git a/data/graphics/berries/palettes/wepear.pal b/graphics/berries/palettes/wepear.pal similarity index 100% rename from data/graphics/berries/palettes/wepear.pal rename to graphics/berries/palettes/wepear.pal diff --git a/data/graphics/berries/palettes/wiki.pal b/graphics/berries/palettes/wiki.pal similarity index 100% rename from data/graphics/berries/palettes/wiki.pal rename to graphics/berries/palettes/wiki.pal diff --git a/data/graphics/berries/pics/aguav.png b/graphics/berries/pics/aguav.png similarity index 100% rename from data/graphics/berries/pics/aguav.png rename to graphics/berries/pics/aguav.png diff --git a/data/graphics/berries/pics/apicot.png b/graphics/berries/pics/apicot.png similarity index 100% rename from data/graphics/berries/pics/apicot.png rename to graphics/berries/pics/apicot.png diff --git a/data/graphics/berries/pics/aspear.png b/graphics/berries/pics/aspear.png similarity index 100% rename from data/graphics/berries/pics/aspear.png rename to graphics/berries/pics/aspear.png diff --git a/data/graphics/berries/pics/belue.png b/graphics/berries/pics/belue.png similarity index 100% rename from data/graphics/berries/pics/belue.png rename to graphics/berries/pics/belue.png diff --git a/data/graphics/berries/pics/bluk.png b/graphics/berries/pics/bluk.png similarity index 100% rename from data/graphics/berries/pics/bluk.png rename to graphics/berries/pics/bluk.png diff --git a/data/graphics/berries/pics/cheri.png b/graphics/berries/pics/cheri.png similarity index 100% rename from data/graphics/berries/pics/cheri.png rename to graphics/berries/pics/cheri.png diff --git a/data/graphics/berries/pics/chesto.png b/graphics/berries/pics/chesto.png similarity index 100% rename from data/graphics/berries/pics/chesto.png rename to graphics/berries/pics/chesto.png diff --git a/data/graphics/berries/pics/cornn.png b/graphics/berries/pics/cornn.png similarity index 100% rename from data/graphics/berries/pics/cornn.png rename to graphics/berries/pics/cornn.png diff --git a/data/graphics/berries/pics/durin.png b/graphics/berries/pics/durin.png similarity index 100% rename from data/graphics/berries/pics/durin.png rename to graphics/berries/pics/durin.png diff --git a/data/graphics/berries/pics/enigma.png b/graphics/berries/pics/enigma.png similarity index 100% rename from data/graphics/berries/pics/enigma.png rename to graphics/berries/pics/enigma.png diff --git a/data/graphics/berries/pics/figy.png b/graphics/berries/pics/figy.png similarity index 100% rename from data/graphics/berries/pics/figy.png rename to graphics/berries/pics/figy.png diff --git a/data/graphics/berries/pics/ganlon.png b/graphics/berries/pics/ganlon.png similarity index 100% rename from data/graphics/berries/pics/ganlon.png rename to graphics/berries/pics/ganlon.png diff --git a/data/graphics/berries/pics/grepa.png b/graphics/berries/pics/grepa.png similarity index 100% rename from data/graphics/berries/pics/grepa.png rename to graphics/berries/pics/grepa.png diff --git a/data/graphics/berries/pics/hondew.png b/graphics/berries/pics/hondew.png similarity index 100% rename from data/graphics/berries/pics/hondew.png rename to graphics/berries/pics/hondew.png diff --git a/data/graphics/berries/pics/iapapa.png b/graphics/berries/pics/iapapa.png similarity index 100% rename from data/graphics/berries/pics/iapapa.png rename to graphics/berries/pics/iapapa.png diff --git a/data/graphics/berries/pics/kelpsy.png b/graphics/berries/pics/kelpsy.png similarity index 100% rename from data/graphics/berries/pics/kelpsy.png rename to graphics/berries/pics/kelpsy.png diff --git a/data/graphics/berries/pics/lansat.png b/graphics/berries/pics/lansat.png similarity index 100% rename from data/graphics/berries/pics/lansat.png rename to graphics/berries/pics/lansat.png diff --git a/data/graphics/berries/pics/leppa.png b/graphics/berries/pics/leppa.png similarity index 100% rename from data/graphics/berries/pics/leppa.png rename to graphics/berries/pics/leppa.png diff --git a/data/graphics/berries/pics/liechi.png b/graphics/berries/pics/liechi.png similarity index 100% rename from data/graphics/berries/pics/liechi.png rename to graphics/berries/pics/liechi.png diff --git a/data/graphics/berries/pics/lum.png b/graphics/berries/pics/lum.png similarity index 100% rename from data/graphics/berries/pics/lum.png rename to graphics/berries/pics/lum.png diff --git a/data/graphics/berries/pics/mago.png b/graphics/berries/pics/mago.png similarity index 100% rename from data/graphics/berries/pics/mago.png rename to graphics/berries/pics/mago.png diff --git a/data/graphics/berries/pics/magost.png b/graphics/berries/pics/magost.png similarity index 100% rename from data/graphics/berries/pics/magost.png rename to graphics/berries/pics/magost.png diff --git a/data/graphics/berries/pics/nanab.png b/graphics/berries/pics/nanab.png similarity index 100% rename from data/graphics/berries/pics/nanab.png rename to graphics/berries/pics/nanab.png diff --git a/data/graphics/berries/pics/nomel.png b/graphics/berries/pics/nomel.png similarity index 100% rename from data/graphics/berries/pics/nomel.png rename to graphics/berries/pics/nomel.png diff --git a/data/graphics/berries/pics/oran.png b/graphics/berries/pics/oran.png similarity index 100% rename from data/graphics/berries/pics/oran.png rename to graphics/berries/pics/oran.png diff --git a/data/graphics/berries/pics/pamtre.png b/graphics/berries/pics/pamtre.png similarity index 100% rename from data/graphics/berries/pics/pamtre.png rename to graphics/berries/pics/pamtre.png diff --git a/data/graphics/berries/pics/pecha.png b/graphics/berries/pics/pecha.png similarity index 100% rename from data/graphics/berries/pics/pecha.png rename to graphics/berries/pics/pecha.png diff --git a/data/graphics/berries/pics/persim.png b/graphics/berries/pics/persim.png similarity index 100% rename from data/graphics/berries/pics/persim.png rename to graphics/berries/pics/persim.png diff --git a/data/graphics/berries/pics/petaya.png b/graphics/berries/pics/petaya.png similarity index 100% rename from data/graphics/berries/pics/petaya.png rename to graphics/berries/pics/petaya.png diff --git a/data/graphics/berries/pics/pinap.png b/graphics/berries/pics/pinap.png similarity index 100% rename from data/graphics/berries/pics/pinap.png rename to graphics/berries/pics/pinap.png diff --git a/data/graphics/berries/pics/pomeg.png b/graphics/berries/pics/pomeg.png similarity index 100% rename from data/graphics/berries/pics/pomeg.png rename to graphics/berries/pics/pomeg.png diff --git a/data/graphics/berries/pics/qualot.png b/graphics/berries/pics/qualot.png similarity index 100% rename from data/graphics/berries/pics/qualot.png rename to graphics/berries/pics/qualot.png diff --git a/data/graphics/berries/pics/rabuta.png b/graphics/berries/pics/rabuta.png similarity index 100% rename from data/graphics/berries/pics/rabuta.png rename to graphics/berries/pics/rabuta.png diff --git a/data/graphics/berries/pics/rawst.png b/graphics/berries/pics/rawst.png similarity index 100% rename from data/graphics/berries/pics/rawst.png rename to graphics/berries/pics/rawst.png diff --git a/data/graphics/berries/pics/razz.png b/graphics/berries/pics/razz.png similarity index 100% rename from data/graphics/berries/pics/razz.png rename to graphics/berries/pics/razz.png diff --git a/data/graphics/berries/pics/salac.png b/graphics/berries/pics/salac.png similarity index 100% rename from data/graphics/berries/pics/salac.png rename to graphics/berries/pics/salac.png diff --git a/data/graphics/berries/pics/sitrus.png b/graphics/berries/pics/sitrus.png similarity index 100% rename from data/graphics/berries/pics/sitrus.png rename to graphics/berries/pics/sitrus.png diff --git a/data/graphics/berries/pics/spelon.png b/graphics/berries/pics/spelon.png similarity index 100% rename from data/graphics/berries/pics/spelon.png rename to graphics/berries/pics/spelon.png diff --git a/data/graphics/berries/pics/starf.png b/graphics/berries/pics/starf.png similarity index 100% rename from data/graphics/berries/pics/starf.png rename to graphics/berries/pics/starf.png diff --git a/data/graphics/berries/pics/tamato.png b/graphics/berries/pics/tamato.png similarity index 100% rename from data/graphics/berries/pics/tamato.png rename to graphics/berries/pics/tamato.png diff --git a/data/graphics/berries/pics/watmel.png b/graphics/berries/pics/watmel.png similarity index 100% rename from data/graphics/berries/pics/watmel.png rename to graphics/berries/pics/watmel.png diff --git a/data/graphics/berries/pics/wepear.png b/graphics/berries/pics/wepear.png similarity index 100% rename from data/graphics/berries/pics/wepear.png rename to graphics/berries/pics/wepear.png diff --git a/data/graphics/berries/pics/wiki.png b/graphics/berries/pics/wiki.png similarity index 100% rename from data/graphics/berries/pics/wiki.png rename to graphics/berries/pics/wiki.png