summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcompare-ruby.sh11
-rwxr-xr-xcompare-sapphire.sh11
-rw-r--r--data/graphics.s90
-rwxr-xr-xgraphics/interface/hpbar_anim.pngbin0 -> 192 bytes
-rwxr-xr-xgraphics/interface/numbers1.pngbin0 -> 201 bytes
-rwxr-xr-xgraphics/interface/numbers2.pngbin0 -> 215 bytes
-rwxr-xr-xgraphics/unknown/unknown_D07B68.pal19
-rwxr-xr-xgraphics/unknown/unknown_D07B68.pngbin0 -> 181 bytes
-rwxr-xr-xgraphics/unknown/unknown_D07B68_2.pal35
-rwxr-xr-xgraphics/unused/blank_frame.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/blue_frame.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/color_frames.pal19
-rwxr-xr-xgraphics/unused/color_frames.pngbin0 -> 282 bytes
-rwxr-xr-xgraphics/unused/green_frame.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/line_sketch.pal19
-rwxr-xr-xgraphics/unused/line_sketch.pngbin0 -> 328 bytes
-rwxr-xr-xgraphics/unused/metronome_hand_small.pngbin0 -> 202 bytes
-rwxr-xr-xgraphics/unused/obi_battle_interface_1.pngbin0 -> 524 bytes
-rwxr-xr-xgraphics/unused/obi_battle_interface_2.pngbin0 -> 198 bytes
-rwxr-xr-xgraphics/unused/obi_battle_interface_3.pngbin0 -> 226 bytes
-rwxr-xr-xgraphics/unused/obi_bulbasaur.pngbin0 -> 490 bytes
-rwxr-xr-xgraphics/unused/obi_bulbasaur2.pngbin0 -> 520 bytes
-rwxr-xr-xgraphics/unused/obi_charizard.pngbin0 -> 335 bytes
-rwxr-xr-xgraphics/unused/obi_pal1.pal19
-rwxr-xr-xgraphics/unused/obi_pal2.pal19
-rwxr-xr-xgraphics/unused/obi_pal3.pal19
-rwxr-xr-xgraphics/unused/obi_pal4.pal19
-rwxr-xr-xgraphics/unused/obi_pal5.pal19
-rwxr-xr-xgraphics/unused/obi_pal6.pal19
-rwxr-xr-xgraphics/unused/obi_pal7.pal19
-rwxr-xr-xgraphics/unused/obi_tilemap.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/red_frame.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unused/yellow_frame.binbin0 -> 2048 bytes
-rwxr-xr-xmisc.mk23
34 files changed, 331 insertions, 29 deletions
diff --git a/compare-ruby.sh b/compare-ruby.sh
new file mode 100755
index 000000000..5fbd2a1c8
--- /dev/null
+++ b/compare-ruby.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Compares baserom-ruby.gba and pokeruby.gba
+
+# create baserom.txt if necessary
+if [ ! -f baserom-ruby.txt ]; then
+ hexdump -C baserom-ruby.gba > baserom-ruby.txt
+fi
+
+hexdump -C pokeruby.gba > pokeruby.txt
+
+diff -u baserom-ruby.txt pokeruby.txt | less
diff --git a/compare-sapphire.sh b/compare-sapphire.sh
new file mode 100755
index 000000000..b4047e81d
--- /dev/null
+++ b/compare-sapphire.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Compares baserom-sapphire.gba and pokesapphire.gba
+
+# create baserom.txt if necessary
+if [ ! -f baserom-sapphire.txt ]; then
+ hexdump -C baserom-sapphire.gba > baserom-sapphire.txt
+fi
+
+hexdump -C pokesapphire.gba > pokesapphire.txt
+
+diff -u baserom-sapphire.txt pokesapphire.txt | less
diff --git a/data/graphics.s b/data/graphics.s
index 360338b53..a4189b70a 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"
@@ -393,33 +418,35 @@ gBattleAnimSpriteSheet_036:: @ 8D07448
.align 2
gBattleAnimSpriteSheet_037:: @ 8D0781C
.incbin "graphics/battle_anims/sprites/037.4bpp.lz"
+
+@ old battle interface data, unused
.align 2
- .incbin "baserom.gba", 0xD07B68, 0x42 @ LZ, uncomp. size = 0xA0
-
+ .incbin "graphics/unknown/unknown_D07B68.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BAC, 0x14 @ LZ, uncomp. size = 0x20
-
+ .incbin "graphics/unknown/unknown_D07B68.gbapal.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BC0, 0x33 @ LZ, uncomp. size = 0x40
-
+ .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BF4, 0x362 @ LZ, uncomp. size = 0x800
-
+ .incbin "graphics/unused/obi1.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07F58, 0x41 @ LZ, uncomp. size = 0x60
-
+ .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3
+
.align 2
- .incbin "baserom.gba", 0xD07F9C, 0x16 @ LZ, uncomp. size = 0x20
-
+ .incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself
+
.align 2
- .incbin "baserom.gba", 0xD07FB4, 0x57 @ LZ, uncomp. size = 0x60
-
+ .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7
+
.align 2
- .incbin "baserom.gba", 0xD0800C, 0x5C6 @ LZ, uncomp. size = 0x1400
-
+ .incbin "graphics/unused/obi2.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD085D4, 0x10D @ LZ, uncomp. size = 0x800
+ .incbin "graphics/unused/obi_tilemap.bin.lz"
.align 2
gBattleAnimSpritePalette_038:: @ 8D086E4
@@ -479,7 +506,7 @@ gBattleAnimSpriteSheet_045:: @ 8D099DC
.align 2
gUnknown_08D09C48:: @ 8D09C48
- .incbin "baserom.gba", 0xD09C48, 0x211 @ LZ, uncomp. size = 0x520
+ .incbin "graphics/interface/hp_numbers.4bpp.lz"
.align 2
gBattleAnimSpriteSheet_046:: @ 8D09E5C
@@ -522,10 +549,10 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8
.incbin "graphics/battle_anims/sprites/052.4bpp.lz"
.align 2
- .incbin "baserom.gba", 0xD0A7A4, 0x181 @ LZ, uncomp. size = 0x600
-
+ .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused
+
.align 2
- .incbin "baserom.gba", 0xD0A928, 0xF @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/line_sketch.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_054:: @ 8D0A938
@@ -604,7 +631,7 @@ gBattleAnimSpritePalette_063:: @ 8D0BB90
.incbin "graphics/battle_anims/sprites/063.gbapal.lz"
.align 2
- .incbin "baserom.gba", 0xD0BBB8, 0x6D @ LZ, uncomp. size = 0x80
+ .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point
.align 2
gBattleAnimSpritePalette_091:: @ 8D0BC28
@@ -934,18 +961,18 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78
.align 2
gBattleAnimSpritePalette_114:: @ 8D1106C
.incbin "graphics/battle_anims/sprites/114.gbapal.lz"
-
+
.align 2
- .incbin "baserom.gba", 0xD11094, 0x115 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps?
.align 2
- .incbin "baserom.gba", 0xD111AC, 0x3FE @ LZ, uncomp. size = 0x2000
-
+ .incbin "graphics/unused/redyellowgreen_frame.bin.lz"
+
.align 2
- .incbin "baserom.gba", 0xD115AC, 0x59F @ LZ, uncomp. size = 0x2C20
-
+ .incbin "graphics/unused/color_frames.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD11B4C, 0x28 @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/color_frames.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_115:: @ 8D11B74
@@ -969,10 +996,15 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74
.align 2
.incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800
+ .align 2
gUnknown_08D1212C::
.incbin "graphics/interface/battle_window.gbapal"
+
+ .align 2
gUnknown_08D1214C::
.incbin "baserom.gba", 0xd1214c, 0x20
+
+ .align 2
gUnknown_08D1216C:: @ 8D1216C
.incbin "baserom.gba", 0xd1216c, 0x840
diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png
new file mode 100755
index 000000000..d4e79fdae
--- /dev/null
+++ b/graphics/interface/hpbar_anim.png
Binary files differ
diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png
new file mode 100755
index 000000000..f15757958
--- /dev/null
+++ b/graphics/interface/numbers1.png
Binary files differ
diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png
new file mode 100755
index 000000000..4ddf364bf
--- /dev/null
+++ b/graphics/interface/numbers2.png
Binary files differ
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
Binary files differ
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/blank_frame.bin b/graphics/unused/blank_frame.bin
new file mode 100755
index 000000000..e9784eb4c
--- /dev/null
+++ b/graphics/unused/blank_frame.bin
Binary files differ
diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin
new file mode 100755
index 000000000..d5c3b6600
--- /dev/null
+++ b/graphics/unused/blue_frame.bin
Binary files differ
diff --git a/graphics/unused/color_frames.pal b/graphics/unused/color_frames.pal
new file mode 100755
index 000000000..56bf2a29c
--- /dev/null
+++ b/graphics/unused/color_frames.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 255 255
+106 123 164
+205 205 205
+255 255 255
+164 164 164
+0 0 0
+172 0 0
+222 0 0
+197 74 0
+255 24 0
+205 164 106
+255 222 164
+255 131 0
+255 255 255
+123 238 90
+131 172 246
diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png
new file mode 100755
index 000000000..9270879eb
--- /dev/null
+++ b/graphics/unused/color_frames.png
Binary files differ
diff --git a/graphics/unused/green_frame.bin b/graphics/unused/green_frame.bin
new file mode 100755
index 000000000..b381235d9
--- /dev/null
+++ b/graphics/unused/green_frame.bin
Binary files differ
diff --git a/graphics/unused/line_sketch.pal b/graphics/unused/line_sketch.pal
new file mode 100755
index 000000000..dc1d51763
--- /dev/null
+++ b/graphics/unused/line_sketch.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 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 0 0
+0 0 0
diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png
new file mode 100755
index 000000000..fdfc8d771
--- /dev/null
+++ b/graphics/unused/line_sketch.png
Binary files differ
diff --git a/graphics/unused/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png
new file mode 100755
index 000000000..bd6cc8530
--- /dev/null
+++ b/graphics/unused/metronome_hand_small.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/graphics/unused/red_frame.bin b/graphics/unused/red_frame.bin
new file mode 100755
index 000000000..5090b1b84
--- /dev/null
+++ b/graphics/unused/red_frame.bin
Binary files differ
diff --git a/graphics/unused/yellow_frame.bin b/graphics/unused/yellow_frame.bin
new file mode 100755
index 000000000..30ba3ed01
--- /dev/null
+++ b/graphics/unused/yellow_frame.bin
Binary files differ
diff --git a/misc.mk b/misc.mk
index bfcb81118..67303d997 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,25 @@ $(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 >$@
+
+$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp
+ @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@
+
+$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin
+ @cat $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin >$@
+
+$(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png
+ $(GFX) $< $@ -num_tiles 353
+