From d10c645353615da350f77ce2b1d79b5a73605383 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 22 Dec 2017 19:18:09 -0500
Subject: [PATCH] first wave of graphics.s dump

---
 data/graphics.s                               |  29 +++++++++++-------
 data/smokescreen.s                            |   4 +--
 .../sprites/smokescreen_impact.pal            |  19 ++++++++++++
 .../sprites/smokescreen_impact.png            | Bin 0 -> 254 bytes
 graphics/interface/ball/ultra.pal             |  19 ++++++++++++
 graphics/interface/ball/ultra.png             | Bin 0 -> 245 bytes
 graphics/interface/menu.png                   | Bin 0 -> 444 bytes
 graphics/interface/menu_0.pal                 |  19 ++++++++++++
 graphics/interface/menu_1.pal                 |  19 ++++++++++++
 graphics/interface/menu_map.bin               | Bin 0 -> 4096 bytes
 graphics/unused/old_charmap.bin               | Bin 0 -> 4096 bytes
 graphics/unused/old_charmap.pal               |  19 ++++++++++++
 graphics/unused/old_charmap.png               | Bin 0 -> 1934 bytes
 graphics_file_rules.mk                        |   5 +++
 14 files changed, 120 insertions(+), 13 deletions(-)
 create mode 100755 graphics/battle_anims/sprites/smokescreen_impact.pal
 create mode 100755 graphics/battle_anims/sprites/smokescreen_impact.png
 create mode 100755 graphics/interface/ball/ultra.pal
 create mode 100755 graphics/interface/ball/ultra.png
 create mode 100755 graphics/interface/menu.png
 create mode 100755 graphics/interface/menu_0.pal
 create mode 100755 graphics/interface/menu_1.pal
 create mode 100755 graphics/interface/menu_map.bin
 create mode 100755 graphics/unused/old_charmap.bin
 create mode 100755 graphics/unused/old_charmap.pal
 create mode 100755 graphics/unused/old_charmap.png

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 0000000000000000000000000000000000000000..01a94429ac23dea65b91e959865cddc9571701fe
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT$834S|%L@@*rTzoUEfq
zr@(kvX!A)ImH~x3JzX3_B&JRcuoPl8<Ove~A8;k>$p85Qi<LKTj=eL3QM%>KKYR6O
zeqY|cV=ZdvV3PlyqJ5y@$xHQ)jDQxEW7-*<yN;`!cpk&#!D+O|$H{9-z95s1!hL}W
z0h@*A=I-$+5wZ-t^X9nBjYIcxlG@$3cgiIGd9!Wy-9P{O67yExyvO_|>Fu1}y4)lC
XUY<AYxwM)m6y#P<S3j3^P6<r_Fwt44

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1221cec4e038850cf2976d5e2db3a8aecde70fce
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT>t<7zolE?>>7n<XAS?q
za|CjyOqt^7=qMo}0c2x>v&T5<fO;D|T^vIsrf%&s<T`A?<GS}JgQU&%a1TZG!lEWG
z$;S<UYny-ESlPlMvPtCD{uhn=E)>7hYd9-0_0NWH$JIW}sTRq2eCx5|)Q=f#ty^OQ
zBz2x{3Awa7T#1!ksb=2~z3CDMkL>E~Z0quEE&rHl`9$FX^MusUk9?~aHu@j<6MfkJ
aIZNF(J)h~)A|HWnVeoYIb6Mw<&;$VC;&b2t

literal 0
HcmV?d00001

diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png
new file mode 100755
index 0000000000000000000000000000000000000000..96f6b8b15f3bb58830eb7a4cd1d1e716b7a9ea49
GIT binary patch
literal 444
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLDIg8-ipS0Mc#2pAZGlICP}?*%fm
zqKdDcz3S*y?d2HM+})k!7_}xV>8h9I9IvFTB}>*s>U?KlV08C%aSX|5e0#~z>xhHM
zv5%2AnBO$#ZWGs6h<M*Lbuasd&WL4&A0#q)nlqBcMY5&&6)G5xrt3dq&G~ZHNA2^b
zyn?$y`{Z?0Za$oU@{EMC$C)|Wce%vRoR2@n`}wl!XYXC+vsuo~{P`_?L7epiyHC!d
z8=l;;{l15v<%#r<g`7?aVV(>0JpW%bxnA^no7I9i5oW(-37ucAJi2kc(cv1K)_>6@
z;_fx4-rk+XD9%(>y~q7$TRd~-g1}?D-PsSGd>9kIT9;p6CEI)QvaDs*YmWv!u!x(_
z%YG=S_gi^X^yIn)E7n@*mMl2cxFz=S>P1)QZ)4f@+|ohQK}}Y|c7ym0zw?>*=FZe&
z^)kvd{Tfo5uqA{2a>=E+l3mY_{SQ&l56gdg_0cQi$M@f@Jn-RKW)^$Wf&OT@FX|kB
gx`CmM00-FiF^Y1sB+tq%*bWl)boFyt=akR{0P1VNQUCw|

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8a7b3f1f00b122f246f4b6a985185c287350a64d
GIT binary patch
literal 4096
zcmeH{%?^Sv5QHc32L-`V5rl*9|ClNq_Rw^j^a8=@T$*+#&CWI-prr(qz)}h9u*V@o
zM-+H}b;22ChALb(;jhu)njzvg^}p2I^{x{5lLYAX>GSW-M^r7-{Cl#Cs^5g)=iiG%
zRO8gYHyhn40VR-3z~x)Y?Get{*D|b|`R5VN*w-_xoB0=>o6C0V^?QUf_Kghd#J}I)
F`~bYWHs=5U

literal 0
HcmV?d00001

diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin
new file mode 100755
index 0000000000000000000000000000000000000000..13d3b873b69e4c081136ad56c8e76022f74144a0
GIT binary patch
literal 4096
zcmZQzzyzrbsX##x#s_kdBn=si7@XmJAqGhX9R_wVUz#D4fssKNE;q^;4S~@R7!3hL
z2-q>iK{;N)QUn)3ltu^^M6C;hF;tT!ihg#62!;l*j0Qt8v;^V>vZSG^N2$>e7!843
z7El;KYJ6B|5Lf@hRD)<61|N7XW?&et|B=IHlsy^(qalDh1V-zB++i~+Ga3T44FLev
Cj}aFD

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b5ea6e8032d0f0cd092302978e9f118e5f2fa719
GIT binary patch
literal 1934
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
UgG8ZiEdT%j07*qoM6N<$f@M{DumAu6

literal 0
HcmV?d00001

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 >$@
+