dump misc contest gfx and move gfx to its own folder

13 files changed, 278 insertions, 13 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 22e91d378..1a9614897 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -302,7 +302,7 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4
 	.incbin "graphics/battle_anims/sprites/023.4bpp.lz"
 
 	.align 2
-	.incbin "baserom.gba", 0xD046AC, 0x26 @ palette
+	.incbin "baserom.gba", 0xD046AC, 0x28 @ palette
 
 	.align 2
 	.incbin "graphics/unused/music_notes.4bpp.lz"
@@ -418,8 +418,6 @@ gBattleAnimSpriteSheet_036:: @ 8D07448
 	.align 2
 gBattleAnimSpriteSheet_037:: @ 8D0781C
 	.incbin "graphics/battle_anims/sprites/037.4bpp.lz"
-	
-@ old battle interface data, unused
 
 	.align 2
 	.incbin "graphics/unknown/unknown_D07B68.4bpp.lz"
@@ -430,6 +428,8 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C
 	.align 2
 	.incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz"
 	
+@ old battle interface data, unused
+	
 	.align 2
 	.incbin "graphics/unused/obi1.4bpp.lz"
 	
@@ -1021,6 +1021,7 @@ gUnknown_08D1216C:: @ 8D1216C
 Tiles_D129AC:: @ 8D129AC
 	.incbin "graphics/battle_interface/ball_display.4bpp"
 	
+	@ extra stuff
 	.incbin "graphics/battle_interface/ball_display_unused_extra.4bpp"
 	.incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now.
 	.incbin "graphics/battle_interface/status3.4bpp"
@@ -1197,15 +1198,15 @@ gContestNumbers_UnusedPal::
 	.incbin "graphics/unused/numbers.gbapal.lz"
 
 	.align 2
-	.incbin "baserom.gba", 0xD16134, 0x100F @ LZ, uncomp. size = 0x4000
+	.incbin "graphics/unused/old_contest_2.4bpp.lz"
 
 	.align 2
 gUnknown_08D17144:: @ 8D17144
-	.incbin "baserom.gba", 0xD17144, 0x116 @ LZ, uncomp. size = 0x200
+	.incbin "graphics/unused/old_contest_2.gbapal.lz"
 
 	.align 2
 gUnknown_08D1725C:: @ 8D1725C
-	.incbin "baserom.gba", 0xD1725C, 0x1C5 @ LZ, uncomp. size = 0x800
+	.incbin "graphics/unused/old_contest_2.bin.lz"
 
 	.align 2
 gUnknown_08D17424:: @ 8D17424
@@ -1224,6 +1225,7 @@ gUnknown_08D17C3C:: @ 8D17C3C
 	.align 2
 gUnknown_08D17D6C:: @ 8D17D6C
 	.incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000
+	@.incbin "graphics/contest/misc.4bpp.lz"
 
 	.align 2
 gUnknown_08D18818:: @ 8D18818
@@ -1234,11 +1236,11 @@ gUnknown_08D18818:: @ 8D18818
 
 	.align 2
 gContestJudgeSymbolsGfx:: @ 8D19590
-	.incbin "graphics/misc/judge_symbols.4bpp.lz"
+	.incbin "graphics/contest/judge_symbols.4bpp.lz"
 
 	.align 2
 gContest3Pal::
-	.incbin "graphics/misc/judge_symbols.gbapal.lz"
+	.incbin "graphics/contest/judge_symbols.gbapal.lz"
 
 	.align 2
 gTiles_8D1975C:: @ 8D1975C
@@ -1521,11 +1523,11 @@ gBattleAnimSpritePalette_172:: @ 8D1C728
 
 	.align 2
 gContestJudgeGfx::
-	.incbin "graphics/misc/judge.4bpp.lz"
+	.incbin "graphics/contest/judge.4bpp.lz"
 
 	.align 2
 gContest2Pal:: @ 8D1CA1C
-	.incbin "graphics/misc/judge.gbapal.lz"
+	.incbin "graphics/contest/judge.gbapal.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_001:: @ 8D1CA44
@@ -2827,7 +2829,7 @@ gBattleAnimSpritePalette_262:: @ 8E693DC
 
 	.align 2
 gContestNextTurnGfx::
-	.incbin "graphics/misc/nextturn.4bpp.lz"
+	.incbin "graphics/contest/nextturn.4bpp.lz"
 
 gUnknown_08E69478:: @ 8E69478
 	.incbin "baserom.gba", 0x00e69478, 0x100
@@ -2864,7 +2866,7 @@ gUnknown_08E6978C:: @ 8E6978C
 
 	.align 2
 gContestPal::
-	.incbin "graphics/misc/nextturn.gbapal"
+	.incbin "graphics/contest/nextturn.gbapal"
 
 	.align 2
 gBattleAnimSpriteSheet_272:: @ 8E6982C
diff --git a/graphics/misc/judge.pal b/graphics/contest/judge.pal
index e62f2abd3..e62f2abd3 100755
--- a/graphics/misc/judge.pal
+++ b/graphics/contest/judge.pal
diff --git a/graphics/misc/judge.png b/graphics/contest/judge.png
index c4dcf520b..c4dcf520b 100755
--- a/graphics/misc/judge.png
+++ b/graphics/contest/judge.png
diff --git a/graphics/misc/judge_symbols.pal b/graphics/contest/judge_symbols.pal
index 3eeaa1128..3eeaa1128 100755
--- a/graphics/misc/judge_symbols.pal
+++ b/graphics/contest/judge_symbols.pal
diff --git a/graphics/misc/judge_symbols.png b/graphics/contest/judge_symbols.png
index 7669fb88b..7669fb88b 100755
--- a/graphics/misc/judge_symbols.png
+++ b/graphics/contest/judge_symbols.png
diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png
new file mode 100755
index 000000000..536924daf
--- /dev/null
+++ b/graphics/contest/misc.png
diff --git a/graphics/misc/nextturn.pal b/graphics/contest/nextturn.pal
index 05991c79e..05991c79e 100755
--- a/graphics/misc/nextturn.pal
+++ b/graphics/contest/nextturn.pal
diff --git a/graphics/misc/nextturn.png b/graphics/contest/nextturn.png
index 747c4b5a7..747c4b5a7 100755
--- a/graphics/misc/nextturn.png
+++ b/graphics/contest/nextturn.png
diff --git a/graphics/unused/old_contest_2.bin b/graphics/unused/old_contest_2.bin
new file mode 100755
index 000000000..06836cc19
--- /dev/null
+++ b/graphics/unused/old_contest_2.bin
diff --git a/graphics/unused/old_contest_2.pal b/graphics/unused/old_contest_2.pal
new file mode 100755
index 000000000..3fb174790
--- /dev/null
+++ b/graphics/unused/old_contest_2.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+230 230 230
+197 197 197
+148 148 148
+74 65 82
+0 255 0
+0 255 0
+65 74 123
+139 123 131
+82 82 197
+189 82 74
+131 74 98
+74 74 131
+131 139 222
+106 164 164
+0 0 0
+115 123 156
+90 65 57
+148 197 106
+123 98 65
+131 123 49
+222 189 148
+164 131 106
+115 164 82
+164 148 57
+90 106 139
+180 172 82
+82 139 49
+255 230 189
+222 131 41
+246 246 222
+205 148 115
+255 106 115
+255 57 57
+156 0 0
+164 222 255
+106 148 255
+49 82 255
+255 255 115
+246 222 65
+230 106 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+0 0 0
+255 255 115
+246 222 90
+238 189 65
+238 164 41
+230 131 16
+230 106 0
+255 41 0
+255 148 82
+255 255 164
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+0 0 0
+255 131 106
+197 24 16
+164 222 255
+106 148 255
+49 82 255
+255 197 255
+255 139 255
+213 0 139
+148 255 164
+65 205 57
+246 222 65
+230 106 0
+255 255 255
+65 74 106
+65 74 106
+197 255 255
+246 246 90
+205 205 65
+255 255 180
+180 180 24
+74 65 82
+255 255 255
+156 156 156
+255 156 156
+0 0 0
+255 255 255
+255 148 148
+255 123 98
+255 0 0
+148 148 148
+0 0 0
+197 255 255
+246 246 90
+205 205 65
+255 255 180
+180 180 24
+74 65 82
+255 255 255
+156 156 156
+255 156 156
+0 0 0
+255 255 255
+255 148 148
+255 123 98
+255 0 0
+148 148 148
+0 0 0
+197 255 255
+246 246 90
+205 205 65
+255 255 180
+180 180 24
+74 65 82
+255 255 255
+156 156 156
+255 156 156
+0 0 0
+255 255 255
+255 148 148
+255 123 98
+255 0 0
+148 148 148
+0 0 0
+197 255 255
+213 255 213
+156 222 148
+222 255 230
+123 189 115
+74 65 82
+255 255 255
+156 156 156
+255 156 156
+0 0 0
+255 255 255
+255 148 148
+255 123 98
+255 0 0
+148 148 148
+0 0 0
+0 172 255
+0 0 0
+255 255 255
+230 230 213
+0 0 0
+197 197 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+197 255 255
+0 0 0
+0 0 0
+0 0 0
+65 0 0
+123 0 0
+189 0 0
+255 8 0
+255 65 0
+255 123 0
+255 189 0
+255 255 0
+255 255 123
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+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/unused/old_contest_2_1.png b/graphics/unused/old_contest_2_1.png
new file mode 100755
index 000000000..67b81de2d
--- /dev/null
+++ b/graphics/unused/old_contest_2_1.png
diff --git a/graphics/unused/old_contest_2_2.png b/graphics/unused/old_contest_2_2.png
new file mode 100755
index 000000000..a33a8c324
--- /dev/null
+++ b/graphics/unused/old_contest_2_2.png
diff --git a/misc.mk b/misc.mk
index 3005252e7..b5fa734fb 100755
--- a/misc.mk
+++ b/misc.mk
@@ -10,6 +10,7 @@ REELGFXDIR := graphics/slot_machine
 ROULGFXDIR := graphics/roulette
 BTLANMSPRGFXDIR := graphics/battle_anims/sprites
 PICFRAMEGFXDIR := graphics/picture_frame
+CONTESTGFXDIR := graphics/contest
 
 $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal
 	@cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
@@ -164,7 +165,7 @@ $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/15
 $(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png
 	$(GFX) $< $@ -num_tiles 86
 
-$(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png
+$(CONTESTGFXDIR)/nextturn.4bpp: $(CONTESTGFXDIR)/nextturn.png
 	$(GFX) $< $@ -num_tiles 8
 	
 $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal
@@ -190,3 +191,6 @@ $(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png
 
 $(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp
 	@cat $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp >$@
+
+$(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 >$@