first wave of graphics.s dump

14 files changed, 120 insertions, 13 deletions

diff --git a/data/graphics.s b/data/graphics.s
index aebe35093..8726c102f 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1,26 +1,33 @@
 	.section gfx_data, "aw", %progbits
 
+	.align 2
 gBattleTextboxTiles:: @ 8C00000
-	.incbin "baserom.gba", 0xc00000, 0x4e0
+	.incbin "graphics/interface/menu.4bpp.lz" @ menu window and arrows
 
+	.align 2
 gBattleTextboxPalette:: @ 8C004E0
-	.incbin "baserom.gba", 0xc004e0, 0x44
+	.incbin "graphics/interface/menu.gbapal.lz"
 
+	.align 2
 gBattleTextboxTilemap:: @ 8C00524
-	.incbin "baserom.gba", 0xc00524, 0x22c
+	.incbin "graphics/interface/menu_map.bin.lz"
 
 @ 8C00750
 	.include "data/graphics/pokemon/circled_question_mark_graphics.inc"
 
 @ 8C00C10
-	.incbin "baserom.gba", 0xc00c10, 0xa34
+	.incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff
+	.incbin "graphics/unused/old_charmap.bin.lz"
+	.incbin "graphics/unused/old_charmap.gbapal.lz"
 
-gUnknown_08C01644:: @ 8C01644
-	.incbin "baserom.gba", 0xc01644, 0xe0
+	.align 2
+gSmokescreenImpactTiles:: @ 8C01644
+	.incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"
+
+	.align 2
+gSmokescreenImpactPalette:: @ 8C01724
+	.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
 
-gUnknown_08C01724:: @ 8C01724
-	.incbin "baserom.gba", 0xc01724, 0x18
-	
 	.align 2
 gInterfaceGfx_PokeBall::
 	.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
@@ -47,11 +54,11 @@ gInterfacePal_SafariBall::
 
 	.align 2
 gInterfaceGfx_UltraBall::
-	.incbin "baserom.gba", 0xC019E0, 0xB4
+	.incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC
 
 	.align 2
 gInterfacePal_UltraBall::
-	.incbin "baserom.gba", 0xC01A94, 0x20
+	.incbin "graphics/interface/ball/ultra.gbapal.lz"
 
 	.align 2
 gInterfaceGfx_MasterBall::
diff --git a/data/smokescreen.s b/data/smokescreen.s
index d92c972df..3e6028431 100644
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@@ -14,11 +14,11 @@ gUnknown_0831C604:: @ 831C604
 
 	.align 2
 gUnknown_0831C620:: @ 831C620
-	obj_tiles gUnknown_08C01644, 0x0180, 0xd6eb
+	obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb
 
 	.align 2
 gUnknown_0831C628:: @ 831C628
-	obj_pal gUnknown_08C01724, 0xd6eb
+	obj_pal gSmokescreenImpactPalette, 0xd6eb
 
 	.align 2
 gUnknown_0831C630:: @ 831C630
diff --git a/graphics/battle_anims/sprites/smokescreen_impact.pal b/graphics/battle_anims/sprites/smokescreen_impact.pal
new file mode 100755
index 000000000..64367bdc9
--- /dev/null
+++ b/graphics/battle_anims/sprites/smokescreen_impact.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 148 49
+57 98 197
+0 0 0
+0 0 0
+0 0 0
+164 156 106
+197 197 148
+0 0 0
+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/sprites/smokescreen_impact.png b/graphics/battle_anims/sprites/smokescreen_impact.png
new file mode 100755
index 000000000..01a94429a
--- /dev/null
+++ b/graphics/battle_anims/sprites/smokescreen_impact.png
diff --git a/graphics/interface/ball/ultra.pal b/graphics/interface/ball/ultra.pal
new file mode 100755
index 000000000..3b7021097
--- /dev/null
+++ b/graphics/interface/ball/ultra.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+180 139 16
+205 172 32
+230 205 49
+255 238 65
+255 255 255
+148 148 148
+65 65 65
+24 24 24
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png
new file mode 100755
index 000000000..1221cec4e
--- /dev/null
+++ b/graphics/interface/ball/ultra.png
diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png
new file mode 100755
index 000000000..96f6b8b15
--- /dev/null
+++ b/graphics/interface/menu.png
diff --git a/graphics/interface/menu_0.pal b/graphics/interface/menu_0.pal
new file mode 100755
index 000000000..67e1af896
--- /dev/null
+++ b/graphics/interface/menu_0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 0 0
+82 98 156
+106 139 189
+255 255 255
+106 90 115
+213 205 213
+65 74 123
+74 65 82
+131 139 139
+106 65 90
+172 106 98
+213 74 57
+156 74 98
+106 164 164
diff --git a/graphics/interface/menu_1.pal b/graphics/interface/menu_1.pal
new file mode 100755
index 000000000..3adc73766
--- /dev/null
+++ b/graphics/interface/menu_1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 57 115
+82 98 156
+106 139 189
+41 49 49
+255 255 255
+106 90 115
+222 213 222
+90 82 82
+180 189 180
+139 156 213
+90 74 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/menu_map.bin b/graphics/interface/menu_map.bin
new file mode 100755
index 000000000..8a7b3f1f0
--- /dev/null
+++ b/graphics/interface/menu_map.bin
diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin
new file mode 100755
index 000000000..13d3b873b
--- /dev/null
+++ b/graphics/unused/old_charmap.bin
diff --git a/graphics/unused/old_charmap.pal b/graphics/unused/old_charmap.pal
new file mode 100755
index 000000000..cbcd5de4d
--- /dev/null
+++ b/graphics/unused/old_charmap.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+24 0 0
+41 0 0
+255 255 255
+0 0 0
+255 255 255
+255 65 0
+0 0 0
+255 0 0
+255 24 0
+255 65 0
+255 98 0
+255 131 0
+255 180 0
+255 222 0
+255 255 255
diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png
new file mode 100755
index 000000000..b5ea6e803
--- /dev/null
+++ b/graphics/unused/old_charmap.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 565020836..3f506b11e 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -4,6 +4,7 @@ monfrontdir := graphics/pokemon/anim_front_pics
 monpaldir := graphics/pokemon/palettes
 tilesetdir := data/tilesets
 fontdir := data/graphics/fonts
+menudir := graphics/interface
 
 $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \
                                                    $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \
@@ -292,3 +293,7 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png
 
 graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
+
+$(menudir)/menu.gbapal: $(menudir)/menu_0.gbapal $(menudir)/menu_1.gbapal
+	@cat $(menudir)/menu_0.gbapal $(menudir)/menu_1.gbapal >$@
+