summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/rom5.s8
-rw-r--r--data/graphics.s72
-rwxr-xr-xgraphics/battle_anims/masks/cure_bubbles.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/battle_anims/masks/cure_bubbles.pal19
-rwxr-xr-xgraphics/battle_anims/masks/cure_bubbles.pngbin0 -> 336 bytes
-rwxr-xr-xgraphics/battle_anims/masks/curse.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/battle_anims/masks/curse.pngbin0 -> 138 bytes
-rwxr-xr-xgraphics/battle_anims/masks/metal_shine.pal19
-rwxr-xr-xgraphics/battle_anims/masks/metal_shine.pngbin0 -> 183 bytes
-rwxr-xr-xgraphics/battle_anims/masks/morning_sun.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/battle_anims/masks/morning_sun.pal19
-rwxr-xr-xgraphics/battle_anims/masks/morning_sun.pngbin0 -> 188 bytes
-rwxr-xr-xgraphics/battle_anims/masks/stat.pngbin0 -> 430 bytes
-rwxr-xr-xgraphics/battle_anims/masks/stat1.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat2.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat3.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat4.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat5.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat6.pal19
-rwxr-xr-xgraphics/battle_anims/masks/stat_tilemap_1.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/battle_anims/masks/stat_tilemap_2.bin1
-rwxr-xr-xgraphics/battle_anims/masks/unknown_D2EDFC.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/battle_anims/masks/unknown_D2EDFC.pngbin0 -> 175 bytes
-rwxr-xr-xgraphics/contest/audience.pngbin0 -> 2086 bytes
-rwxr-xr-xgraphics/contest/heart.pngbin0 -> 873 bytes
-rwxr-xr-xgraphics/contest/misc_2.pal259
-rwxr-xr-xgraphics/contest/misc_2.pngbin0 -> 2853 bytes
-rwxr-xr-xgraphics/contest/misc_2_tilemap_1.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/contest/misc_2_tilemap_2.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/contest/misc_2_tilemap_3.bin1
-rwxr-xr-xgraphics/unused/old_beatup.pal19
-rwxr-xr-xgraphics/unused/old_beatup.pngbin0 -> 220 bytes
-rwxr-xr-xgraphics/unused/unknown_D1C060.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/unknown_D1C060.pal19
-rwxr-xr-xgraphics/unused/unknown_D1C060.pngbin0 -> 159 bytes
-rwxr-xr-xmisc.mk4
36 files changed, 514 insertions, 40 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 881f6ddaa..add5dfe08 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -98862,8 +98862,8 @@ _080AB2DC:
pop {r0}
bx r0
.align 2, 0
-_080AB300: .4byte gUnknown_08D17D6C
-_080AB304: .4byte gUnknown_08D18818
+_080AB300: .4byte gContestMiscGfx
+_080AB304: .4byte gContestAudienceGfx
_080AB308: .4byte 0x06002000
_080AB30C: .4byte gUnknown_08D1725C
_080AB310: .4byte 0x0600d000
@@ -99430,7 +99430,7 @@ _080AB7A0:
bl LZDecompressVram
b _080AB946
.align 2, 0
-_080AB7AC: .4byte gUnknown_08D17D6C
+_080AB7AC: .4byte gContestMiscGfx
_080AB7B0:
ldr r0, _080AB7EC
ldr r4, _080AB7F0
@@ -99464,7 +99464,7 @@ _080AB7E6:
ldr r0, [r1, 0x8]
b _080AB946
.align 2, 0
-_080AB7EC: .4byte gUnknown_08D18818
+_080AB7EC: .4byte gContestAudienceGfx
_080AB7F0: .4byte 0x06002000
_080AB7F4: .4byte 0x02015800
_080AB7F8: .4byte 0x040000d4
diff --git a/data/graphics.s b/data/graphics.s
index 430d8644f..ff65d5f30 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1202,7 +1202,7 @@ gContestNumbers_UnusedPal::
.align 2
gUnknown_08D17144:: @ 8D17144
- .incbin "graphics/unused/old_contest_2.gbapal.lz"
+ .incbin "graphics/unused/old_contest_2.gbapal.lz" @ the tilemap and palette for unused contest assets are used. however, these two files aren't old
.align 2
gUnknown_08D1725C:: @ 8D1725C
@@ -1223,12 +1223,12 @@ gUnknown_08D17C3C:: @ 8D17C3C
.incbin "baserom.gba", 0xD17C3C, 0x12D @ LZ, uncomp. size = 0x800
.align 2
-gUnknown_08D17D6C:: @ 8D17D6C
+gContestMiscGfx:: @ 8D17D6C
.incbin "graphics/contest/misc.4bpp.lz"
.align 2
-gUnknown_08D18818:: @ 8D18818
- .incbin "baserom.gba", 0xD18818, 0xC59 @ LZ, uncomp. size = 0x2000
+gContestAudienceGfx:: @ 8D18818
+ .incbin "graphics/contest/audience.4bpp.lz"
.align 2
.incbin "baserom.gba", 0xD19474, 0x11C @ LZ, uncomp. size = 0x180
@@ -1243,27 +1243,27 @@ gContest3Pal::
.align 2
gTiles_8D1975C:: @ 8D1975C
- .incbin "baserom.gba", 0x00d1975c, 0x20
+ .incbin "graphics/contest/heart.4bpp"
.align 2
gUnknown_08D1977C:: @ 8D1977C
- .incbin "baserom.gba", 0xD1977C, 0xAD1 @ LZ, uncomp. size = 0x2400
+ .incbin "graphics/contest/misc_2.4bpp.lz"
.align 2
gUnknown_08D1A250:: @ 8D1A250
- .incbin "baserom.gba", 0xD1A250, 0x112 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/contest/misc_2_tilemap_1.bin.lz"
.align 2
gUnknown_08D1A364:: @ 8D1A364
- .incbin "baserom.gba", 0xD1A364, 0x129 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/contest/misc_2_tilemap_2.bin.lz"
.align 2
gUnknown_08D1A490:: @ 8D1A490
- .incbin "baserom.gba", 0xD1A490, 0x188 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/contest/misc_2_tilemap_3.bin.lz"
.align 2
gUnknown_08D1A618:: @ 8D1A618
- .incbin "baserom.gba", 0xD1A618, 0xEA @ LZ, uncomp. size = 0x200
+ .incbin "graphics/contest/misc_2.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_135:: @ 8D1A704
@@ -1326,10 +1326,10 @@ gBattleAnimSpriteSheet_142:: @ 8D1B1B8
.incbin "graphics/battle_anims/sprites/142.4bpp.lz"
.align 2
- .incbin "baserom.gba", 0xD1B218, 0x9C @ LZ, uncomp. size = 0x200
+ .incbin "graphics/unused/old_beatup.4bpp.lz"
.align 2
- .incbin "baserom.gba", 0xD1B2B4, 0x1B @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/old_beatup.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_147:: @ 8D1B2D0
@@ -1448,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040
.incbin "graphics/battle_anims/sprites/144.gbapal.lz"
.align 2
- .incbin "baserom.gba", 0xD1C060, 0x26 @ LZ, uncomp. size = 0x60
+ .incbin "graphics/unused/unknown_D1C060.4bpp.lz"
.align 2
- .incbin "baserom.gba", 0xD1C088, 0x16 @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/unknown_D1C060.gbapal.lz"
.align 2
- .incbin "baserom.gba", 0xD1C0A0, 0x102 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/unused/unknown_D1C060.bin.lz"
.align 2
gBattleAnimSpriteSheet_162:: @ 8D1C1A4
@@ -1554,11 +1554,11 @@ gBattleAnimBackgroundTilemap_00:: @ 8D1D1C0
.align 2
gUnknown_08D1D410:: @ 8D1D410
- .incbin "baserom.gba", 0xD1D410, 0x13A @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz"
.align 2
gUnknown_08D1D54C:: @ 8D1D54C
- .incbin "baserom.gba", 0xD1D54C, 0x28 @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz"
.align 2
gUnknown_08D1D574:: @ 8D1D574
@@ -1765,11 +1765,11 @@ gBattleAnimSpritePalette_193:: @ 8D209EC
.align 2
gUnknown_08D20A14:: @ 8D20A14
- .incbin "baserom.gba", 0xD20A14, 0x1A @ LZ, uncomp. size = 0x60
+ .incbin "graphics/battle_anims/masks/curse.4bpp.lz"
.align 2
gUnknown_08D20A30:: @ 8D20A30
- .incbin "baserom.gba", 0xD20A30, 0xFD @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/curse.bin.lz"
.align 2
gBattleAnimSpriteSheet_002:: @ 8D20B30
@@ -2226,15 +2226,15 @@ gBattleAnimBackgroundTilemap_10:: @ 8D2A6E8
.align 2
gUnknown_08D2A9E0:: @ 8D2A9E0
- .incbin "baserom.gba", 0xD2A9E0, 0x9F @ LZ, uncomp. size = 0x280
+ .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz"
.align 2
gUnknown_08D2AA80:: @ 8D2AA80
- .incbin "baserom.gba", 0xD2AA80, 0x16 @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz"
.align 2
gUnknown_08D2AA98:: @ 8D2AA98
- .incbin "baserom.gba", 0xD2AA98, 0x11B @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/morning_sun.bin.lz"
.align 2
gBattleAnimBackgroundTilemap_12:: @ 8D2ABB4
@@ -2338,39 +2338,39 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4
.align 2
gUnknown_08D2DACC:: @ 8D2DACC
- .incbin "baserom.gba", 0xD2DACC, 0x20E @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/stat.4bpp.lz"
.align 2
gUnknown_08D2DCDC:: @ 8D2DCDC
- .incbin "baserom.gba", 0xD2DCDC, 0x11C @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
.align 2
gUnknown_08D2DDF8:: @ 8D2DDF8
- .incbin "baserom.gba", 0xD2DDF8, 0x11C @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
.align 2
gUnknown_08D2DF14:: @ 8D2DF14
- .incbin "baserom.gba", 0xD2DF14, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
.align 2
gUnknown_08D2DF34:: @ 8D2DF34
- .incbin "baserom.gba", 0xD2DF34, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
.align 2
gUnknown_08D2DF54:: @ 8D2DF54
- .incbin "baserom.gba", 0xD2DF54, 0x1F @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
.align 2
gUnknown_08D2DF74:: @ 8D2DF74
- .incbin "baserom.gba", 0xD2DF74, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
.align 2
gUnknown_08D2DF94:: @ 8D2DF94
- .incbin "baserom.gba", 0xD2DF94, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
.align 2
gUnknown_08D2DFB4:: @ 8D2DFB4
- .incbin "baserom.gba", 0xD2DFB4, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
.align 2
gUnknown_08D2DFD4:: @ 8D2DFD4
@@ -2382,15 +2382,15 @@ gUnknown_08D2DFF4:: @ 8D2DFF4
.align 2
gUnknown_08D2E014:: @ 8D2E014
- .incbin "baserom.gba", 0xD2E014, 0x13A @ LZ, uncomp. size = 0x200
+ .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz"
.align 2
gUnknown_08D2E150:: @ 8D2E150
- .incbin "baserom.gba", 0xD2E150, 0x1D @ LZ, uncomp. size = 0x20
+ .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz"
.align 2
gUnknown_08D2E170:: @ 8D2E170
- .incbin "baserom.gba", 0xD2E170, 0x11C @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz"
.align 2
gBattleAnimSpritePalette_245:: @ 8D2E28C
@@ -2422,11 +2422,11 @@ gBattleAnimSpriteSheet_053:: @ 8D2EBDC
.align 2
gUnknown_08D2EDFC:: @ 8D2EDFC
- .incbin "baserom.gba", 0xD2EDFC, 0x4B @ LZ, uncomp. size = 0x1C0
+ .incbin "graphics/battle_anims/masks/unknown_D2EDFC.4bpp.lz"
.align 2
gUnknown_08D2EE48:: @ 8D2EE48
- .incbin "baserom.gba", 0xD2EE48, 0x106 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/battle_anims/masks/unknown_D2EDFC.bin.lz"
.align 2
gBattleAnimSpriteSheet_248:: @ 8D2EF50
diff --git a/graphics/battle_anims/masks/cure_bubbles.bin b/graphics/battle_anims/masks/cure_bubbles.bin
new file mode 100755
index 000000000..fa2f572b6
--- /dev/null
+++ b/graphics/battle_anims/masks/cure_bubbles.bin
Binary files differ
diff --git a/graphics/battle_anims/masks/cure_bubbles.pal b/graphics/battle_anims/masks/cure_bubbles.pal
new file mode 100755
index 000000000..2868f2479
--- /dev/null
+++ b/graphics/battle_anims/masks/cure_bubbles.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+189 255 255
+123 255 255
+57 255 255
+57 205 238
+57 156 230
+57 106 213
+65 57 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/cure_bubbles.png b/graphics/battle_anims/masks/cure_bubbles.png
new file mode 100755
index 000000000..aa7f7b1f2
--- /dev/null
+++ b/graphics/battle_anims/masks/cure_bubbles.png
Binary files differ
diff --git a/graphics/battle_anims/masks/curse.bin b/graphics/battle_anims/masks/curse.bin
new file mode 100755
index 000000000..1e9623948
--- /dev/null
+++ b/graphics/battle_anims/masks/curse.bin
Binary files differ
diff --git a/graphics/battle_anims/masks/curse.png b/graphics/battle_anims/masks/curse.png
new file mode 100755
index 000000000..03979ee8d
--- /dev/null
+++ b/graphics/battle_anims/masks/curse.png
Binary files differ
diff --git a/graphics/battle_anims/masks/metal_shine.pal b/graphics/battle_anims/masks/metal_shine.pal
new file mode 100755
index 000000000..019a17c3f
--- /dev/null
+++ b/graphics/battle_anims/masks/metal_shine.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+82 172 255
+255 255 255
+164 148 139
+98 131 41
+123 156 65
+148 180 90
+172 205 115
+197 230 139
+222 255 164
+82 172 0
+98 180 24
+123 197 49
+148 213 74
+172 222 98
+197 238 123
+222 255 148
diff --git a/graphics/battle_anims/masks/metal_shine.png b/graphics/battle_anims/masks/metal_shine.png
new file mode 100755
index 000000000..a9c5a952c
--- /dev/null
+++ b/graphics/battle_anims/masks/metal_shine.png
Binary files differ
diff --git a/graphics/battle_anims/masks/morning_sun.bin b/graphics/battle_anims/masks/morning_sun.bin
new file mode 100755
index 000000000..cfa7b8069
--- /dev/null
+++ b/graphics/battle_anims/masks/morning_sun.bin
Binary files differ
diff --git a/graphics/battle_anims/masks/morning_sun.pal b/graphics/battle_anims/masks/morning_sun.pal
new file mode 100755
index 000000000..08249a43c
--- /dev/null
+++ b/graphics/battle_anims/masks/morning_sun.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 246 246
+189 238 238
+156 230 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/morning_sun.png b/graphics/battle_anims/masks/morning_sun.png
new file mode 100755
index 000000000..c10b02782
--- /dev/null
+++ b/graphics/battle_anims/masks/morning_sun.png
Binary files differ
diff --git a/graphics/battle_anims/masks/stat.png b/graphics/battle_anims/masks/stat.png
new file mode 100755
index 000000000..0a6014ccd
--- /dev/null
+++ b/graphics/battle_anims/masks/stat.png
Binary files differ
diff --git a/graphics/battle_anims/masks/stat1.pal b/graphics/battle_anims/masks/stat1.pal
new file mode 100755
index 000000000..d4128a31f
--- /dev/null
+++ b/graphics/battle_anims/masks/stat1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 255 205
+189 255 164
+156 255 123
+115 222 90
+74 197 57
+32 172 24
+0 148 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat2.pal b/graphics/battle_anims/masks/stat2.pal
new file mode 100755
index 000000000..434b06e8d
--- /dev/null
+++ b/graphics/battle_anims/masks/stat2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 255 189
+255 255 123
+255 255 57
+255 189 41
+255 131 32
+255 65 16
+255 8 8
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat3.pal b/graphics/battle_anims/masks/stat3.pal
new file mode 100755
index 000000000..784e5c640
--- /dev/null
+++ b/graphics/battle_anims/masks/stat3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+238 222 246
+222 189 246
+205 156 246
+197 123 246
+197 123 246
+164 90 213
+131 57 180
+106 24 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat4.pal b/graphics/battle_anims/masks/stat4.pal
new file mode 100755
index 000000000..2868f2479
--- /dev/null
+++ b/graphics/battle_anims/masks/stat4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+189 255 255
+123 255 255
+57 255 255
+57 205 238
+57 156 230
+57 106 213
+65 57 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat5.pal b/graphics/battle_anims/masks/stat5.pal
new file mode 100755
index 000000000..4991b1bd7
--- /dev/null
+++ b/graphics/battle_anims/masks/stat5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+230 230 230
+205 205 205
+180 180 189
+164 164 164
+139 139 148
+115 115 123
+98 98 106
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat6.pal b/graphics/battle_anims/masks/stat6.pal
new file mode 100755
index 000000000..f647ff4b3
--- /dev/null
+++ b/graphics/battle_anims/masks/stat6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+205 246 230
+156 246 213
+106 246 197
+57 246 180
+32 213 148
+16 180 123
+0 148 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/masks/stat_tilemap_1.bin b/graphics/battle_anims/masks/stat_tilemap_1.bin
new file mode 100755
index 000000000..1b65e515a
--- /dev/null
+++ b/graphics/battle_anims/masks/stat_tilemap_1.bin
Binary files differ
diff --git a/graphics/battle_anims/masks/stat_tilemap_2.bin b/graphics/battle_anims/masks/stat_tilemap_2.bin
new file mode 100755
index 000000000..eb336cb74
--- /dev/null
+++ b/graphics/battle_anims/masks/stat_tilemap_2.bin
@@ -0,0 +1 @@
+€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€ \ No newline at end of file
diff --git a/graphics/battle_anims/masks/unknown_D2EDFC.bin b/graphics/battle_anims/masks/unknown_D2EDFC.bin
new file mode 100755
index 000000000..712c1ee12
--- /dev/null
+++ b/graphics/battle_anims/masks/unknown_D2EDFC.bin
Binary files differ
diff --git a/graphics/battle_anims/masks/unknown_D2EDFC.png b/graphics/battle_anims/masks/unknown_D2EDFC.png
new file mode 100755
index 000000000..d0b372cbb
--- /dev/null
+++ b/graphics/battle_anims/masks/unknown_D2EDFC.png
Binary files differ
diff --git a/graphics/contest/audience.png b/graphics/contest/audience.png
new file mode 100755
index 000000000..59f8d0add
--- /dev/null
+++ b/graphics/contest/audience.png
Binary files differ
diff --git a/graphics/contest/heart.png b/graphics/contest/heart.png
new file mode 100755
index 000000000..bd1ede8fc
--- /dev/null
+++ b/graphics/contest/heart.png
Binary files differ
diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal
new file mode 100755
index 000000000..869aef9e1
--- /dev/null
+++ b/graphics/contest/misc_2.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+255 106 115
+255 57 57
+205 32 0
+246 213 0
+255 123 98
+156 180 90
+164 148 57
+90 106 139
+180 172 82
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+164 222 255
+106 148 255
+24 57 205
+246 213 0
+255 123 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+255 197 255
+255 139 255
+213 0 139
+246 213 0
+255 123 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+180 255 197
+148 255 164
+65 172 57
+246 213 0
+255 123 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+255 255 164
+246 213 0
+230 106 0
+246 213 0
+255 123 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+197 255 255
+255 255 255
+213 213 213
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+164 222 255
+106 148 255
+49 82 255
+180 255 197
+148 255 164
+65 172 57
+0 0 0
+0 0 0
+0 0 0
+197 255 255
+255 255 255
+213 213 213
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+255 139 230
+255 139 230
+255 49 156
+255 255 0
+255 255 0
+189 172 0
+41 49 90
+41 49 90
+0 0 0
+197 123 131
+255 255 255
+230 246 255
+205 238 255
+180 238 255
+156 230 255
+139 230 255
+255 205 230
+255 255 139
+255 230 255
+255 255 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+197 255 255
+255 255 255
+213 213 213
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+255 172 197
+255 172 172
+255 180 148
+255 189 123
+255 197 98
+255 205 82
+156 156 156
+156 156 156
+156 156 156
+197 255 255
+255 255 255
+213 213 213
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+164 222 255
+106 148 255
+49 82 255
+180 255 197
+148 255 164
+65 172 57
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+164 222 255
+106 230 222
+49 238 189
+0 255 156
+0 255 156
+82 255 98
+164 255 49
+255 255 0
+255 172 16
+255 90 32
+255 8 57
+230 57 106
+205 115 156
+180 164 205
+164 222 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png
new file mode 100755
index 000000000..44a4a8295
--- /dev/null
+++ b/graphics/contest/misc_2.png
Binary files differ
diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/misc_2_tilemap_1.bin
new file mode 100755
index 000000000..197e88cee
--- /dev/null
+++ b/graphics/contest/misc_2_tilemap_1.bin
Binary files differ
diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin
new file mode 100755
index 000000000..b31126836
--- /dev/null
+++ b/graphics/contest/misc_2_tilemap_2.bin
Binary files differ
diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/misc_2_tilemap_3.bin
new file mode 100755
index 000000000..5055ab79e
--- /dev/null
+++ b/graphics/contest/misc_2_tilemap_3.bin
@@ -0,0 +1 @@
+`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’t€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdtp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”t‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvtdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtptfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘tt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’t€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdtp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”t‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvtdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtptfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘tt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt \ No newline at end of file
diff --git a/graphics/unused/old_beatup.pal b/graphics/unused/old_beatup.pal
new file mode 100755
index 000000000..31c43515e
--- /dev/null
+++ b/graphics/unused/old_beatup.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 139
+0 0 0
+82 82 82
+164 164 164
+255 255 255
+213 213 164
+180 172 82
+148 131 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unused/old_beatup.png b/graphics/unused/old_beatup.png
new file mode 100755
index 000000000..e2a0561e2
--- /dev/null
+++ b/graphics/unused/old_beatup.png
Binary files differ
diff --git a/graphics/unused/unknown_D1C060.bin b/graphics/unused/unknown_D1C060.bin
new file mode 100755
index 000000000..e4776cba4
--- /dev/null
+++ b/graphics/unused/unknown_D1C060.bin
Binary files differ
diff --git a/graphics/unused/unknown_D1C060.pal b/graphics/unused/unknown_D1C060.pal
new file mode 100755
index 000000000..0b2590f44
--- /dev/null
+++ b/graphics/unused/unknown_D1C060.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+222 255 255
+0 65 148
+148 65 148
+255 255 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unused/unknown_D1C060.png b/graphics/unused/unknown_D1C060.png
new file mode 100755
index 000000000..2371241d7
--- /dev/null
+++ b/graphics/unused/unknown_D1C060.png
Binary files differ
diff --git a/misc.mk b/misc.mk
index b5fa734fb..eda3cd813 100755
--- a/misc.mk
+++ b/misc.mk
@@ -11,6 +11,7 @@ ROULGFXDIR := graphics/roulette
BTLANMSPRGFXDIR := graphics/battle_anims/sprites
PICFRAMEGFXDIR := graphics/picture_frame
CONTESTGFXDIR := graphics/contest
+MASKSGFXDIR := graphics/battle_anims/masks
$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal
@cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
@@ -194,3 +195,6 @@ $(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNU
$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp
@cat $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp >$@
+
+$(MASKSGFXDIR)/unknown_D2EDFC.4bpp: $(MASKSGFXDIR)/unknown_D2EDFC.png
+ $(GFX) $< $@ -num_tiles 14 \ No newline at end of file