From 86412bfe9106d7a966cb1b70a29f76b92f159e4e Mon Sep 17 00:00:00 2001 From: TheXaman Date: Sun, 8 Nov 2020 16:22:03 +0100 Subject: [PATCH] fixed tileset and stats screen bug --- graphics/pokedex/info_screen.bin | Bin 1280 -> 1280 bytes graphics/pokedex/menu.png | Bin 1542 -> 1714 bytes .../pokedex/screen_select_bar_submenu.bin | Bin 192 -> 192 bytes graphics/pokedex/stats_screen.bin | Bin 1280 -> 1280 bytes src/pokedex.c | 15 ++++++--------- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/graphics/pokedex/info_screen.bin b/graphics/pokedex/info_screen.bin index 4db95aa345fd318091634f62ebec70c6e1730b36..4fe214f815cf099e578e1803291f4f8903e344bb 100644 GIT binary patch literal 1280 zcmd6k*G@t~6h)T}Y+&z*V(%SMuLAbod++uCKfuEwB#;buV(yExGCTWa&+IuMX^k}0N{(R`FyqJl|d%rP(9tP7fVSi})bxccQ z8*Bf}zuan%RHtn2G=I+nkAj;%@yv^mtFM}W%Q-Xqe4BswnE&vY_jZljjKqE~w(?Tn$)kcVR!gSC{gf6=2p;uglKKdD8 zkRkEIj4;ZWxN#w@MT7I6fVE)jPjq4^}sBn6YMu*pzM7Eo*+89d_Bv^E$`ce_tnakmq&jym@lzi5_bHh+|F+oLc*zan1#oTybsS z#@avgFSptw)hU}h&ENCDqu{1bJo6&t>Z|78a?Z>?-{#*v=07~euJP%y%@l$2ZqPBF^vFML5f|*mC8&vNMkQQQ%Jl@$Gs0e zE+sl~>|J1qD5NCv=)Oo^x~ia9``44Xuv7_P?R9|N^KZsvgZOcld4QOObfPHngzkZ_4 zqpir)sOnh&=Mq483jl+ueE3LDgV?$2dp#ro$BTD206-(@Y%mStNN0cVEdXFh1OP>B z7h|nzX+-oc19+$afCv#V3T5j7!PyKTk6DXEQ~{%s0YAs3@=E(K*|SDC7_L1^ur-FF z5&*7Hf(;PB5pKK?ccAa?NMT^#BS#^s7xVzu{|ddT)x0Hq!(QoF!k&w0VUT=J96iL6YzIS<-UKZgsZ~CHE)ff=q9yk zu!6q5UXxqQ5%1^0z{@iM^W>8i0b@L#2~a+mZtMnEujc@6>t+g&os#^wB>Y7H z(c!-V2q&KfxcPs2^ECr(t_8Ruc(tvLm#E-O8#+~~gYN_{TjLtI*0Lks7j{Qer5M0+ zlz?UgXvzR-5sbZe0iy&GHiF8>-K~%P-#-AfAql}W3Nl_bT2z-R2PA8^T>!NEa9F^p zIRYGWz$SZ#0Nje>*#Q8M=E>5z959!F6&i8B<(+gJ0m6UpD(D>nxqV6iHOi58WFjFV zEi(>}Kp`C*yKw|SD+AzQypdcu#l?hl3=m2V$xR2tZW;k5n;-x*i5Sj_yBH%o{MY5( z!R>UUN)?`V_!WJjFtHB|wv_^*sVg{w@MGSxo&A0VQ`80mCRLy+oG-yrFqP=_eh# znj!rH>h&N7D)rLvyB8dH5+FM@rvRI40dwch1H^v}slCqt@akH?>^wm7ik_%Io5`hs zjrjo*=;fyY6a#t%^X^BLy+T0m>n!$<%>p{Z<1aXf+mJBcIX4CznU0CVENn=e?lORD z4`|Q}qbOeaFRz=J?fP`L44747@8g;W-il<2=YAQmnE-0uQE%(B0P}vV!m_X)@{(8t zXqA6$?`XViJrs}61?ajjj7JwqfR~E^(gFBDz0?YI%Z9INS`)&omjWiN zGa0vKs(ZW^&=mn1f0NNHV-FWKdzwxYKwSb1_@l0VGLMjWKvvgb_0+33V}4Bl4X*Pl z&xiDbQXK(sNT^N%ID}UM@b+LH9w7xa?yVbsJ-J7!0MG>$c!u3Ki^YOEzb?L+SMGM~ zu-DV;0>1XTSoEq`Dqex;#QFx}K7zugC%^z-3*z?K?>ZSkNdSr)0bX1dwr3^4KgbKsNh5$S QrT_o{07*qoM6N<$g42h>x&QzG delta 1393 zcmV-%1&;c%4TcPm7aeE>0{{R3%LnBb00007bV*G`2jmL|7YP{1eG3zjG?RZSNkl8<;5XbonMB?HqK7*i5eOSO-9|EsyV;cglQr!uzTwdBV_VF==K&MhSAEY=# z(T^@*d148&5;PCQG*BvKeBR31u&hl0Rf<=I} zz3ZK|c7lJ@|8VmAllQ^XFT{V_Jr)XZcu4?DfZkfi0O*N5Vj*u8AXoyx`w=ir=tu+v zf7+k+J_IcA7A^u73h+XJ4gnTCa7zIA%z$ua&bi`26+k`*&tu0J5WoZAU79^(+~-(P zsBZ>LQw9jNtYI|^vCrtXmcDmm25`QR+=k^mOR*s|h@&w_wE%!AkpO>`v7B%wH4tJm zfV&C+xG)1mDzlttB{l;{u@I1mL%^(Lz_TFBNgNS&hTjQ2*moUeB><+v5RhVk z01inPV}S1MLjp`yK#{UBVHgEM_>?dwzDq-eM$igl;Oy9mNt066r<_0QBE5y4o)aKX z+Y;avAgXmrGlBrPW*mRh!l9BU(7ZoGfteKVM8X{?^w(24s3k7c7CiI(Ni(G^@3qeZ zx|DvXYsfjjX8X3zM%R|@9)1*f)3I!eS@#Y=G3(;I7oEOkhrd? z1#sZGs0;ut+ZXta`N44ssH^)9z$JOgh7r*In}EL|>fT_bkcxjQy?@&B)|kw-`I8&w%%<6yV1j0jsRZhJbTE-UzTUnI7=UW03^Ew z(AcOuiQEW4x&RO52v^E^*Zq;e>)-I&ZPQCLU^T`@1M% z$Z`3P05M881MYvn-hWkq-Dd&QNRlF8H+*CWQ|Gb9=mxP7JoMev!f%@zqT&5wZ=@%4 z4xkMZ&=!EU4w$nr=H69+K0rpm-8^Z)etiSr(;)=6l**#|Xfn zIu1%1D*%i#0M4}Y17J#Dar1#x15^aZEYq2G{so{2xq&Yi>&V6Qop_kf3bgYdb%)s8 zrNX2!s_(=rRy4OJyU2&`x6Xyw92!ok5CHznTP9X91bETdJM2Y;$ujYv-UQ$|5PMnz z^duw1$%=nUyzA70lFLOM1Cl?v=yVE`JyrpDtV^%9*^y4}%@lK3X{rD`+0wXRc$i3W zl$|^sM1X6m0Niw^X%bS?T@BFcVSVQz0HCIK6|hq|^?QuLSf)2w6)+Y_xx$UbeFCuK zeSw40FB%>jhV*MFx1;E2?Q6@=UataDBYf8We87KvLh?^P36NEB3c#Wb9|y#`$9Ds0 zvbl|^CQKhomHR`x9=jh<{ROiB2VYxfYSWhKcu=@Y8xkLP8NlTXSS}o!_~vappLXMM zw+i4!5AscIs>{ByQWpSsC7_9Q%}s#X+PAFZC9w+F(S@`@1y)qo0pkMTn!eH>C6a*X zm)U=QlWuMxfY9)@v2Zj|7`JI?O-QqnbH%l$)hY-;c{*xnN~cLB0aArV0PulO=Q3b^ z6Yd-mU=@HDl{6;=AdeNMR0b@he7pp3Ia0j<=slpruf?|kuL3ZZfMcTolq*9CXs!WT z1z54{3mH>}Sy@k!e`?p21Y5``0CRm4$7@NefR&E40HEas_aZ<=d-woA1?zYnP?@DA zpt%ZI&HuY|5zxlD;Tu{l00000NkvXXu0mjf=LUQ9 diff --git a/graphics/pokedex/screen_select_bar_submenu.bin b/graphics/pokedex/screen_select_bar_submenu.bin index 178ba4e0a2b8dac7b76228614837fbb78811a4eb..5b94416834b46c2014a531fb26868ee3808d983d 100644 GIT binary patch literal 192 zcmbu$Hx9y307St-vgC%G4V4>mHn$?@aC$ymfi0e<*_JgFdzw@GA(iE`#h{09OT(F=>Rjtj^#Z__$9BIa7N-3ip4_@L);D{s-l~hqp4c8?f zC6OeKNjgq4DWsA{I_8ss-?%~rSGk6dOtQ%4gd`s~sHKj28YG|O6sO6Nl*<|N$j8rF z#W&JKNOV)Vm7BQ5ZSK%4(!GVdguJctn%<`Pb^=Nrdtd7>OhoO$+(%URxUY?Rp!kOl z{39M8P$!oRYkt$aT>F=3BW)&3x7NQ$@xAoXFM6Wf%6&X#V6Sdh%rS#JV~FSSnm(-f z7ut+=p8(-~D~;Cm^iuI74t%Wj>vVt;S6<)ge$M{uHp~fLQS3da*NpOpw<2dBbM5~w z=DzIS=6BqcpJ0+H(X^w_DBkJ(-)r|SdIR+oQTul~|5-j9qFGn|W6X2aPx_PV`set} zyvW%X6u%g=&ld`ebGWNO@k=c8m2Z6K2P^z!m0wa><2UCI(YoS;6tcl4f7s$L+x+9d PRD$eqkqaVcFH-z26B_7v literal 1280 zcmaiyOH&g;6otRCW)YQ@peV2k;7SlQ>{3NSQ3bADru+w>8y_1$5j7FzrHQ;W8bt98 zqCC_9f{G}AirYPzN++3_%&9qZrmMfceY^S)HC7M3T;>V^4s(Q~R7eWYM?VAH)aqnJq7hl%;}W~YUm^Ov^N0-v}TDAgiMd}dkX?O%NBe|7E4 zsja>%zWgd{tc$*R`ghHHo&OKx-sNwgnNqrcuk+8cQASx`e$(|_&6D2p-TzOv*%5jB sFU|jUt@DS7)sDX+n&0Iwd!l0hM`s!R*L;)?qM~Bor<*R3w_niw0p{N2-~a#s diff --git a/src/pokedex.c b/src/pokedex.c index 4035c2b23a..dec9844347 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -355,8 +355,8 @@ static void DestroySplitIcon(void); //Physical/Special Split from BE //Physical/Special Split from BE #define TAG_SPLIT_ICONS 30004 -static const u16 sSplitIcons_Pal[] = INCBIN_U16("graphics/interface/split_icons.gbapal"); -static const u32 sSplitIcons_Gfx[] = INCBIN_U32("graphics/interface/split_icons.4bpp.lz"); +// static const u16 sSplitIcons_Pal[] = INCBIN_U16("graphics/interface/split_icons.gbapal"); +// static const u32 sSplitIcons_Gfx[] = INCBIN_U32("graphics/interface/split_icons.4bpp.lz"); static const struct OamData sOamData_SplitIcons = { .size = SPRITE_SIZE(16x16), @@ -6070,9 +6070,10 @@ static void Task_LoadStatsScreen(u8 taskId) CopyToBgTilemapBuffer(3, gPokedexStatsScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); - // PutWindowTilemap(WIN_FOOTPRINT); - // PrintFootprint(WIN_FOOTPRINT, sPokedexListItem->dexNum); - // CopyWindowToVram(WIN_FOOTPRINT, 2); + CopyWindowToVram(WIN_INFO, 3); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(3); gMain.state++; break; case 2: @@ -6118,10 +6119,6 @@ static void Task_LoadStatsScreen(u8 taskId) PrintMonStatsToggle(taskId); if (!sPokedexListItem->owned) LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E); - CopyWindowToVram(WIN_INFO, 3); - CopyBgTilemapBufferToVram(1); - CopyBgTilemapBufferToVram(2); - CopyBgTilemapBufferToVram(3); gMain.state++; break; case 7: