commit current work

15 files changed, 73 insertions, 4 deletions

diff --git a/data/graphics.s b/data/graphics.s
index df597cca3..07cb50be4 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -499,8 +499,9 @@ gBattleAnimSpritePalette_045:: @ 8D099B4
 gBattleAnimSpriteSheet_045:: @ 8D099DC
 	.incbin "graphics/battle_anims/sprites/045.4bpp.lz"
 
+	.align 2
 gUnknown_08D09C48:: @ 8D09C48
-	.incbin "baserom.gba", 0x00d09c48, 0x214
+	.incbin "graphics/interface/hp_numbers.4bpp.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_046:: @ 8D09E5C
@@ -542,7 +543,11 @@ gBattleAnimSpriteSheet_051:: @ 8D0A62C
 gBattleAnimSpriteSheet_052:: @ 8D0A6D8
 	.incbin "graphics/battle_anims/sprites/052.4bpp.lz"
 
-	.incbin "baserom.gba", 0xd0a7a4, 0x194
+	.align 2
+	.incbin "graphics/unused/line_sketch.4bpp.lz" @ unused
+	
+	.align 2
+	.incbin "graphics/unused/line_sketch.gbapal.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_054:: @ 8D0A938
@@ -620,7 +625,8 @@ gBattleAnimSpriteSheet_063:: @ 8D0B9D4
 gBattleAnimSpritePalette_063:: @ 8D0BB90
 	.incbin "graphics/battle_anims/sprites/063.gbapal.lz"
 
-	.incbin "baserom.gba", 0xd0bbb8, 0x70
+	.align 2
+	.incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point
 
 	.align 2
 gBattleAnimSpritePalette_091:: @ 8D0BC28
@@ -933,8 +939,18 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78
 	.align 2
 gBattleAnimSpritePalette_114:: @ 8D1106C
 	.incbin "graphics/battle_anims/sprites/114.gbapal.lz"
+	
+	.align 2
+	.incbin "graphics/unused/blue_frame.bin.lz" @  P1, P2, P3 and P4 tilemaps?
 
-	.incbin "baserom.gba", 0xd11094, 0xae0
+	.align 2
+	.incbin "graphics/unused/redyellowgreen_frame.bin.lz"
+	
+	.align 2
+	.incbin "graphics/unused/color_frames.4bpp.lz"
+	
+	.align 2
+	.incbin "graphics/unused/color_frames.gbapal.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_115:: @ 8D11B74
@@ -942,10 +958,15 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74
 
 	.incbin "baserom.gba", 0xd11ca4, 0x488
 
+	.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
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
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
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
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
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
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
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
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
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
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
diff --git a/misc.mk b/misc.mk
index e99de3c63..67303d997 100755
--- a/misc.mk
+++ b/misc.mk
@@ -178,3 +178,13 @@ $(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/obi_bulbasaur.4bpp $(UNUSEDGFXDIR)/ob
 
 $(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
+