summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-28 18:31:18 -0800
committerYamaArashi <shadow962@live.com>2016-01-28 18:31:18 -0800
commita19ea007a5174179647876348173a34cc44458d7 (patch)
treea4cc91214fe7ac9a8f8f60cee0c7a910e482e3d9 /data
parent97d4c7607bd88d15188f2bf7976c0226f9034e5b (diff)
berry graphics
Diffstat (limited to 'data')
-rw-r--r--data/data2.s12
-rw-r--r--data/graphics/berries/graphics.s429
-rw-r--r--data/graphics/berries/graphics_table.s46
3 files changed, 484 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index 016a91d0d..3ee68fb91 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2893,8 +2893,8 @@ gUnknown_083C1D74: ; 83C1D74
gUnknown_083C1E04: ; 83C1E04
.incbin "baserom.gba", 0x003c1e04, 0x18
-gUnknown_083C1E1C: ; 83C1E1C
- .incbin "baserom.gba", 0x003c1e1c, 0x158
+; 83C1E1C
+ .include "data/graphics/berries/graphics_table.s"
gUnknown_083C1F74: ; 83C1F74
.incbin "baserom.gba", 0x003c1f74, 0x8
@@ -8316,7 +8316,13 @@ gUnknown_08E788E4: ; 8E788E4
.incbin "baserom.gba", 0x00e788e4, 0x1a0
gUnknown_08E78A84: ; 8E78A84
- .incbin "baserom.gba", 0x00e78a84, 0x6118
+ .incbin "baserom.gba", 0x00e78a84, 0x27c
+
+; 8E78D00
+ .include "data/graphics/berries/graphics.s"
+
+; 8E7E7D0
+ .incbin "baserom.gba", 0xE7E7D0, 0x3CC
gUnknown_08E7EB9C: ; 8E7EB9C
.incbin "baserom.gba", 0x00e7eb9c, 0xa0
diff --git a/data/graphics/berries/graphics.s b/data/graphics/berries/graphics.s
new file mode 100644
index 000000000..497b4919d
--- /dev/null
+++ b/data/graphics/berries/graphics.s
@@ -0,0 +1,429 @@
+ .align 2
+
+gBerryPic_Cheri: ; 8E78D00
+ .incbin "graphics/berries/cheri/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Oran: ; 8E78E54
+ .incbin "graphics/berries/oran/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Pecha: ; 8E78FC8
+ .incbin "graphics/berries/pecha/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Rawst: ; 8E7913C
+ .incbin "graphics/berries/rawst/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Aspear: ; 8E792D4
+ .incbin "graphics/berries/aspear/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Leppa: ; 8E7947C
+ .incbin "graphics/berries/leppa/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Chesto: ; 8E795EC
+ .incbin "graphics/berries/chesto/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Persim: ; 8E797D0
+ .incbin "graphics/berries/persim/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Lum: ; 8E79920
+ .incbin "graphics/berries/lum/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Sitrus: ; 8E79A3C
+ .incbin "graphics/berries/sitrus/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Figy: ; 8E79BE0
+ .incbin "graphics/berries/figy/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Wiki: ; 8E79D8C
+ .incbin "graphics/berries/wiki/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Mago: ; 8E79F80
+ .incbin "graphics/berries/mago/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Aguav: ; 8E7A134
+ .incbin "graphics/berries/aguav/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Iapapa: ; 8E7A2A8
+ .incbin "graphics/berries/iapapa/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Razz: ; 8E7A560
+ .incbin "graphics/berries/razz/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Bluk: ; 8E7A790
+ .incbin "graphics/berries/bluk/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Nanab: ; 8E7A978
+ .incbin "graphics/berries/nanab/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Wepear: ; 8E7AAEC
+ .incbin "graphics/berries/wepear/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Pinap: ; 8E7ACB4
+ .incbin "graphics/berries/pinap/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Pomeg: ; 8E7AEC8
+ .incbin "graphics/berries/pomeg/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Kelpsy: ; 8E7B070
+ .incbin "graphics/berries/kelpsy/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Qualot: ; 8E7B218
+ .incbin "graphics/berries/qualot/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Hondew: ; 8E7B3E4
+ .incbin "graphics/berries/hondew/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Grepa: ; 8E7B63C
+ .incbin "graphics/berries/grepa/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Tamato: ; 8E7B7CC
+ .incbin "graphics/berries/tamato/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Cornn: ; 8E7BA90
+ .incbin "graphics/berries/cornn/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Magost: ; 8E7BC94
+ .incbin "graphics/berries/magost/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Rabuta: ; 8E7BE38
+ .incbin "graphics/berries/rabuta/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Nomel: ; 8E7C12C
+ .incbin "graphics/berries/nomel/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Spelon: ; 8E7C308
+ .incbin "graphics/berries/spelon/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Pamtre: ; 8E7C4F8
+ .incbin "graphics/berries/pamtre/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Watmel: ; 8E7C748
+ .incbin "graphics/berries/watmel/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Durin: ; 8E7CA2C
+ .incbin "graphics/berries/durin/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Belue: ; 8E7CDF8
+ .incbin "graphics/berries/belue/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Liechi: ; 8E7D0D0
+ .incbin "graphics/berries/liechi/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Ganlon: ; 8E7D328
+ .incbin "graphics/berries/ganlon/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Salac: ; 8E7D4C0
+ .incbin "graphics/berries/salac/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Petaya: ; 8E7D704
+ .incbin "graphics/berries/petaya/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Apicot: ; 8E7D9AC
+ .incbin "graphics/berries/apicot/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Lansat: ; 8E7DB3C
+ .incbin "graphics/berries/lansat/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Starf: ; 8E7DD30
+ .incbin "graphics/berries/starf/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPic_Enigma: ; 8E7DF00
+ .incbin "graphics/berries/enigma/pic.4bpp.lz"
+
+ .align 2
+
+gBerryPalette_Cheri: ; 8E7E118
+ .incbin "graphics/berries/cheri/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Oran: ; 8E7E140
+ .incbin "graphics/berries/oran/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Pecha: ; 8E7E168
+ .incbin "graphics/berries/pecha/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Rawst: ; 8E7E190
+ .incbin "graphics/berries/rawst/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Aspear: ; 8E7E1B8
+ .incbin "graphics/berries/aspear/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Leppa: ; 8E7E1E0
+ .incbin "graphics/berries/leppa/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Chesto: ; 8E7E208
+ .incbin "graphics/berries/chesto/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Persim: ; 8E7E230
+ .incbin "graphics/berries/persim/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Lum: ; 8E7E258
+ .incbin "graphics/berries/lum/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Sitrus: ; 8E7E280
+ .incbin "graphics/berries/sitrus/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Figy: ; 8E7E2A8
+ .incbin "graphics/berries/figy/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Wiki: ; 8E7E2D0
+ .incbin "graphics/berries/wiki/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Mago: ; 8E7E2F8
+ .incbin "graphics/berries/mago/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Aguav: ; 8E7E320
+ .incbin "graphics/berries/aguav/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Iapapa: ; 8E7E348
+ .incbin "graphics/berries/iapapa/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Razz: ; 8E7E370
+ .incbin "graphics/berries/razz/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Bluk: ; 8E7E398
+ .incbin "graphics/berries/bluk/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Nanab: ; 8E7E3C0
+ .incbin "graphics/berries/nanab/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Wepear: ; 8E7E3E8
+ .incbin "graphics/berries/wepear/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Pinap: ; 8E7E410
+ .incbin "graphics/berries/pinap/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Pomeg: ; 8E7E438
+ .incbin "graphics/berries/pomeg/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Kelpsy: ; 8E7E460
+ .incbin "graphics/berries/kelpsy/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Qualot: ; 8E7E488
+ .incbin "graphics/berries/qualot/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Hondew: ; 8E7E4B0
+ .incbin "graphics/berries/hondew/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Grepa: ; 8E7E4D8
+ .incbin "graphics/berries/grepa/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Tamato: ; 8E7E500
+ .incbin "graphics/berries/tamato/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Cornn: ; 8E7E528
+ .incbin "graphics/berries/cornn/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Magost: ; 8E7E550
+ .incbin "graphics/berries/magost/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Rabuta: ; 8E7E578
+ .incbin "graphics/berries/rabuta/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Nomel: ; 8E7E5A0
+ .incbin "graphics/berries/nomel/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Spelon: ; 8E7E5C8
+ .incbin "graphics/berries/spelon/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Pamtre: ; 8E7E5F0
+ .incbin "graphics/berries/pamtre/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Watmel: ; 8E7E618
+ .incbin "graphics/berries/watmel/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Durin: ; 8E7E640
+ .incbin "graphics/berries/durin/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Belue: ; 8E7E668
+ .incbin "graphics/berries/belue/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Liechi: ; 8E7E690
+ .incbin "graphics/berries/liechi/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Ganlon: ; 8E7E6B8
+ .incbin "graphics/berries/ganlon/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Salac: ; 8E7E6E0
+ .incbin "graphics/berries/salac/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Petaya: ; 8E7E708
+ .incbin "graphics/berries/petaya/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Apicot: ; 8E7E730
+ .incbin "graphics/berries/apicot/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Lansat: ; 8E7E758
+ .incbin "graphics/berries/lansat/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Starf: ; 8E7E780
+ .incbin "graphics/berries/starf/palette.gbapal.lz"
+
+ .align 2
+
+gBerryPalette_Enigma: ; 8E7E7A8
+ .incbin "graphics/berries/enigma/palette.gbapal.lz"
diff --git a/data/graphics/berries/graphics_table.s b/data/graphics/berries/graphics_table.s
new file mode 100644
index 000000000..55e0c03eb
--- /dev/null
+++ b/data/graphics/berries/graphics_table.s
@@ -0,0 +1,46 @@
+ .align 2
+
+gBerryGraphicsTable: ; 83C1E1C
+ .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