From d3c9abb7c668f548dc3aabb1df0bed2d87138b2d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 11 Jun 2019 08:39:57 +0800 Subject: [PATCH 1/2] graphic decomp --- data/graphics.s | 8 ++-- graphics/teachy_tv/bg1_tilemap.bin | Bin 0 -> 2048 bytes graphics/teachy_tv/bg2_tilemap.bin | Bin 0 -> 2048 bytes graphics/teachy_tv/palettes.pal | 67 +++++++++++++++++++++++++++++ graphics/teachy_tv/tiles.png | Bin 0 -> 2098 bytes 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 graphics/teachy_tv/bg1_tilemap.bin create mode 100644 graphics/teachy_tv/bg2_tilemap.bin create mode 100644 graphics/teachy_tv/palettes.pal create mode 100644 graphics/teachy_tv/tiles.png diff --git a/data/graphics.s b/data/graphics.s index 284539152..4a40776d9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -14019,16 +14019,16 @@ gUnknown_8E861A8:: @ 8E861A8 .incbin "baserom.gba", 0xE861A8, 0x98 gUnknown_8E86240:: @ 8E86240 - .incbin "baserom.gba", 0xE86240, 0x9A8 + .incbin "graphics/teachy_tv/tiles.4bpp.lz" gUnknown_8E86BE8:: @ 8E86BE8 - .incbin "baserom.gba", 0xE86BE8, 0x184 + .incbin "graphics/teachy_tv/bg1_tilemap.bin.lz" gUnknown_8E86D6C:: @ 8E86D6C - .incbin "baserom.gba", 0xE86D6C, 0x22C + .incbin "graphics/teachy_tv/bg2_tilemap.bin.lz" gUnknown_8E86F98:: @ 8E86F98 - .incbin "baserom.gba", 0xE86F98, 0x78 + .incbin "graphics/teachy_tv/palettes.gbapal.lz" gUnknown_8E87010:: @ 8E87010 .incbin "baserom.gba", 0xE87010, 0x18 diff --git a/graphics/teachy_tv/bg1_tilemap.bin b/graphics/teachy_tv/bg1_tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..34dc439bce50c7a8ce292ed686e360ccccd55f55 GIT binary patch literal 2048 zcmeH_+fu?X6h#+Usijsx0imK3D0t;AAc+6}T{dY&a5@Yp`X<>AnM|_goV{~$bvwYyQgniHzGmgOsmu$(2w; zMvR#l|5a+#Ei~oT@YghG5(?FHX3RIdl-BQm%P+R--w3-8d1IOKEpE9JYQ;NiK8$}o MgGU_`_^%0k0vJCvB>(^b literal 0 HcmV?d00001 diff --git a/graphics/teachy_tv/bg2_tilemap.bin b/graphics/teachy_tv/bg2_tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..f51b3695fa297e62ddafe84093e9aea33f2758ef GIT binary patch literal 2048 zcmeIwS5lNw5C+hHc5;>?1`tINFj<_3$I8JSvZc#c)vu7rIuN4g;Z%)O1H{t8P-@U(=~Vey)fRd zlV!bZ8*H@6W;wRlYMbqH?U3iT!BD@`F1zL1W3PP*6xy#yu>%e|MK<_uUd^-7hH77Wp(N`XmrI@zl?_ZsOy?EYtgDryAGYY zbn9`$O}EU7&f%l6iM#H(?}3MUJ@VKSPxa|H5PO@Cf8nK9UVG!McZLjm?}Lv%&C`GJ t)i>Xb`QfK=6DCcWHZ!LW60G?9Ns#|@ze%510*fL4KYvJeGJ*d!f#3WMZSepA literal 0 HcmV?d00001 diff --git a/graphics/teachy_tv/palettes.pal b/graphics/teachy_tv/palettes.pal new file mode 100644 index 000000000..22808d3de --- /dev/null +++ b/graphics/teachy_tv/palettes.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +115 205 164 +255 255 255 +98 98 98 +255 230 90 +246 180 0 +189 115 0 +123 123 255 +74 65 74 +49 49 57 +98 106 106 +131 139 139 +255 0 255 +255 0 255 +255 255 180 +246 205 41 +213 156 16 +115 205 164 +255 255 255 +230 230 238 +205 213 222 +180 197 205 +164 180 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +115 205 164 +156 255 255 +255 255 255 +255 222 32 +246 230 164 +255 74 24 +255 148 139 +255 156 24 +131 230 222 +24 32 32 +156 189 213 +74 131 189 +90 222 164 +205 238 139 +255 0 255 +255 0 255 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 0 255 +255 0 255 +74 65 74 +164 164 164 +197 197 205 +230 230 238 diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..01f0763509b05834f95e8d6b751e02e78f90d501 GIT binary patch literal 2098 zcmV-22+jA2P)t;f2%wTUv!GNYKu8IYii9B7 zs;t70t|36Mkg%=RSOd)}L&C9u1Bc-eA>WI=JJiMrykLB=@HcdPL*RwQ&?meg z4E-ZPCmTZeN8}z+9RVMJjjVC@$tyfl7%sGN%7~YcUYqq-ECD`j1ixqL&)B`ELnGgA ziw>~`ofZIgkwvnGzkz0fU8wsqU7BXiGU(9pU!WlRXx-pQ|4JQ~a8kl~%eQ+|dGkg* z+kCbuHY+dRif7L&FGb}ooxQBQeJ(cXM>>1HSx|?527WT}8PJuV4btjE8BxFIWQvjB zTOp2k^%2Grg-oXOaSV)s*8oh8fidHp@EVX6;1%IKj!GQQfR}u>K^O|ax1iEu@n?Fz zL*KX6Coi|m0ecrmx#!z`vYD3!t3R)(zP$51;n7iG$4-C9G70TUOg9~VL4ElJ_$gYi zMg@2e;}R(0D%0P)6qKzmVGA!8dfqT81@*^khM?l4X zd!Wk)r3C#c(NbzI=uZ+Tb2e$>hKgexA0cfADAfj3OWVzA1SxBP+%{c4w78>~(>WEW z+qgfanyX~LQl7A@S;Wq4D<}`uj2N3dX7g{#qiOO`VIH%&&7)~X?Q8Owsbs$yc_>li zJkh+VI7Rs z#P@rE6jP190sR@!xE9W|neKsunf-}D$IZ+j7E9k@fR1`4bT9#?&a;oeeasQk>Hsvl z)##h4?ILg>Tqy%N={$mF$(XG|>WtEtt0h$d=+vte1 zxHQ~~O3l|OtnZ{}<(OJ6dZAuyGQDIT(-d%gu{=yv69gGzDrhmr@^BLs$pdM1*7_}l zu+oHL=%&nvdGtOix6Ny%?gZ~(OdATqEdbflmpiVX7a2(`=K|AP7XjI6OSewhNry;lE=yW@Ex{bed&{UFj?!oC3jBs@;hFU9&%O zwG-TYjUpnL(Odp32(HcGTuoKbu>9|5}RrZa~-x z#-d&iZV3C=Vvl|lpXgd#(Y4iXWcdY7%2y;6a(|7Ef;}=0(1M$>gFSMsooe^!=o&$W zxN)jWYUoTWtet`t^hZ$2>Y&*y@qdjPkiPj0%YUW=tzE{Kr@UG7gTAF7^i}i9^GNlS zpZ5A)D7T)5>+J=w5Y>D9j>&LS=3k`J6IpPD5d*1E{{^tbKsX+Tr*Uu3z~0n z37qLS=9R_r2|Cb^{DCyP<^j-4iNI7x>Zpb;FAxF8LXs!(QyeIkOESj#nBj~s`NkQ5 zH~I^-I78d@NB(1KeEhzppZj;xeBkvoYq*bSI3X8uIUnKDt{f-td43{*VSwnC362pT%np#8rXS^ z3#(Z&T>i#$rpz>6>hDNjXv+9=44#c`TW*%Xm$Kz1r~Z}PGiY&Hg=Im7YvGHH^qYdz zzxp|S9QRRm@b z?_qbZ=+a`L;hDC|`a8e~S@5N~fl*u7WQ;$hEclX)&6#rkynC@|EEt~f8j8|tsD(Ia zkjX(~p`v-iJ5}aaQ;YK4FG~8A$dlG1}se7uTz*sREeJR*GSPC$IMEk c@N|6t0G=|CXIKj&UH||907*qoM6N<$g6bm@-~a#s literal 0 HcmV?d00001 From 7a580b8d3e691a5a0655a5a8e33d34516eb7b089 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 11 Jun 2019 09:00:35 +0800 Subject: [PATCH 2/2] more reasonable png width --- graphics/teachy_tv/tiles.png | Bin 2098 -> 1761 bytes graphics_file_rules.mk | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png index 01f0763509b05834f95e8d6b751e02e78f90d501..e867de82b6606e9614906d18690588285b3f131e 100644 GIT binary patch literal 1761 zcmV<71|Io|P)1&v5P(-MrAAb16}DR&dJ4I87gkBAN_+%gkw9z(f-hhM0aOxa6_Set$Wj8tA|c3? zs<;SjHUbD0GFFwqPM4Y4o!vR!@koh)2aq_sH~a1U?9Y)Z12IxGNrIooT#ycbr?uxg zQEFYE98vouh5j_%(5ebhGv>J_!;jhlHW;veg#8=Z19TJ#(5K`A&0KSy1i(k^*NXsp z8(pB8YbO$Lf|FBw0pQe(yy2;GpX&rzPtm5g7@)T=JU}a#3-CPw2aecA0{%=u0$@}G zU@i!-ju8|ANe(~-(7g*^1&keXfx#z=94G-aL0(C5g-s5Ha39*fsJ(b00e=ucEQt!h z-)OtGwYF7A;*tQ8t=i_xl>lqcYMUzoYA;vxV6*n}**w5MSkf|pwB3Rvs1^W}5FWG) zV6*mYOL=cJaHdVykLx@|y{UVq2^+bI+y5k`KJ<7WpP}s6>k^Qa04^Lruj3A!0n|~H z_a-d|Yzu(S0a&U4r%i2YO}&PIza*f(1mFnt9spqQ=5y|U3_yXt-P9K_cx{9G_samk zlmamO+Bm?8ssy|*1DqNde9C}y25^snuy8yrKH5=@#eU0Tp zzynzLHL_!GoiZxv1144N_RG(9$~rCq0V{Xa150Kla{0NSLG zu?dQM-eCZ72l#&ofZI52HxC#DKs$KV#<7lt58D9vRt7lE10ob34cM7q#)IBLMz!n*oNYIRL~POt}x|X$NeY1F(f~{Ez`%u4bBhE&#()z(Ay40**Pg zT>+2<^EvDq1{{|Ga3z!h;5O*^u0v;=17N;8!Rr8En?cN1ENBD_-8$-ohF?h0CYSIC zfMM)aoWldIJs`NnF~)=sL*I~=L6==T=FKGC;#EJuA?*n0mH;{g=sAE4yyI<+Uo+fC zlMdq+?a+BZS>)~R-^tN~LlcgHuuic+16L$B22Z3FkF=?cr~Q)v9K+KA4=cIguD097 zh6U+G09?-BeDBrL)o;spX^+FJ*&Ap-vJ)zw%4EdNow=5(&4?=0lX<$$b3z?f5GJf_9z*Wd8Muk~#iQ06w7k zX#B(O&tF^wtTCX)FN)KoHLU`?8@up!1E7^9Nv7;geCw#0kC}U#_qqF1@r^pAf5~}05|tIreNfAPd`8iz?(S$ z7rjV9-`TI}hN(hd;lq{W5TXxF2E`X91K1^x|tShnd1FOVlxB zaTY)^#0W+L&@n!oOdjzC0LBoDc*Pq);oXM~=Ty9=3IL2D6cN^8ivhiC)f^v>16xp4O7 z!*3qY?}a4zB3{KEtT-jceV@hi+0Wb>l1S~E2Gx3Rl^X%UJUg$pd^3BD7k@5P|;ZhE$Q*(g}3fC(54CVxwPzV-WZ`e9E?PLMKt<|hC$s7PX@4<_# zVJGNRV+lZu0W@VjBM3dp#00000NkvXXu0mjf DDH9v9 literal 2098 zcmV-22+jA2P)t;f2%wTUv!GNYKu8IYii9B7 zs;t70t|36Mkg%=RSOd)}L&C9u1Bc-eA>WI=JJiMrykLB=@HcdPL*RwQ&?meg z4E-ZPCmTZeN8}z+9RVMJjjVC@$tyfl7%sGN%7~YcUYqq-ECD`j1ixqL&)B`ELnGgA ziw>~`ofZIgkwvnGzkz0fU8wsqU7BXiGU(9pU!WlRXx-pQ|4JQ~a8kl~%eQ+|dGkg* z+kCbuHY+dRif7L&FGb}ooxQBQeJ(cXM>>1HSx|?527WT}8PJuV4btjE8BxFIWQvjB zTOp2k^%2Grg-oXOaSV)s*8oh8fidHp@EVX6;1%IKj!GQQfR}u>K^O|ax1iEu@n?Fz zL*KX6Coi|m0ecrmx#!z`vYD3!t3R)(zP$51;n7iG$4-C9G70TUOg9~VL4ElJ_$gYi zMg@2e;}R(0D%0P)6qKzmVGA!8dfqT81@*^khM?l4X zd!Wk)r3C#c(NbzI=uZ+Tb2e$>hKgexA0cfADAfj3OWVzA1SxBP+%{c4w78>~(>WEW z+qgfanyX~LQl7A@S;Wq4D<}`uj2N3dX7g{#qiOO`VIH%&&7)~X?Q8Owsbs$yc_>li zJkh+VI7Rs z#P@rE6jP190sR@!xE9W|neKsunf-}D$IZ+j7E9k@fR1`4bT9#?&a;oeeasQk>Hsvl z)##h4?ILg>Tqy%N={$mF$(XG|>WtEtt0h$d=+vte1 zxHQ~~O3l|OtnZ{}<(OJ6dZAuyGQDIT(-d%gu{=yv69gGzDrhmr@^BLs$pdM1*7_}l zu+oHL=%&nvdGtOix6Ny%?gZ~(OdATqEdbflmpiVX7a2(`=K|AP7XjI6OSewhNry;lE=yW@Ex{bed&{UFj?!oC3jBs@;hFU9&%O zwG-TYjUpnL(Odp32(HcGTuoKbu>9|5}RrZa~-x z#-d&iZV3C=Vvl|lpXgd#(Y4iXWcdY7%2y;6a(|7Ef;}=0(1M$>gFSMsooe^!=o&$W zxN)jWYUoTWtet`t^hZ$2>Y&*y@qdjPkiPj0%YUW=tzE{Kr@UG7gTAF7^i}i9^GNlS zpZ5A)D7T)5>+J=w5Y>D9j>&LS=3k`J6IpPD5d*1E{{^tbKsX+Tr*Uu3z~0n z37qLS=9R_r2|Cb^{DCyP<^j-4iNI7x>Zpb;FAxF8LXs!(QyeIkOESj#nBj~s`NkQ5 zH~I^-I78d@NB(1KeEhzppZj;xeBkvoYq*bSI3X8uIUnKDt{f-td43{*VSwnC362pT%np#8rXS^ z3#(Z&T>i#$rpz>6>hDNjXv+9=44#c`TW*%Xm$Kz1r~Z}PGiY&Hg=Im7YvGHH^qYdz zzxp|S9QRRm@b z?_qbZ=+a`L;hDC|`a8e~S@5N~fl*u7WQ;$hEclX)&6#rkynC@|EEt~f8j8|tsD(Ia zkjX(~p`v-iJ5}aaQ;YK4FG~8A$dlG1}se7uTz*sREeJR*GSPC$IMEk c@N|6t0G=|CXIKj&UH||907*qoM6N<$g6bm@-~a#s diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 41b19433a..a1a00ad28 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -19,6 +19,7 @@ PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/event_objects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window +TEACHYTVGFXDIR := graphics/teachy_tv types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -474,3 +475,6 @@ $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 + +$(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 233