summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/data2.s29
-rw-r--r--data/graphics.s45
-rw-r--r--graphics/berry_blender/arrow.pal19
-rw-r--r--graphics/berry_blender/arrow.pngbin0 -> 682 bytes
-rw-r--r--graphics/berry_blender/center.pal19
-rw-r--r--graphics/berry_blender/center.pngbin0 -> 1374 bytes
-rw-r--r--graphics/berry_blender/center_map.binbin0 -> 1024 bytes
-rw-r--r--graphics/berry_blender/countdown_numbers.pngbin0 -> 457 bytes
-rw-r--r--graphics/berry_blender/marubatsu.pngbin0 -> 293 bytes
-rw-r--r--graphics/berry_blender/misc.pal19
-rw-r--r--graphics/berry_blender/outer.pal19
-rw-r--r--graphics/berry_blender/outer.pngbin0 -> 1880 bytes
-rw-r--r--graphics/berry_blender/outer_map.binbin0 -> 2048 bytes
-rw-r--r--graphics/berry_blender/particles.pngbin0 -> 217 bytes
-rw-r--r--graphics/berry_blender/start.pngbin0 -> 368 bytes
15 files changed, 136 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
diff --git a/graphics/berry_blender/arrow.pal b/graphics/berry_blender/arrow.pal
new file mode 100644
index 000000000..4c975292d
--- /dev/null
+++ b/graphics/berry_blender/arrow.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+213 222 238
+180 197 230
+148 172 222
+115 148 205
+82 123 197
+49 98 189
+255 180 205
+255 115 98
+255 49 0
+205 65 65
+189 24 24
+148 16 16
+74 57 139
+8 0 82
diff --git a/graphics/berry_blender/arrow.png b/graphics/berry_blender/arrow.png
new file mode 100644
index 000000000..a40948824
--- /dev/null
+++ b/graphics/berry_blender/arrow.png
Binary files differ
diff --git a/graphics/berry_blender/center.pal b/graphics/berry_blender/center.pal
new file mode 100644
index 000000000..606c527a3
--- /dev/null
+++ b/graphics/berry_blender/center.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+205 197 255
+172 164 222
+139 139 189
+106 106 156
+74 82 123
+41 57 90
+213 222 189
+180 189 156
+148 156 123
+115 123 90
+255 172 123
+246 115 82
+238 57 41
+156 24 0
diff --git a/graphics/berry_blender/center.png b/graphics/berry_blender/center.png
new file mode 100644
index 000000000..1da3629d4
--- /dev/null
+++ b/graphics/berry_blender/center.png
Binary files differ
diff --git a/graphics/berry_blender/center_map.bin b/graphics/berry_blender/center_map.bin
new file mode 100644
index 000000000..ef28d5093
--- /dev/null
+++ b/graphics/berry_blender/center_map.bin
Binary files differ
diff --git a/graphics/berry_blender/countdown_numbers.png b/graphics/berry_blender/countdown_numbers.png
new file mode 100644
index 000000000..7884d0c07
--- /dev/null
+++ b/graphics/berry_blender/countdown_numbers.png
Binary files differ
diff --git a/graphics/berry_blender/marubatsu.png b/graphics/berry_blender/marubatsu.png
new file mode 100644
index 000000000..f927bbce9
--- /dev/null
+++ b/graphics/berry_blender/marubatsu.png
Binary files differ
diff --git a/graphics/berry_blender/misc.pal b/graphics/berry_blender/misc.pal
new file mode 100644
index 000000000..9c1db8d12
--- /dev/null
+++ b/graphics/berry_blender/misc.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+255 213 0
+255 82 82
+98 255 255
+0 189 255
+98 255 98
+205 0 0
+255 0 0
+255 156 156
+0 0 0
+255 255 0
+255 255 148
+189 189 189
+255 255 255
diff --git a/graphics/berry_blender/outer.pal b/graphics/berry_blender/outer.pal
new file mode 100644
index 000000000..c3b83cf16
--- /dev/null
+++ b/graphics/berry_blender/outer.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+213 222 238
+180 197 230
+148 172 222
+115 148 205
+82 123 197
+49 98 189
+255 180 205
+255 115 98
+255 49 0
+205 65 65
+189 24 24
+148 123 197
+74 57 139
+8 0 82
diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png
new file mode 100644
index 000000000..d8040b022
--- /dev/null
+++ b/graphics/berry_blender/outer.png
Binary files differ
diff --git a/graphics/berry_blender/outer_map.bin b/graphics/berry_blender/outer_map.bin
new file mode 100644
index 000000000..092e3997e
--- /dev/null
+++ b/graphics/berry_blender/outer_map.bin
Binary files differ
diff --git a/graphics/berry_blender/particles.png b/graphics/berry_blender/particles.png
new file mode 100644
index 000000000..d0086b029
--- /dev/null
+++ b/graphics/berry_blender/particles.png
Binary files differ
diff --git a/graphics/berry_blender/start.png b/graphics/berry_blender/start.png
new file mode 100644
index 000000000..6372caac6
--- /dev/null
+++ b/graphics/berry_blender/start.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 18:57:18 +0000