From 42df883ebbdb3c03e93c21d4d4850f5d6e91e983 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Oct 2022 02:05:47 -0400 Subject: [PATCH] Sync wonder card/news graphics --- graphics/mevent/gfx_46718C.png | Bin 330 -> 0 bytes graphics/mevent/gfx_46737C.png | Bin 314 -> 0 bytes graphics/mevent/gfx_467558.png | Bin 288 -> 0 bytes graphics/mevent/gfx_467700.png | Bin 558 -> 0 bytes graphics/mevent/gfx_467A7C.png | Bin 551 -> 0 bytes graphics/mevent/gfx_467EF4.png | Bin 116 -> 0 bytes graphics/mevent/gfx_4680C0.png | Bin 169 -> 0 bytes graphics/mevent/gfx_46821C.png | Bin 103 -> 0 bytes graphics/mevent/gfx_46830C.png | Bin 146 -> 0 bytes graphics/mevent/gfx_468448.png | Bin 173 -> 0 bytes graphics/mevent/gfx_4685B4.png | Bin 173 -> 0 bytes .../bg0.bin} | Bin .../pal_46708C.pal => wonder_card/bg0.pal} | 0 graphics/wonder_card/bg0.png | Bin 0 -> 318 bytes .../bg1.bin} | Bin .../pal_4670AC.pal => wonder_card/bg1.pal} | 0 graphics/wonder_card/bg1.png | Bin 0 -> 311 bytes .../bg2.bin} | Bin .../pal_4670CC.pal => wonder_card/bg2.pal} | 0 graphics/wonder_card/bg2.png | Bin 0 -> 279 bytes .../pal_4670EC.pal => wonder_card/bg3.pal} | 0 .../pal_46710C.pal => wonder_card/bg4.pal} | 0 .../pal_46712C.pal => wonder_card/bg5.pal} | 0 .../bg6.bin} | Bin .../pal_46714C.pal => wonder_card/bg6.pal} | 0 graphics/wonder_card/bg6.png | Bin 0 -> 545 bytes .../bg7.bin} | Bin .../pal_46716C.pal => wonder_card/bg7.pal} | 0 graphics/wonder_card/bg7.png | Bin 0 -> 534 bytes graphics/wonder_card/stamp_shadow.png | Bin 0 -> 167 bytes .../stamp_shadow_0.pal} | 0 .../stamp_shadow_1.pal} | 0 .../stamp_shadow_2.pal} | 0 .../stamp_shadow_3.pal} | 0 .../stamp_shadow_4.pal} | 0 .../stamp_shadow_5.pal} | 0 .../stamp_shadow_6.pal} | 0 .../stamp_shadow_7.pal} | 0 .../bg0.bin} | Bin .../pal_468060.pal => wonder_news/bg0.pal} | 0 graphics/wonder_news/bg0.png | Bin 0 -> 225 bytes .../bg1.bin} | Bin graphics/wonder_news/bg1.png | Bin 0 -> 160 bytes .../bg2.bin} | Bin graphics/wonder_news/bg2.png | Bin 0 -> 204 bytes .../bg6.bin} | Bin .../pal_468080.pal => wonder_news/bg6.pal} | 0 graphics/wonder_news/bg6.png | Bin 0 -> 223 bytes .../bg7.bin} | Bin .../pal_4680A0.pal => wonder_news/bg7.pal} | 0 graphics/wonder_news/bg7.png | Bin 0 -> 223 bytes include/mevent.h | 12 +- src/mystery_gift_show_card.c | 110 +++++++++--------- src/mystery_gift_show_news.c | 50 ++++---- 54 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 graphics/mevent/gfx_46718C.png delete mode 100644 graphics/mevent/gfx_46737C.png delete mode 100644 graphics/mevent/gfx_467558.png delete mode 100644 graphics/mevent/gfx_467700.png delete mode 100644 graphics/mevent/gfx_467A7C.png delete mode 100644 graphics/mevent/gfx_467EF4.png delete mode 100644 graphics/mevent/gfx_4680C0.png delete mode 100644 graphics/mevent/gfx_46821C.png delete mode 100644 graphics/mevent/gfx_46830C.png delete mode 100644 graphics/mevent/gfx_468448.png delete mode 100644 graphics/mevent/gfx_4685B4.png rename graphics/{mevent/tilemap_467288.bin => wonder_card/bg0.bin} (100%) rename graphics/{mevent/pal_46708C.pal => wonder_card/bg0.pal} (100%) create mode 100644 graphics/wonder_card/bg0.png rename graphics/{mevent/tilemap_467470.bin => wonder_card/bg1.bin} (100%) rename graphics/{mevent/pal_4670AC.pal => wonder_card/bg1.pal} (100%) create mode 100644 graphics/wonder_card/bg1.png rename graphics/{mevent/tilemap_46762C.bin => wonder_card/bg2.bin} (100%) rename graphics/{mevent/pal_4670CC.pal => wonder_card/bg2.pal} (100%) create mode 100644 graphics/wonder_card/bg2.png rename graphics/{mevent/pal_4670EC.pal => wonder_card/bg3.pal} (100%) rename graphics/{mevent/pal_46710C.pal => wonder_card/bg4.pal} (100%) rename graphics/{mevent/pal_46712C.pal => wonder_card/bg5.pal} (100%) rename graphics/{mevent/tilemap_467934.bin => wonder_card/bg6.bin} (100%) rename graphics/{mevent/pal_46714C.pal => wonder_card/bg6.pal} (100%) create mode 100644 graphics/wonder_card/bg6.png rename graphics/{mevent/tilemap_467CAC.bin => wonder_card/bg7.bin} (100%) rename graphics/{mevent/pal_46716C.pal => wonder_card/bg7.pal} (100%) create mode 100644 graphics/wonder_card/bg7.png create mode 100644 graphics/wonder_card/stamp_shadow.png rename graphics/{mevent/pal_467DF4.pal => wonder_card/stamp_shadow_0.pal} (100%) rename graphics/{mevent/pal_467E14.pal => wonder_card/stamp_shadow_1.pal} (100%) rename graphics/{mevent/pal_467E34.pal => wonder_card/stamp_shadow_2.pal} (100%) rename graphics/{mevent/pal_467E54.pal => wonder_card/stamp_shadow_3.pal} (100%) rename graphics/{mevent/pal_467E74.pal => wonder_card/stamp_shadow_4.pal} (100%) rename graphics/{mevent/pal_467E94.pal => wonder_card/stamp_shadow_5.pal} (100%) rename graphics/{mevent/pal_467EB4.pal => wonder_card/stamp_shadow_6.pal} (100%) rename graphics/{mevent/pal_467ED4.pal => wonder_card/stamp_shadow_7.pal} (100%) rename graphics/{mevent/tilemap_468140.bin => wonder_news/bg0.bin} (100%) rename graphics/{mevent/pal_468060.pal => wonder_news/bg0.pal} (100%) create mode 100644 graphics/wonder_news/bg0.png rename graphics/{mevent/tilemap_46824C.bin => wonder_news/bg1.bin} (100%) create mode 100644 graphics/wonder_news/bg1.png rename graphics/{mevent/tilemap_46837C.bin => wonder_news/bg2.bin} (100%) create mode 100644 graphics/wonder_news/bg2.png rename graphics/{mevent/tilemap_4684D8.bin => wonder_news/bg6.bin} (100%) rename graphics/{mevent/pal_468080.pal => wonder_news/bg6.pal} (100%) create mode 100644 graphics/wonder_news/bg6.png rename graphics/{mevent/tilemap_468644.bin => wonder_news/bg7.bin} (100%) rename graphics/{mevent/pal_4680A0.pal => wonder_news/bg7.pal} (100%) create mode 100644 graphics/wonder_news/bg7.png diff --git a/graphics/mevent/gfx_46718C.png b/graphics/mevent/gfx_46718C.png deleted file mode 100644 index bf52445e63c00d8981e96586f119e629efe610ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^96QU(D&A+AwJr(C^y)yvB(DJ$#h zUaxmogT8&c`v3p`XV0#_dw2Ce!+$iiT>jb#px&#VE{-7minaV!jGB&eZY6whgWTTcfIeo7_;TyY&^~>s(-RyZ2A5ByZNpwOyidDp5B%7 z!2R;}O{sr>opIz^D*4RX^zdwH%MFIE;ZAcN=^T9aV%1@f64fKs%Z@((%Px6uO0J>K U{r&NWfF5M67ethj0^wK_`|6}QtZ`qfoyx1=@ z!^1FPL!#ctt*;Nf%rmSLy}du)tHr8?=TTtI6V>Tza;~9$Y@P0j?ngFVdE0Sfnw6W% z`JC9?%4a_=8YxFByy||(73@6e+M#N0ap$DlGj^_4%E@-VYP!?!Ca| diff --git a/graphics/mevent/gfx_467558.png b/graphics/mevent/gfx_467558.png deleted file mode 100644 index c28edd8919a36a835cb99082a94bac3163c1e0d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^96-E*g&9a5*kQB)NErn9gt$f>oe~t3)!f{@WX_tS zd#`?b_y0cw0=;{8^x3oSd-sa3UX9wj*Yf}W|0{M{B?0xW_H=O!(U`b&;zhwG2OgKj zvMqc^{ErLe+z?tKJo5&F@s$Vn+|-K-*n56|RCCBXoa*}R`B*Tke3-eUHx3vIVCg!0ORk3S^xk5 diff --git a/graphics/mevent/gfx_467700.png b/graphics/mevent/gfx_467700.png deleted file mode 100644 index f31385746f99871768c7f044393b52d65390ce3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)5bTGh>3-ql*w)oSkcV&>jr)y-nXv|{e&V)pK8rx32b0005G zNkld(hGQx*7#mW+_4d%^momtt6uysAy&yq!iP}j!!5R3~14+LQ1SJ&TI zpa7u)9HDaacr{rJFu`nJY>5C9tah{@p#d&q@++~La2*w~h#w%{ z^9^72bz#od7RDXyyK!GOSC}H+pudZ%DH}Rugs8uik*t>oKS8I-Pu6MfC*9CIEe}l6 zk7zW~OG8UW8d@^a(2~J^QC!EE?_Mo4p*Z7!Vj)3NpAZ+zj0MNiljqvM^v6T++1;O` zQTl0d$|n*YaDK|^Q9t+3J3sWu_ZJ;JamB}4eUfEwE&H`&2Niy8djqJK?X15fnhwgj wKTNKBd%F*-g!qdEZE^aS>E*tSvUy7T1L-+ub}9f2?*IS*07*qoM6N<$f+>FjRR910 diff --git a/graphics/mevent/gfx_467A7C.png b/graphics/mevent/gfx_467A7C.png deleted file mode 100644 index f94b6c50f9459613f0c7d62411050bd395d2ba51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmV+?0@(eDP)v$<5grazyz~>u_XdbuszU%gc@kZ$R$7rqGM&}tI14DhM*q6ZXUqC<9(B#B3{?W zo1Hmf@at55WGjAJ4EIp&+vnx9TSg7sfz^5p*i)Vf`0~JlpPc8UE4gm|gTiDCCny2P z46owg@~062arGzx*I;1=PND*x9-RshjRKMmj>cVz!nguh@++{Ka32-1h+iPS^Bq6- z-NxLk-57TQzHP2BMZ7_OjjAYLbjS!%f9XcDUf%o!ohCn7r@5c>Li1~RU~>J4S|h#G zv}B~FB_lO08SEFub&2;qs%0i5XKYX`BuMHEak0!;a4bE!ul-AZ+yp&H6}dffL96})oB$6TGsvRTW1?N~vDU)w$as%1N?FNvmua-MIU>)Ae@ p!zv;E#ez0D{bX9*w^kNUX)l}OX71l}(B%LC002ovPDHLkV1mrb1lRxo diff --git a/graphics/mevent/gfx_467EF4.png b/graphics/mevent/gfx_467EF4.png deleted file mode 100644 index 51a1aeb0c246cfd35423131ef327d13e4f077f1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et0wfrw&pzJ*q^vz%9780gCjaPXljsnxU}p_z ztbhODfvpF_iTY|bo_CEd68{eG5Kx?OKvJb4mLZnAZK1@qB&(i~^NbAo)8B`#x6Ww; O8RzNh=d#Wzp$Py25F?-f diff --git a/graphics/mevent/gfx_4680C0.png b/graphics/mevent/gfx_4680C0.png deleted file mode 100644 index 1a27f321311d1b05ce15cabadb03105bc4a562f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^96(&b0wfspw=qr!QU#tajv*Qor}kasJ)pqBI&<4H z?i-Oa4)Uh3x^39JWx+Bvww_w~=?;1}4<;U9%ky+jOw({lNvc>Q_i~-$@;e*9OwxM! z`OYHFu=d@vt^R#|wfk}P_GaGmujcOYW->f-A;3Mmd`^e8!=2`O*Gn7snA^z4cd`3M TtoNwf2y%m`tDnm{r-UW|%sxRt diff --git a/graphics/mevent/gfx_46821C.png b/graphics/mevent/gfx_46821C.png deleted file mode 100644 index aab27d16cc9859a77903a0ac9d2b591cb49b0ccf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW0wfreEjSZ^l%A)HV+hC0mdKI;Vst07su1 ANB{r; diff --git a/graphics/mevent/gfx_46830C.png b/graphics/mevent/gfx_46830C.png deleted file mode 100644 index 3c2b8e6d14767499a4b39235619946b47071e3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^96%hw0wfqTq*xXLsYp*3#}J9B$v^m6cw7V)Iyh(v zs+?dr;@~9U!P3~_Ah3`_N#GTWW6UHDRfUEPJ&g>9iWr$XDt|<(DTuvnF`mQ0_(?Km sj<3TrOKE4HWBv`Yo-I}ejwuoh3{6{8PM(iD%?h&2)78&qol`;+0L$ShU;qFB diff --git a/graphics/mevent/gfx_468448.png b/graphics/mevent/gfx_468448.png deleted file mode 100644 index 137dbe9f3c41ee24757da3a6b5f4efd774fcd350..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^96(&b0wfspw=qr!QYD@)jv*Qo*Pg$~+n~V1a$(&8 zt~CtO5B&O)b_Kg1i2TweC6N2!@b3zhCzqIVIcgJJ`8IU~q&*AI^51g2s(ho#jJ=YX z2I8e9k9~K2RQqODn^*g{`1nu$o!@tTOgrEH;vmZ+Bhg7h4na%>912oFeTj9lPw()( Wm3}<^gc^f0$Q_=pelF{r5}E+q%t40$ diff --git a/graphics/mevent/gfx_4685B4.png b/graphics/mevent/gfx_4685B4.png deleted file mode 100644 index 137dbe9f3c41ee24757da3a6b5f4efd774fcd350..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^96(&b0wfspw=qr!QYD@)jv*Qo*Pg$~+n~V1a$(&8 zt~CtO5B&O)b_Kg1i2TweC6N2!@b3zhCzqIVIcgJJ`8IU~q&*AI^51g2s(ho#jJ=YX z2I8e9k9~K2RQqODn^*g{`1nu$o!@tTOgrEH;vmZ+Bhg7h4na%>912oFeTj9lPw()( Wm3}<^gc^f0$Q_=pelF{r5}E+q%t40$ diff --git a/graphics/mevent/tilemap_467288.bin b/graphics/wonder_card/bg0.bin similarity index 100% rename from graphics/mevent/tilemap_467288.bin rename to graphics/wonder_card/bg0.bin diff --git a/graphics/mevent/pal_46708C.pal b/graphics/wonder_card/bg0.pal similarity index 100% rename from graphics/mevent/pal_46708C.pal rename to graphics/wonder_card/bg0.pal diff --git a/graphics/wonder_card/bg0.png b/graphics/wonder_card/bg0.png new file mode 100644 index 0000000000000000000000000000000000000000..924a46dac5cbab9a5f51b90e97e15a1fd58a1ab5 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bZ!VDzyEjb#px%?7E{-7@6X#xj%iCli!1iFBLS8}6 zf}VuOObWss(hbT7*!r^LtK_FFa*Y2sMZNs`GS9i(mIYmx%=Hd+3N$x`Ih44G^o7I; zv^K3`Gvw$#f1w~N{x{2}uKf?Ka+tUIFmQJ|-9M^P@|&@_j>R%{w~aej|BiqiyxJN2 z56Euj`DJmZp}hF?{GUzJp0e2lIGz)FVA(w9+JUxrtS{xAgJ#49^C`PW7jdNiSfkp! zR`OHx>7tl*;FVdQ&MBb@ E0A?JB9RL6T literal 0 HcmV?d00001 diff --git a/graphics/mevent/tilemap_467470.bin b/graphics/wonder_card/bg1.bin similarity index 100% rename from graphics/mevent/tilemap_467470.bin rename to graphics/wonder_card/bg1.bin diff --git a/graphics/mevent/pal_4670AC.pal b/graphics/wonder_card/bg1.pal similarity index 100% rename from graphics/mevent/pal_4670AC.pal rename to graphics/wonder_card/bg1.pal diff --git a/graphics/wonder_card/bg1.png b/graphics/wonder_card/bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..8ea8b1a4115b5c182563c64f16c4cba327b3095a GIT binary patch literal 311 zcmV-70m%M|P)!1fFZa>wl0lXVDiBw)gx4)GdIv0kj*S=~T;-fQJRxei68TwTv2Bj&2Ox zs4+|lZ$!{>p0t)5W$(Y>Tjv^sPabgwXW`CFfahk-SUwA98NRYHD20xL101 V%QkiG{SS04gQu&X%Q~loCIA(keA55` literal 0 HcmV?d00001 diff --git a/graphics/mevent/pal_4670EC.pal b/graphics/wonder_card/bg3.pal similarity index 100% rename from graphics/mevent/pal_4670EC.pal rename to graphics/wonder_card/bg3.pal diff --git a/graphics/mevent/pal_46710C.pal b/graphics/wonder_card/bg4.pal similarity index 100% rename from graphics/mevent/pal_46710C.pal rename to graphics/wonder_card/bg4.pal diff --git a/graphics/mevent/pal_46712C.pal b/graphics/wonder_card/bg5.pal similarity index 100% rename from graphics/mevent/pal_46712C.pal rename to graphics/wonder_card/bg5.pal diff --git a/graphics/mevent/tilemap_467934.bin b/graphics/wonder_card/bg6.bin similarity index 100% rename from graphics/mevent/tilemap_467934.bin rename to graphics/wonder_card/bg6.bin diff --git a/graphics/mevent/pal_46714C.pal b/graphics/wonder_card/bg6.pal similarity index 100% rename from graphics/mevent/pal_46714C.pal rename to graphics/wonder_card/bg6.pal diff --git a/graphics/wonder_card/bg6.png b/graphics/wonder_card/bg6.png new file mode 100644 index 0000000000000000000000000000000000000000..f534b555eca7610b7c05b20b2034792229756b2f GIT binary patch literal 545 zcmV++0^a?JP)5bTGh>3-ql*w)oSkcV&>jr)y-nXv|{e&V)pK8rx32b00053 zNkl?#Y|xU+03jo^6ZFn6?tFQ{8-z+o0{qi} z?wt6N4`ItPC6(2mr9 zsRs$t6I14>4+PC9>y5NbfO~JZ(xLo)k=;ttO9|AqjJUs&R3kVz1^~B*R!qk2Rvn}p9%r;F#GBuv( j@RD!8;ZFEw@Lb>@ztv}Un*>d#00000NkvXXu0mjfiD~#f literal 0 HcmV?d00001 diff --git a/graphics/mevent/tilemap_467CAC.bin b/graphics/wonder_card/bg7.bin similarity index 100% rename from graphics/mevent/tilemap_467CAC.bin rename to graphics/wonder_card/bg7.bin diff --git a/graphics/mevent/pal_46716C.pal b/graphics/wonder_card/bg7.pal similarity index 100% rename from graphics/mevent/pal_46716C.pal rename to graphics/wonder_card/bg7.pal diff --git a/graphics/wonder_card/bg7.png b/graphics/wonder_card/bg7.png new file mode 100644 index 0000000000000000000000000000000000000000..90890ded9923aa929bb4d42de47da60bdf87d132 GIT binary patch literal 534 zcmV+x0_pvUP)(YQ`TA;Hdi8MuZ^LWWC14JREL>MLS62aX7vahq}IacW2)6P;=>PgH?9VGS-<{u-)U z)*+X|NS*NSTr>?S;nhHmA_hV(S-2@EwKdWJQs78i9*ltl1^QM9kIc6~574zhXo8^y z4*$aU5uy%1#<2~O8-EbuJIn>1ySK3jNnmW>3PEN_{g+z??-+g~c(InDpQ-EtBA0;HT{q92Df1Swlbt|6o{>da3VM*$RphEvS!Bk2myht8nW6Zc;>7j+#_o0!+X4~ zATIVC>2hI5Fs@b%707*qoM6N<$f>wO@2LJ#7 literal 0 HcmV?d00001 diff --git a/graphics/wonder_card/stamp_shadow.png b/graphics/wonder_card/stamp_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..ae1c92a93bad2516e6a6f4e8808d143235c3a9e9 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h-=i*DSP)WIeT`^)vJ5| zGyErr=G|hy4%BPp>Eak7F*P|sfuF;Pamr~84tA!1eG?2NG@M)#Vmbso4oGk&h&xaQKAI34{BrtJ57< z$yAFyX}3PVS@EBu1z!=z^^-Q6u0@|0+N3b!y`&r4#~#+41LcNsM>a_ZRZh5h`dLaZ P&|U^lS3j3^P6gTe~DWM4f D6jwTo literal 0 HcmV?d00001 diff --git a/graphics/mevent/tilemap_46837C.bin b/graphics/wonder_news/bg2.bin similarity index 100% rename from graphics/mevent/tilemap_46837C.bin rename to graphics/wonder_news/bg2.bin diff --git a/graphics/wonder_news/bg2.png b/graphics/wonder_news/bg2.png new file mode 100644 index 0000000000000000000000000000000000000000..518283c86445749510071d3591b39473ac846697 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^96%hw!VDy>*01&lQU(D&A+AwJrvwFMH8*!JnX~5T z-mBl<{r}H^gq}V7fAr}8B}=|_cfX5@`v3p`44L{Wpx$s#7sn8ZsZ%Fh4#6!JA_~6Rad%bL{IA2kr%Z;8%Nm{^!lxGI~>hRxo(F`njxgN@xNA3xHfh literal 0 HcmV?d00001 diff --git a/graphics/mevent/tilemap_4684D8.bin b/graphics/wonder_news/bg6.bin similarity index 100% rename from graphics/mevent/tilemap_4684D8.bin rename to graphics/wonder_news/bg6.bin diff --git a/graphics/mevent/pal_468080.pal b/graphics/wonder_news/bg6.pal similarity index 100% rename from graphics/mevent/pal_468080.pal rename to graphics/wonder_news/bg6.pal diff --git a/graphics/wonder_news/bg6.png b/graphics/wonder_news/bg6.png new file mode 100644 index 0000000000000000000000000000000000000000..6e26cdc06cfd86ecb7571cf0476adc555edd2d77 GIT binary patch literal 223 zcmV<503iQ~P)5bTGh>3-ql*w)oSkcV&>jr)y-nXv|{e&V)pK8rx32b0001L zNklqaTIrg4Pb??zzWz$E75?S^glHDE-wKhX|ZU)>NJJd z9x@^oGb&|n%sBAMr1iSo#=Q)a zixc)Um-of~Vy$cXeAD6o1jaeS;wJ@IwrWjcoGg>q!S$y21eZ_I9wlk7)!R6pXJ@eM XZu`|Ozj*g`psfs^u6{1-oD!M<>nUG- literal 0 HcmV?d00001 diff --git a/include/mevent.h b/include/mevent.h index 00d199fb0..9a273a872 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -47,12 +47,12 @@ struct MEvent_Str_2 u8 fill_00[0x40]; }; -struct UnkStruct_8467FB8 +struct WonderGraphics { - u8 textPal1:4; - u8 textPal2:4; - u8 textPal3:4; - u8 index:4; + u8 titleTextPal:4; + u8 bodyTextPal:4; + u8 footerTextPal:4; + u8 stampShadowPal:4; const u8 * tiles; const u8 * map; const u16 * pal; @@ -82,7 +82,7 @@ u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventCl bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1); u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command); bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * metadata); -bool32 WonderNews_Init(const struct WonderNews * a0); +bool32 WonderNews_Init(const struct WonderNews * news); s32 WonderCard_Enter(void); s32 WonderNews_Enter(void); void DestroyWonderCard(void); diff --git a/src/mystery_gift_show_card.c b/src/mystery_gift_show_card.c index 8f19dad64..c462bda76 100644 --- a/src/mystery_gift_show_card.c +++ b/src/mystery_gift_show_card.c @@ -29,7 +29,7 @@ struct WonderCardData { /*0000*/ struct WonderCard card; /*014c*/ struct WonderCardMetadata cardMetadata; - /*0170*/ const struct UnkStruct_8467FB8 * gfx; + /*0170*/ const struct WonderGraphics * gfx; /*0174*/ u8 enterExitState; /*0175*/ u8 recordIdx; /*0176*/ u16 windowIds[WIN_COUNT]; @@ -94,47 +94,47 @@ static const struct WindowTemplate sWindowTemplates[] = { } }; -static const u16 sCard0Pal[] = INCBIN_U16("graphics/mevent/pal_46708C.gbapal"); -const u16 gCard1Pal[] = INCBIN_U16("graphics/mevent/pal_4670AC.gbapal"); -const u16 gCard2Pal[] = INCBIN_U16("graphics/mevent/pal_4670CC.gbapal"); -const u16 gCard3Pal[] = INCBIN_U16("graphics/mevent/pal_4670EC.gbapal"); -const u16 gCard4Pal[] = INCBIN_U16("graphics/mevent/pal_46710C.gbapal"); -const u16 gCard5Pal[] = INCBIN_U16("graphics/mevent/pal_46712C.gbapal"); -static const u16 sCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal"); -static const u16 sCard7Pal[] = INCBIN_U16("graphics/mevent/pal_46716C.gbapal"); -static const u8 sCard0Gfx[] = INCBIN_U8("graphics/mevent/gfx_46718C.4bpp.lz"); -static const u8 sCard0Map[] = INCBIN_U8("graphics/mevent/tilemap_467288.bin.lz"); -static const u8 sCard1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46737C.4bpp.lz"); -static const u8 sCard1Map[] = INCBIN_U8("graphics/mevent/tilemap_467470.bin.lz"); -static const u8 sCard2Gfx[] = INCBIN_U8("graphics/mevent/gfx_467558.4bpp.lz"); -static const u8 sCard2Map[] = INCBIN_U8("graphics/mevent/tilemap_46762C.bin.lz"); -static const u8 sCard6Gfx[] = INCBIN_U8("graphics/mevent/gfx_467700.4bpp.lz"); -static const u8 sCard6Map[] = INCBIN_U8("graphics/mevent/tilemap_467934.bin.lz"); -static const u8 sCard7Gfx[] = INCBIN_U8("graphics/mevent/gfx_467A7C.4bpp.lz"); -static const u8 sCard7Map[] = INCBIN_U8("graphics/mevent/tilemap_467CAC.bin.lz"); -static const u16 sUnknown_8467DF4[] = INCBIN_U16("graphics/mevent/pal_467DF4.gbapal"); -static const u16 sUnknown_8467E14[] = INCBIN_U16("graphics/mevent/pal_467E14.gbapal"); -static const u16 sUnknown_8467E34[] = INCBIN_U16("graphics/mevent/pal_467E34.gbapal"); -static const u16 sUnknown_8467E54[] = INCBIN_U16("graphics/mevent/pal_467E54.gbapal"); -static const u16 sUnknown_8467E74[] = INCBIN_U16("graphics/mevent/pal_467E74.gbapal"); -static const u16 sUnknown_8467E94[] = INCBIN_U16("graphics/mevent/pal_467E94.gbapal"); -static const u16 sUnknown_8467EB4[] = INCBIN_U16("graphics/mevent/pal_467EB4.gbapal"); -static const u16 sUnknown_8467ED4[] = INCBIN_U16("graphics/mevent/pal_467ED4.gbapal"); -static const u32 sUnknown_8467EF4[] = INCBIN_U32("graphics/mevent/gfx_467EF4.4bpp.lz"); +static const u16 sCard0Pal[] = INCBIN_U16("graphics/wonder_card/bg0.gbapal"); +const u16 gCard1Pal[] = INCBIN_U16("graphics/wonder_card/bg1.gbapal"); +const u16 gCard2Pal[] = INCBIN_U16("graphics/wonder_card/bg2.gbapal"); +const u16 gCard3Pal[] = INCBIN_U16("graphics/wonder_card/bg3.gbapal"); +const u16 gCard4Pal[] = INCBIN_U16("graphics/wonder_card/bg4.gbapal"); +const u16 gCard5Pal[] = INCBIN_U16("graphics/wonder_card/bg5.gbapal"); +static const u16 sCard6Pal[] = INCBIN_U16("graphics/wonder_card/bg6.gbapal"); +static const u16 sCard7Pal[] = INCBIN_U16("graphics/wonder_card/bg7.gbapal"); +static const u8 sCard0Gfx[] = INCBIN_U8("graphics/wonder_card/bg0.4bpp.lz"); +static const u8 sCard0Map[] = INCBIN_U8("graphics/wonder_card/bg0.bin.lz"); +static const u8 sCard1Gfx[] = INCBIN_U8("graphics/wonder_card/bg1.4bpp.lz"); +static const u8 sCard1Map[] = INCBIN_U8("graphics/wonder_card/bg1.bin.lz"); +static const u8 sCard2Gfx[] = INCBIN_U8("graphics/wonder_card/bg2.4bpp.lz"); +static const u8 sCard2Map[] = INCBIN_U8("graphics/wonder_card/bg2.bin.lz"); +static const u8 sCard6Gfx[] = INCBIN_U8("graphics/wonder_card/bg6.4bpp.lz"); +static const u8 sCard6Map[] = INCBIN_U8("graphics/wonder_card/bg6.bin.lz"); +static const u8 sCard7Gfx[] = INCBIN_U8("graphics/wonder_card/bg7.4bpp.lz"); +static const u8 sCard7Map[] = INCBIN_U8("graphics/wonder_card/bg7.bin.lz"); +static const u16 sStampShadowPal0[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_0.gbapal"); +static const u16 sStampShadowPal1[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_1.gbapal"); +static const u16 sStampShadowPal2[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_2.gbapal"); +static const u16 sStampShadowPal3[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_3.gbapal"); +static const u16 sStampShadowPal4[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_4.gbapal"); +static const u16 sStampShadowPal5[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_5.gbapal"); +static const u16 sStampShadowPal6[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_6.gbapal"); +static const u16 sStampShadowPal7[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_7.gbapal"); +static const u32 sStampShadowGfx[] = INCBIN_U32("graphics/wonder_card/stamp_shadow.4bpp.lz"); static const struct CompressedSpriteSheet sSpriteSheet_StampShadow = { - sUnknown_8467EF4, 0x100, 0x8000 + sStampShadowGfx, 0x100, TAG_STAMP_SHADOW }; static const struct SpritePalette sSpritePalettes_StampShadow[] = { - {sUnknown_8467DF4, 0x8000}, - {sUnknown_8467E14, 0x8000}, - {sUnknown_8467E34, 0x8000}, - {sUnknown_8467E54, 0x8000}, - {sUnknown_8467E74, 0x8000}, - {sUnknown_8467E94, 0x8000}, - {sUnknown_8467EB4, 0x8000}, - {sUnknown_8467ED4, 0x8000} + {sStampShadowPal0, TAG_STAMP_SHADOW}, + {sStampShadowPal1, TAG_STAMP_SHADOW}, + {sStampShadowPal2, TAG_STAMP_SHADOW}, + {sStampShadowPal3, TAG_STAMP_SHADOW}, + {sStampShadowPal4, TAG_STAMP_SHADOW}, + {sStampShadowPal5, TAG_STAMP_SHADOW}, + {sStampShadowPal6, TAG_STAMP_SHADOW}, + {sStampShadowPal7, TAG_STAMP_SHADOW} }; static const struct SpriteTemplate sSpriteTemplate_StampShadow = { @@ -147,15 +147,15 @@ static const struct SpriteTemplate sSpriteTemplate_StampShadow = { .callback = SpriteCallbackDummy }; -static const struct UnkStruct_8467FB8 sCardGraphics[8] = { - {1, 0, 0, 0, sCard0Gfx, sCard0Map, sCard0Pal}, - {1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal}, - {1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal}, - {1, 0, 0, 3, sCard2Gfx, sCard2Map, gCard3Pal}, - {1, 0, 0, 4, sCard2Gfx, sCard2Map, gCard4Pal}, - {1, 0, 0, 5, sCard2Gfx, sCard2Map, gCard5Pal}, - {1, 0, 0, 6, sCard6Gfx, sCard6Map, sCard6Pal}, - {1, 0, 0, 7, sCard7Gfx, sCard7Map, sCard7Pal} +static const struct WonderGraphics sCardGraphics[NUM_WONDER_BGS] = { + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 0, .tiles = sCard0Gfx, .map = sCard0Map, .pal = sCard0Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 1, .tiles = sCard1Gfx, .map = sCard1Map, .pal = gCard1Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 2, .tiles = sCard2Gfx, .map = sCard2Map, .pal = gCard2Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 3, .tiles = sCard2Gfx, .map = sCard2Map, .pal = gCard3Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 4, .tiles = sCard2Gfx, .map = sCard2Map, .pal = gCard4Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 5, .tiles = sCard2Gfx, .map = sCard2Map, .pal = gCard5Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 6, .tiles = sCard6Gfx, .map = sCard6Map, .pal = sCard6Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .footerTextPal = 0, .stampShadowPal = 7, .tiles = sCard7Gfx, .map = sCard7Map, .pal = sCard7Pal} }; bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * metadata) @@ -399,27 +399,27 @@ static void DrawCardWindow(u8 whichWindow) { // Print card title/subtitle s32 x; - AddTextPrinterParameterized3(windowId, FONT_3, 0, 1, sTextColorTable[sWonderCardData->gfx->textPal1], 0, sWonderCardData->titleText); + AddTextPrinterParameterized3(windowId, FONT_3, 0, 1, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->titleText); x = 160 - GetStringWidth(FONT_3, sWonderCardData->subtitleText, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING)); if (x < 0) x = 0; - AddTextPrinterParameterized3(windowId, FONT_3, x, 17, sTextColorTable[sWonderCardData->gfx->textPal1], 0, sWonderCardData->subtitleText); + AddTextPrinterParameterized3(windowId, FONT_3, x, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->subtitleText); // Print id number if (sWonderCardData->card.idNumber != 0) - AddTextPrinterParameterized3(windowId, FONT_2, 166, 17, sTextColorTable[sWonderCardData->gfx->textPal1], 0, sWonderCardData->idNumberText); + AddTextPrinterParameterized3(windowId, FONT_2, 166, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->idNumberText); break; } case WIN_BODY: // Print body text for (; i < WONDER_CARD_BODY_TEXT_LINES; i++) - AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 * i + 2, sTextColorTable[sWonderCardData->gfx->textPal2], 0, sWonderCardData->bodyText[i]); + AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 * i + 2, sTextColorTable[sWonderCardData->gfx->bodyTextPal], 0, sWonderCardData->bodyText[i]); break; case WIN_FOOTER: // Print footer line 1 AddTextPrinterParameterized3(windowId, FONT_3, 0, sFooterTextOffsets[sWonderCardData->card.type], - sTextColorTable[sWonderCardData->gfx->textPal3], + sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->footerLine1Text); // Print footer line 2 @@ -429,7 +429,7 @@ static void DrawCardWindow(u8 whichWindow) // Odd that CARD_TYPE_STAMP is not ignored, it has empty text for this AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 + sFooterTextOffsets[sWonderCardData->card.type], - sTextColorTable[sWonderCardData->gfx->textPal3], + sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->footerLine2Text); } else @@ -440,13 +440,13 @@ static void DrawCardWindow(u8 whichWindow) for (; i < sWonderCardData->recordIdx; i++) { // Print stat text - AddTextPrinterParameterized3(windowId, FONT_3, x, y, sTextColorTable[sWonderCardData->gfx->textPal3], 0, sWonderCardData->statTextData[i].statText); + AddTextPrinterParameterized3(windowId, FONT_3, x, y, sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->statTextData[i].statText); if (sWonderCardData->statTextData[i].statNumberText[0] != EOS) { // Print stat number x += GetStringWidth(FONT_3, sWonderCardData->statTextData[i].statText, spacing); AddTextPrinterParameterized3(windowId, FONT_2, x, y, - sTextColorTable[sWonderCardData->gfx->textPal3], + sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->statTextData[i].statNumberText); x += GetStringWidth(FONT_3, sWonderCardData->statTextData[i].statNumberText, spacing) + sWonderCardData->statTextData[i].width; } @@ -473,7 +473,7 @@ static void CreateCardSprites(void) if (sWonderCardData->card.maxStamps != 0 && sWonderCardData->card.type == CARD_TYPE_STAMP) { LoadCompressedSpriteSheetUsingHeap(&sSpriteSheet_StampShadow); - LoadSpritePalette(&sSpritePalettes_StampShadow[sWonderCardData->gfx->index]); + LoadSpritePalette(&sSpritePalettes_StampShadow[sWonderCardData->gfx->stampShadowPal]); for (; i < sWonderCardData->card.maxStamps; i++) { sWonderCardData->stampSpriteIds[i][0] = SPRITE_NONE; diff --git a/src/mystery_gift_show_news.c b/src/mystery_gift_show_news.c index a6f72296b..b97e74c8c 100644 --- a/src/mystery_gift_show_news.c +++ b/src/mystery_gift_show_news.c @@ -20,7 +20,7 @@ enum { struct WonderNewsData { struct WonderNews news; - const struct UnkStruct_8467FB8 * gfx; + const struct WonderGraphics * gfx; bool8 verticalScrollDisabled:1; u8 enterExitState:7; u8 arrowTaskId; @@ -82,29 +82,29 @@ static const struct ScrollArrowsTemplate sArrowsTemplate = { .palNum = 0 }; -static const u16 sNews1Pal[] = INCBIN_U16("graphics/mevent/pal_468060.gbapal"); -static const u16 sNews6Pal[] = INCBIN_U16("graphics/mevent/pal_468080.gbapal"); -static const u16 sNews7Pal[] = INCBIN_U16("graphics/mevent/pal_4680A0.gbapal"); -static const u8 sNews0Gfx[] = INCBIN_U8("graphics/mevent/gfx_4680C0.4bpp.lz"); -static const u8 sNews0Map[] = INCBIN_U8("graphics/mevent/tilemap_468140.bin.lz"); -static const u8 sNews1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46821C.4bpp.lz"); -static const u8 sNews1Map[] = INCBIN_U8("graphics/mevent/tilemap_46824C.bin.lz"); -static const u8 sNews2Gfx[] = INCBIN_U8("graphics/mevent/gfx_46830C.4bpp.lz"); -static const u8 sNews2Map[] = INCBIN_U8("graphics/mevent/tilemap_46837C.bin.lz"); -static const u8 sNews6Gfx[] = INCBIN_U8("graphics/mevent/gfx_468448.4bpp.lz"); -static const u8 sNews6Map[] = INCBIN_U8("graphics/mevent/tilemap_4684D8.bin.lz"); -static const u8 sNews7Gfx[] = INCBIN_U8("graphics/mevent/gfx_4685B4.4bpp.lz"); -static const u8 sNews7Map[] = INCBIN_U8("graphics/mevent/tilemap_468644.bin.lz"); +static const u16 sNews0Pal[] = INCBIN_U16("graphics/wonder_news/bg0.gbapal"); +static const u16 sNews6Pal[] = INCBIN_U16("graphics/wonder_news/bg6.gbapal"); +static const u16 sNews7Pal[] = INCBIN_U16("graphics/wonder_news/bg7.gbapal"); +static const u8 sNews0Gfx[] = INCBIN_U8("graphics/wonder_news/bg0.4bpp.lz"); +static const u8 sNews0Map[] = INCBIN_U8("graphics/wonder_news/bg0.bin.lz"); +static const u8 sNews1Gfx[] = INCBIN_U8("graphics/wonder_news/bg1.4bpp.lz"); +static const u8 sNews1Map[] = INCBIN_U8("graphics/wonder_news/bg1.bin.lz"); +static const u8 sNews2Gfx[] = INCBIN_U8("graphics/wonder_news/bg2.4bpp.lz"); +static const u8 sNews2Map[] = INCBIN_U8("graphics/wonder_news/bg2.bin.lz"); +static const u8 sNews6Gfx[] = INCBIN_U8("graphics/wonder_news/bg6.4bpp.lz"); +static const u8 sNews6Map[] = INCBIN_U8("graphics/wonder_news/bg6.bin.lz"); +static const u8 sNews7Gfx[] = INCBIN_U8("graphics/wonder_news/bg7.4bpp.lz"); +static const u8 sNews7Map[] = INCBIN_U8("graphics/wonder_news/bg7.bin.lz"); -static const struct UnkStruct_8467FB8 sNewsGraphics[NUM_WONDER_BGS] = { - {1, 0, 0, 0, sNews0Gfx, sNews0Map, sNews1Pal}, - {1, 0, 0, 0, sNews1Gfx, sNews1Map, gCard1Pal}, - {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard2Pal}, - {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard3Pal}, - {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard4Pal}, - {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard5Pal}, - {1, 0, 0, 0, sNews6Gfx, sNews6Map, sNews6Pal}, - {1, 0, 0, 0, sNews7Gfx, sNews7Map, sNews7Pal} +static const struct WonderGraphics sNewsGraphics[NUM_WONDER_BGS] = { + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews0Gfx, .map = sNews0Map, .pal = sNews0Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews1Gfx, .map = sNews1Map, .pal = gCard1Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews2Gfx, .map = sNews2Map, .pal = gCard2Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews2Gfx, .map = sNews2Map, .pal = gCard3Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews2Gfx, .map = sNews2Map, .pal = gCard4Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews2Gfx, .map = sNews2Map, .pal = gCard5Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews6Gfx, .map = sNews6Map, .pal = sNews6Pal}, + {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sNews7Gfx, .map = sNews7Map, .pal = sNews7Pal} }; bool32 WonderNews_Init(const struct WonderNews * news) @@ -363,14 +363,14 @@ static void DrawNewsWindows(void) x = (224 - GetStringWidth(FONT_3, sWonderNewsData->titleText, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING))) / 2; if (x < 0) x = 0; - AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_TITLE], FONT_3, x, 6, sTextColorTable[sWonderNewsData->gfx->textPal1], 0, sWonderNewsData->titleText); + AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_TITLE], FONT_3, x, 6, sTextColorTable[sWonderNewsData->gfx->titleTextPal], 0, sWonderNewsData->titleText); // Print body text for (; i < WONDER_NEWS_BODY_TEXT_LINES; ++i) { AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_BODY], FONT_3, 0, 16 * i + 2, - sTextColorTable[sWonderNewsData->gfx->textPal2], + sTextColorTable[sWonderNewsData->gfx->bodyTextPal], 0, sWonderNewsData->bodyText[i]); } CopyWindowToVram(sWonderNewsData->windowIds[WIN_TITLE], COPYWIN_FULL);