berry blender graphics

2 files changed, 60 insertions, 14 deletions

diff --git a/data/data2.s b/data/data2.s
index e13b136ab..75a95ebe4 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2641,14 +2641,23 @@ gSpriteAffineAnimTable_8215AC0:: @ 8215AC0
 gUnknown_08215BA0:: @ 8215BA0
 	.incbin "baserom.gba", 0x00215ba0, 0x6c
 
+	.align 2
 gUnknown_08215C0C:: @ 8215C0C
-	.incbin "baserom.gba", 0x00215c0c, 0x20
+	.incbin "graphics/berry_blender/center.gbapal"
 
+	.align 2
 gUnknown_08215C2C:: @ 8215C2C
-	.incbin "baserom.gba", 0x00215c2c, 0x400
+	.incbin "graphics/berry_blender/center_map.bin"
 
+	.align 2
 gUnknown_0821602C:: @ 821602C
-	.incbin "baserom.gba", 0x0021602c, 0x21d
+	.incbin "graphics/berry_blender/outer.gbapal"
+
+	@ unused palette
+	.align 2
+	.incbin "baserom.gba", 0x0021604c, 0x20
+
+	.incbin "baserom.gba", 0x0021606c, 0x1dd
 
 gUnknown_08216249:: @ 8216249
 	.string "\p$"
@@ -2838,15 +2847,15 @@ gSpriteAnimTable_82163AC:: @ 82163AC
 
 	.align 2
 gUnknown_082163DC:: @ 82163DC
-	obj_tiles 0x08e91618, 2048, 0xb5d1
+	obj_tiles gBerryBlenderArrowTiles, 0x800, 46545
 
 	.align 2
 gUnknown_082163E4:: @ 82163E4
-	obj_pal 0x08e920d8, 0xb5d2
+	obj_pal gBerryBlenderMiscPalette, 46546
 
 	.align 2
 gUnknown_082163EC:: @ 82163EC
-	obj_pal 0x08e920f8, 0x3018
+	obj_pal gBerryBlenderArrowPalette, 12312
 
 	.align 2
 gSpriteTemplate_82163F4:: @ 82163F4
@@ -2891,7 +2900,7 @@ gSpriteAnimTable_8216444:: @ 8216444
 
 	.align 2
 gUnknown_08216454:: @ 8216454
-	obj_tiles 0x08e90618, 512, 0xbef8
+	obj_tiles gBerryBlenderMarubatsuTiles, 0x200, 48888
 
 	.align 2
 gSpriteTemplate_821645C:: @ 821645C
@@ -2953,7 +2962,7 @@ gSpriteAnimTable_82164E0:: @ 82164E0
 
 	.align 2
 gUnknown_082164F4:: @ 82164F4
-	obj_tiles 0x08e90818, 224, 0x5ba0
+	obj_tiles gBerryBlenderParticlesTiles, 0xE0, 23456
 
 	.align 2
 gSpriteTemplate_82164FC:: @ 82164FC
@@ -2988,7 +2997,7 @@ gSpriteAnimTable_8216534:: @ 8216534
 
 	.align 2
 gUnknown_08216540:: @ 8216540
-	obj_tiles 0x08e90a18, 1536, 0x3039
+	obj_tiles gBerryBlenderCountdownNumbersTiles, 0x600, 12345
 
 	.align 2
 gSpriteTemplate_8216548:: @ 8216548
@@ -3011,7 +3020,7 @@ gSpriteAnimTable_8216570:: @ 8216570
 
 	.align 2
 gUnknown_08216574:: @ 8216574
-	obj_tiles 0x08e91018, 1024, 0x303a
+	obj_tiles gBerryBlenderStartTiles, 0x400, 12346
 
 	.align 2
 gSpriteTemplate_821657C:: @ 821657C
diff --git a/data/graphics.s b/data/graphics.s
index 98ec999ce..a007f21c5 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2639,14 +2639,17 @@ gBattleAnimBackgroundPalette_24:: @ 8E6BBDC
 
 	.incbin "baserom.gba", 0xe6bc04, 0x4FC
 
+	.align 2
 gUnknown_08E6C100:: @ 8E6C100
-	.incbin "baserom.gba", 0x00e6c100, 0x820
+	.incbin "graphics/berry_blender/center.8bpp.lz"
 
+	.align 2
 gUnknown_08E6C920:: @ 8E6C920
-	.incbin "baserom.gba", 0x00e6c920, 0xa34
+	.incbin "graphics/berry_blender/outer.4bpp.lz"
 
+	.align 2
 gUnknown_08E6D354:: @ 8E6D354
-	.incbin "baserom.gba", 0x00e6d354, 0x314
+	.incbin "graphics/berry_blender/outer_map.bin.lz"
 
 	.align 2
 gBattleAnimBackgroundPalette_16:: @ 8E6D668
@@ -3381,7 +3384,41 @@ gUnknown_08E8F844:: @ 8E8F844
 	.incbin "baserom.gba", 0x00e8f844, 0xbb4
 
 gUnknown_08E903F8:: @ 8E903F8
-	.incbin "baserom.gba", 0x00e903f8, 0x1D20
+	.incbin "baserom.gba", 0x00e903f8, 0x220
+
+	.align 2
+gBerryBlenderMarubatsuTiles:: @ 8E90618
+	.incbin "graphics/berry_blender/marubatsu.4bpp"
+
+	.align 2
+gBerryBlenderParticlesTiles:: @ 8E90818
+	.incbin "graphics/berry_blender/particles.4bpp"
+
+	.space 0x120
+
+	.align 2
+gBerryBlenderCountdownNumbersTiles:: @ 8E90A18
+	.incbin "graphics/berry_blender/countdown_numbers.4bpp"
+
+	.align 2
+gBerryBlenderStartTiles:: @ 8E91018
+	.incbin "graphics/berry_blender/start.4bpp"
+
+	.incbin "baserom.gba", 0x00e91418, 0x200
+
+	.align 2
+gBerryBlenderArrowTiles:: @ 8E91618
+	.incbin "graphics/berry_blender/arrow.4bpp"
+
+	.incbin "baserom.gba", 0x00e91e18, 0x2c0
+
+	.align 2
+gBerryBlenderMiscPalette:: @ 8E920D8
+	.incbin "graphics/berry_blender/misc.gbapal"
+
+	.align 2
+gBerryBlenderArrowPalette:: @ 8E920F8
+	.incbin "graphics/berry_blender/arrow.gbapal"
 
 	.align 2
 gTilesetTiles_General:: @ 8E92118