dump old unused battle interface gfx

19 files changed, 253 insertions, 1 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 5edddac3b..df597cca3 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410
 gSmokescreenImpactPalette:: @ 8D024F0
 	.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_PokeBall::
 	.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_PokeBall::
 	.incbin "graphics/interface/ball/poke.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_GreatBall::
 	.incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_GreatBall::
 	.incbin "graphics/interface/ball/great.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_SafariBall::
 	.incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_SafariBall::
 	.incbin "graphics/interface/ball/safari.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_UltraBall::
 	.incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_UltraBall::
 	.incbin "graphics/interface/ball/ultra.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_MasterBall::
 	.incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_MasterBall::
 	.incbin "graphics/interface/ball/master.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_NetBall::
 	.incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_NetBall::
 	.incbin "graphics/interface/ball/net.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_DiveBall::
 	.incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_DiveBall::
 	.incbin "graphics/interface/ball/dive.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_NestBall::
 	.incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_NestBall::
 	.incbin "graphics/interface/ball/nest.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_RepeatBall::
 	.incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_RepeatBall::
 	.incbin "graphics/interface/ball/repeat.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_TimerBall::
 	.incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_TimerBall::
 	.incbin "graphics/interface/ball/timer.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_LuxuryBall::
 	.incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_LuxuryBall::
 	.incbin "graphics/interface/ball/luxury.gbapal.lz"
 
+	.align 2
 gInterfaceGfx_PremierBall::
 	.incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC
 
+	.align 2
 gInterfacePal_PremierBall::
 	.incbin "graphics/interface/ball/premier.gbapal.lz"
 
+	.align 2
 gUnknown_08D030D0:: @ 8D030D0
 	.incbin "graphics/interface/ball_open.4bpp.lz"
 
@@ -388,8 +413,35 @@ gBattleAnimSpriteSheet_036:: @ 8D07448
 	.align 2
 gBattleAnimSpriteSheet_037:: @ 8D0781C
 	.incbin "graphics/battle_anims/sprites/037.4bpp.lz"
+	
+@ old battle interface data, unused
 
-	.incbin "baserom.gba", 0xd07b68, 0xb7c
+	.align 2
+	.incbin "graphics/unknown/unknown_D07B68.4bpp.lz"
+	
+	.align 2
+	.incbin "graphics/unknown/unknown_D07B68.gbapal.lz"
+	
+	.align 2
+	.incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz"
+	
+	.align 2
+	.incbin "graphics/unused/obi1.4bpp.lz"
+	
+	.align 2
+	.incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3
+	
+	.align 2
+	.incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself
+	
+	.align 2
+	.incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7
+	
+	.align 2
+	.incbin "graphics/unused/obi2.4bpp.lz"
+	
+	.align 2
+	.incbin "graphics/unused/obi_tilemap.bin.lz"
 
 	.align 2
 gBattleAnimSpritePalette_038:: @ 8D086E4
diff --git a/graphics/unknown/unknown_D07B68.pal b/graphics/unknown/unknown_D07B68.pal
new file mode 100755
index 000000000..ca77648e6
--- /dev/null
+++ b/graphics/unknown/unknown_D07B68.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 0 0
+255 255 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 0
+0 0 0
diff --git a/graphics/unknown/unknown_D07B68.png b/graphics/unknown/unknown_D07B68.png
new file mode 100755
index 000000000..d36afa64d
--- /dev/null
+++ b/graphics/unknown/unknown_D07B68.png
diff --git a/graphics/unknown/unknown_D07B68_2.pal b/graphics/unknown/unknown_D07B68_2.pal
new file mode 100755
index 000000000..44f4b55d6
--- /dev/null
+++ b/graphics/unknown/unknown_D07B68_2.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+98 156 131
+57 57 57
+156 156 156
+255 255 255
+255 205 0
+255 255 98
+213 98 24
+255 123 32
+106 65 172
+65 24 172
+255 205 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 156 131
+57 57 57
+156 156 156
+255 255 255
+57 123 0
+90 189 0
+123 255 8
+230 106 148
+255 139 255
+255 205 0
+255 255 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unused/obi_battle_interface_1.png b/graphics/unused/obi_battle_interface_1.png
new file mode 100755
index 000000000..0b2fe5eb7
--- /dev/null
+++ b/graphics/unused/obi_battle_interface_1.png
diff --git a/graphics/unused/obi_battle_interface_2.png b/graphics/unused/obi_battle_interface_2.png
new file mode 100755
index 000000000..04229ccda
--- /dev/null
+++ b/graphics/unused/obi_battle_interface_2.png
diff --git a/graphics/unused/obi_battle_interface_3.png b/graphics/unused/obi_battle_interface_3.png
new file mode 100755
index 000000000..428c7765d
--- /dev/null
+++ b/graphics/unused/obi_battle_interface_3.png
diff --git a/graphics/unused/obi_bulbasaur.png b/graphics/unused/obi_bulbasaur.png
new file mode 100755
index 000000000..729ebe789
--- /dev/null
+++ b/graphics/unused/obi_bulbasaur.png
diff --git a/graphics/unused/obi_bulbasaur2.png b/graphics/unused/obi_bulbasaur2.png
new file mode 100755
index 000000000..f374e5a9f
--- /dev/null
+++ b/graphics/unused/obi_bulbasaur2.png
diff --git a/graphics/unused/obi_charizard.png b/graphics/unused/obi_charizard.png
new file mode 100755
index 000000000..e1470aada
--- /dev/null
+++ b/graphics/unused/obi_charizard.png
diff --git a/graphics/unused/obi_pal1.pal b/graphics/unused/obi_pal1.pal
new file mode 100755
index 000000000..1e2ef9083
--- /dev/null
+++ b/graphics/unused/obi_pal1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+16 139 0
+0 0 0
+148 65 65
+0 0 0
+148 65 32
+16 0 0
+148 65 32
+8 8 0
+148 65 32
+148 8 8
+148 65 65
+24 16 0
+16 139 98
+32 0 0
+0 16 139
+0 0 0
diff --git a/graphics/unused/obi_pal2.pal b/graphics/unused/obi_pal2.pal
new file mode 100755
index 000000000..3c5e6ad7f
--- /dev/null
+++ b/graphics/unused/obi_pal2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+16 139 0
+0 0 0
+148 65 65
+0 0 0
+148 65 32
+16 0 0
+148 65 32
+8 8 0
+148 65 32
+16 0 0
+148 65 65
+0 0 0
+16 139 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unused/obi_pal3.pal b/graphics/unused/obi_pal3.pal
new file mode 100755
index 000000000..d07e21019
--- /dev/null
+++ b/graphics/unused/obi_pal3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 16 139
+0 0 0
+0 213 98
+32 0 0
+0 213 98
+24 16 0
+0 213 98
+156 8 8
+0 213 98
+24 16 0
+0 213 98
+32 0 0
+0 16 139
+0 0 0
diff --git a/graphics/unused/obi_pal4.pal b/graphics/unused/obi_pal4.pal
new file mode 100755
index 000000000..60b814f75
--- /dev/null
+++ b/graphics/unused/obi_pal4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+41 41 57
+90 90 106
+172 172 180
+197 197 205
+0 0 0
+0 0 0
+0 0 0
+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/obi_pal5.pal b/graphics/unused/obi_pal5.pal
new file mode 100755
index 000000000..b6f481d46
--- /dev/null
+++ b/graphics/unused/obi_pal5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 156 131
+115 115 115
+189 189 189
+255 255 255
+189 164 41
+246 246 41
+222 106 32
+246 131 41
+115 98 246
+98 74 205
+238 115 156
+246 148 246
+115 172 246
+8 8 8
+90 90 90
+65 65 65
diff --git a/graphics/unused/obi_pal6.pal b/graphics/unused/obi_pal6.pal
new file mode 100755
index 000000000..6d91e9918
--- /dev/null
+++ b/graphics/unused/obi_pal6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 156 131
+115 115 115
+189 189 189
+255 255 255
+115 148 74
+156 205 74
+148 246 74
+238 115 156
+246 148 246
+189 164 41
+246 246 41
+8 8 8
+8 8 8
+8 8 8
+90 90 90
+65 65 65
diff --git a/graphics/unused/obi_pal7.pal b/graphics/unused/obi_pal7.pal
new file mode 100755
index 000000000..d380bc65d
--- /dev/null
+++ b/graphics/unused/obi_pal7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 156 131
+115 115 115
+156 156 156
+255 255 255
+98 115 246
+115 172 246
+164 98 41
+230 172 139
+189 164 41
+246 246 41
+246 98 82
+148 123 205
+197 164 205
+213 41 156
+90 90 90
+65 65 65
diff --git a/graphics/unused/obi_tilemap.bin b/graphics/unused/obi_tilemap.bin
new file mode 100755
index 000000000..aae3307e7
--- /dev/null
+++ b/graphics/unused/obi_tilemap.bin
diff --git a/misc.mk b/misc.mk
index bfcb81118..e99de3c63 100755
--- a/misc.mk
+++ b/misc.mk
@@ -5,6 +5,7 @@ PSSGFXDIR := graphics/pokemon_storage
 MISCGFXDIR := graphics/misc
 PKNAVGFXDIR := graphics/pokenav
 UNKNOWNGFXDIR := graphics/unknown
+UNUSEDGFXDIR := graphics/unused
 REELGFXDIR := graphics/slot_machine
 ROULGFXDIR := graphics/roulette
 BTLANMSPRGFXDIR := graphics/battle_anims/sprites
@@ -165,3 +166,15 @@ $(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png
 
 $(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png
 	$(GFX) $< $@ -num_tiles 8
+	
+$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/obi_pal1.gbapal $(UNUSEDGFXDIR)/obi_pal2.gbapal $(UNUSEDGFXDIR)/obi_pal3.gbapal
+	@cat $(UNUSEDGFXDIR)/obi_pal1.gbapal $(UNUSEDGFXDIR)/obi_pal2.gbapal $(UNUSEDGFXDIR)/obi_pal3.gbapal >$@
+
+$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/obi_pal5.gbapal $(UNUSEDGFXDIR)/obi_pal6.gbapal $(UNUSEDGFXDIR)/obi_pal7.gbapal
+	@cat $(UNUSEDGFXDIR)/obi_pal5.gbapal $(UNUSEDGFXDIR)/obi_pal6.gbapal $(UNUSEDGFXDIR)/obi_pal7.gbapal >$@
+
+$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/obi_bulbasaur.4bpp $(UNUSEDGFXDIR)/obi_charizard.4bpp
+	@cat $(UNUSEDGFXDIR)/obi_bulbasaur.4bpp $(UNUSEDGFXDIR)/obi_charizard.4bpp >$@
+
+$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/obi_bulbasaur2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_1.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_3.4bpp
+	@cat $(UNUSEDGFXDIR)/obi_bulbasaur2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_1.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_3.4bpp >$@