From 098671750b2ccc4be5815da7cab6d78c8b7eccc4 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 00:49:21 -0600 Subject: [PATCH] Extract data from text window --- data/graphics.s | 6 +- data/text_window.s | 270 +++++++++++++++------------ graphics/interface/textbox.png | Bin 198 -> 0 bytes graphics/text_window/1.png | Bin 0 -> 199 bytes graphics/text_window/10.png | Bin 0 -> 316 bytes graphics/text_window/11.png | Bin 0 -> 285 bytes graphics/text_window/12.png | Bin 0 -> 354 bytes graphics/text_window/13.png | Bin 0 -> 276 bytes graphics/text_window/14.png | Bin 0 -> 320 bytes graphics/text_window/15.png | Bin 0 -> 327 bytes graphics/text_window/16.png | Bin 0 -> 292 bytes graphics/text_window/17.png | Bin 0 -> 385 bytes graphics/text_window/18.png | Bin 0 -> 284 bytes graphics/text_window/19.png | Bin 0 -> 346 bytes graphics/text_window/2.png | Bin 0 -> 183 bytes graphics/text_window/20.png | Bin 0 -> 314 bytes graphics/text_window/3.png | Bin 0 -> 272 bytes graphics/text_window/4.png | Bin 0 -> 242 bytes graphics/text_window/5.png | Bin 0 -> 323 bytes graphics/text_window/6.png | Bin 0 -> 268 bytes graphics/text_window/7.png | Bin 0 -> 394 bytes graphics/text_window/8.png | Bin 0 -> 241 bytes graphics/text_window/9.png | Bin 0 -> 325 bytes graphics/text_window/message_box.png | Bin 0 -> 241 bytes graphics/text_window/text_pal1.pal | 19 ++ graphics/text_window/text_pal2.pal | 19 ++ graphics/text_window/text_pal3.pal | 19 ++ graphics/text_window/text_pal4.pal | 19 ++ src/save_failed_screen.c | 8 +- src/text_window.c | 4 +- 30 files changed, 233 insertions(+), 131 deletions(-) delete mode 100755 graphics/interface/textbox.png create mode 100644 graphics/text_window/1.png create mode 100644 graphics/text_window/10.png create mode 100644 graphics/text_window/11.png create mode 100644 graphics/text_window/12.png create mode 100644 graphics/text_window/13.png create mode 100644 graphics/text_window/14.png create mode 100644 graphics/text_window/15.png create mode 100644 graphics/text_window/16.png create mode 100644 graphics/text_window/17.png create mode 100644 graphics/text_window/18.png create mode 100644 graphics/text_window/19.png create mode 100644 graphics/text_window/2.png create mode 100644 graphics/text_window/20.png create mode 100644 graphics/text_window/3.png create mode 100644 graphics/text_window/4.png create mode 100644 graphics/text_window/5.png create mode 100644 graphics/text_window/6.png create mode 100644 graphics/text_window/7.png create mode 100644 graphics/text_window/8.png create mode 100644 graphics/text_window/9.png create mode 100644 graphics/text_window/message_box.png create mode 100644 graphics/text_window/text_pal1.pal create mode 100644 graphics/text_window/text_pal2.pal create mode 100644 graphics/text_window/text_pal3.pal create mode 100644 graphics/text_window/text_pal4.pal diff --git a/data/graphics.s b/data/graphics.s index c1ca770358..ce7c2c3ba6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5042,11 +5042,11 @@ gUnknown_08DDD704:: @ 8DDD704 .align 2 gUnknown_08DDD728:: @ 8DDD728 - .incbin "graphics/interface/textbox.gbapal" @ textbox palette? + .incbin "graphics/text_window/message_box.gbapal" .align 2 -gUnknown_08DDD748:: @ 8DDD748 - .incbin "graphics/interface/textbox.4bpp" +gMessageBox_Gfx:: @ 8DDD748 + .incbin "graphics/text_window/message_box.4bpp" .align 2 gWallpaperIcon_Cross:: diff --git a/data/text_window.s b/data/text_window.s index 716425100a..8acbe5a251 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -2,169 +2,195 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 -gUnknown_0850E87C:: @ 850E87C - .incbin "baserom.gba", 0x50e87c, 0x120 + .align 2 +gTextWindowFrame1_Gfx:: @ 850E87C + .incbin "graphics/text_window/1.4bpp" -gUnknown_0850E99C:: @ 850E99C - .incbin "baserom.gba", 0x50e99c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: @ 850E99C + .incbin "graphics/text_window/2.4bpp" -gUnknown_0850EABC:: @ 850EABC - .incbin "baserom.gba", 0x50eabc, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: @ 850EABC + .incbin "graphics/text_window/3.4bpp" -gUnknown_0850EBDC:: @ 850EBDC - .incbin "baserom.gba", 0x50ebdc, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: @ 850EBDC + .incbin "graphics/text_window/4.4bpp" -gUnknown_0850ECFC:: @ 850ECFC - .incbin "baserom.gba", 0x50ecfc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: @ 850ECFC + .incbin "graphics/text_window/5.4bpp" -gUnknown_0850EE1C:: @ 850EE1C - .incbin "baserom.gba", 0x50ee1c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: @ 850EE1C + .incbin "graphics/text_window/6.4bpp" -gUnknown_0850EF3C:: @ 850EF3C - .incbin "baserom.gba", 0x50ef3c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: @ 850EF3C + .incbin "graphics/text_window/7.4bpp" -gUnknown_0850F05C:: @ 850F05C - .incbin "baserom.gba", 0x50f05c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: @ 850F05C + .incbin "graphics/text_window/8.4bpp" -gUnknown_0850F17C:: @ 850F17C - .incbin "baserom.gba", 0x50f17c, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: @ 850F17C + .incbin "graphics/text_window/9.4bpp" -gUnknown_0850F29C:: @ 850F29C - .incbin "baserom.gba", 0x50f29c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: @ 850F29C + .incbin "graphics/text_window/10.4bpp" -gUnknown_0850F3BC:: @ 850F3BC - .incbin "baserom.gba", 0x50f3bc, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: @ 850F3BC + .incbin "graphics/text_window/11.4bpp" -gUnknown_0850F4DC:: @ 850F4DC - .incbin "baserom.gba", 0x50f4dc, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: @ 850F4DC + .incbin "graphics/text_window/12.4bpp" -gUnknown_0850F5FC:: @ 850F5FC - .incbin "baserom.gba", 0x50f5fc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: @ 850F5FC + .incbin "graphics/text_window/13.4bpp" -gUnknown_0850F71C:: @ 850F71C - .incbin "baserom.gba", 0x50f71c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: @ 850F71C + .incbin "graphics/text_window/14.4bpp" -gUnknown_0850F83C:: @ 850F83C - .incbin "baserom.gba", 0x50f83c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: @ 850F83C + .incbin "graphics/text_window/15.4bpp" -gUnknown_0850F95C:: @ 850F95C - .incbin "baserom.gba", 0x50f95c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: @ 850F95C + .incbin "graphics/text_window/16.4bpp" -gUnknown_0850FA7C:: @ 850FA7C - .incbin "baserom.gba", 0x50fa7c, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: @ 850FA7C + .incbin "graphics/text_window/17.4bpp" -gUnknown_0850FB9C:: @ 850FB9C - .incbin "baserom.gba", 0x50fb9c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: @ 850FB9C + .incbin "graphics/text_window/18.4bpp" -gUnknown_0850FCBC:: @ 850FCBC - .incbin "baserom.gba", 0x50fcbc, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: @ 850FCBC + .incbin "graphics/text_window/19.4bpp" -gUnknown_0850FDDC:: @ 850FDDC - .incbin "baserom.gba", 0x50fddc, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: @ 850FDDC + .incbin "graphics/text_window/20.4bpp" -gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: @ 850FEFC + .incbin "graphics/text_window/1.gbapal" -gUnknown_0850FF1C:: @ 850FF1C - .incbin "baserom.gba", 0x50ff1c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: @ 850FF1C + .incbin "graphics/text_window/2.gbapal" -gUnknown_0850FF3C:: @ 850FF3C - .incbin "baserom.gba", 0x50ff3c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: @ 850FF3C + .incbin "graphics/text_window/3.gbapal" -gUnknown_0850FF5C:: @ 850FF5C - .incbin "baserom.gba", 0x50ff5c, 0x20 + .align 2 +gTextWindowFrame4_Pal:: @ 850FF5C + .incbin "graphics/text_window/4.gbapal" -gUnknown_0850FF7C:: @ 850FF7C - .incbin "baserom.gba", 0x50ff7c, 0x20 + .align 2 +gTextWindowFrame5_Pal:: @ 850FF7C + .incbin "graphics/text_window/5.gbapal" -gUnknown_0850FF9C:: @ 850FF9C - .incbin "baserom.gba", 0x50ff9c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: @ 850FF9C + .incbin "graphics/text_window/6.gbapal" -gUnknown_0850FFBC:: @ 850FFBC - .incbin "baserom.gba", 0x50ffbc, 0x20 + .align 2 +gTextWindowFrame7_Pal:: @ 850FFBC + .incbin "graphics/text_window/7.gbapal" -gUnknown_0850FFDC:: @ 850FFDC - .incbin "baserom.gba", 0x50ffdc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: @ 850FFDC + .incbin "graphics/text_window/8.gbapal" -gUnknown_0850FFFC:: @ 850FFFC - .incbin "baserom.gba", 0x50fffc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: @ 850FFFC + .incbin "graphics/text_window/9.gbapal" -gUnknown_0851001C:: @ 851001C - .incbin "baserom.gba", 0x51001c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: @ 851001C + .incbin "graphics/text_window/10.gbapal" -gUnknown_0851003C:: @ 851003C - .incbin "baserom.gba", 0x51003c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: @ 851003C + .incbin "graphics/text_window/11.gbapal" -gUnknown_0851005C:: @ 851005C - .incbin "baserom.gba", 0x51005c, 0x20 + .align 2 +gTextWindowFrame12_Pal:: @ 851005C + .incbin "graphics/text_window/12.gbapal" -gUnknown_0851007C:: @ 851007C - .incbin "baserom.gba", 0x51007c, 0x20 + .align 2 +gTextWindowFrame13_Pal:: @ 851007C + .incbin "graphics/text_window/13.gbapal" -gUnknown_0851009C:: @ 851009C - .incbin "baserom.gba", 0x51009c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: @ 851009C + .incbin "graphics/text_window/14.gbapal" -gUnknown_085100BC:: @ 85100BC - .incbin "baserom.gba", 0x5100bc, 0x20 + .align 2 +gTextWindowFrame15_Pal:: @ 85100BC + .incbin "graphics/text_window/15.gbapal" -gUnknown_085100DC:: @ 85100DC - .incbin "baserom.gba", 0x5100dc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: @ 85100DC + .incbin "graphics/text_window/16.gbapal" -gUnknown_085100FC:: @ 85100FC - .incbin "baserom.gba", 0x5100fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: @ 85100FC + .incbin "graphics/text_window/17.gbapal" -gUnknown_0851011C:: @ 851011C - .incbin "baserom.gba", 0x51011c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: @ 851011C + .incbin "graphics/text_window/18.gbapal" -gUnknown_0851013C:: @ 851013C - .incbin "baserom.gba", 0x51013c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: @ 851013C + .incbin "graphics/text_window/19.gbapal" -gUnknown_0851015C:: @ 851015C - .incbin "baserom.gba", 0x51015c, 0x20 + .align 2 +gTextWindowFrame20_Pal:: @ 851015C + .incbin "graphics/text_window/20.gbapal" + .align 2 gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xA0 + .incbin "graphics/text_window/message_box.gbapal" + .incbin "graphics/text_window/text_pal1.gbapal" + .incbin "graphics/text_window/text_pal2.gbapal" + .incbin "graphics/text_window/text_pal3.gbapal" + .incbin "graphics/text_window/text_pal4.gbapal" + + .align 2 gUnknown_0851021C:: @ 851021C - .4byte gUnknown_0850E87C - .4byte gUnknown_0850FEFC - .4byte gUnknown_0850E99C - .4byte gUnknown_0850FF1C - .4byte gUnknown_0850EABC - .4byte gUnknown_0850FF3C - .4byte gUnknown_0850EBDC - .4byte gUnknown_0850FF5C - .4byte gUnknown_0850ECFC - .4byte gUnknown_0850FF7C - .4byte gUnknown_0850EE1C - .4byte gUnknown_0850FF9C - .4byte gUnknown_0850EF3C - .4byte gUnknown_0850FFBC - .4byte gUnknown_0850F05C - .4byte gUnknown_0850FFDC - .4byte gUnknown_0850F17C - .4byte gUnknown_0850FFFC - .4byte gUnknown_0850F29C - .4byte gUnknown_0851001C - .4byte gUnknown_0850F3BC - .4byte gUnknown_0851003C - .4byte gUnknown_0850F4DC - .4byte gUnknown_0851005C - .4byte gUnknown_0850F5FC - .4byte gUnknown_0851007C - .4byte gUnknown_0850F71C - .4byte gUnknown_0851009C - .4byte gUnknown_0850F83C - .4byte gUnknown_085100BC - .4byte gUnknown_0850F95C - .4byte gUnknown_085100DC - .4byte gUnknown_0850FA7C - .4byte gUnknown_085100FC - .4byte gUnknown_0850FB9C - .4byte gUnknown_0851011C - .4byte gUnknown_0850FCBC - .4byte gUnknown_0851013C - .4byte gUnknown_0850FDDC - .4byte gUnknown_0851015C + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal diff --git a/graphics/interface/textbox.png b/graphics/interface/textbox.png deleted file mode 100755 index ed8cd92ee2007a7de1f8e2a1f5981fb7275cda00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^1whQf!VDxY?@zk|qznRlLR^c_F8Tlee^OG?)vITp zad7J9XCaSV}|nw)Te zx#IoaYTiZX84m6%&)0tt>}}s$evrjT!S8XbPj7kW#S_)vWjm_MtIb8;)P8^Wj#bIz vUM>5zAHR5H-Y~yXiF+*9a_n-82@`|tu?ds9PGx@u8qVP9>gTe~DWM4f@P}70 diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png new file mode 100644 index 0000000000000000000000000000000000000000..5d8020eff5ac26935dca94e946ad345c28ef53fd GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*QBFKnudm6URlLi%}Gg9 zii_8Dcb{Fecg?-4_kc=}!T{an^LB{Ts5z(GP@ literal 0 HcmV?d00001 diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png new file mode 100644 index 0000000000000000000000000000000000000000..b01a75c6a606eb9d08500b886b033d7ae487aac5 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#RH6(D1{6;YUNji2{ZN6$T9n5-U0!ek|bFv7zF|g&7-m zY`AgZ#*ZIAJRAbDCT$J{>g6o(h%9Dc;5!V$jK}j=qyPn{db&7ys?MT0J_&`)g%`xomuU=lS+4+kp;b@O1Ta JS?83{1OSNsdm;b; literal 0 HcmV?d00001 diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png new file mode 100644 index 0000000000000000000000000000000000000000..a0e576fce49c041bc2f9a579c5477e5aecc55083 GIT binary patch literal 285 zcmV+&0pk9NP)$I0001} zNklg$R literal 0 HcmV?d00001 diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png new file mode 100644 index 0000000000000000000000000000000000000000..8bff592bacb5f52f6e7b0df2cdc83e5f68869321 GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#MhXWK4)yP|)BoV~4_t4-79Zc>H)U;l~7vgo28S867iD z%s63S@#Du24~Kx`C0CaK^>P+?L>4nJ@ErzW#^d=bQh!1nrXyw|jhgrn50A@7et6 z%+gt>e|S$TzF9NTx^w>NBPMhH3C$O;v6C&h!n*drYQ8tyxR!RFs#i3V xR?n$opW)xU`usbe&dq&x!oh;wdg@{yc^M4S=kR*A{RVo2!PC{xWt~$(69A`}j>P}~ literal 0 HcmV?d00001 diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png new file mode 100644 index 0000000000000000000000000000000000000000..706d134514e033743e70b96b373c6f0fb739f805 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#M8WvEjyr8$TF+08vFj#EBIJFHUqQc&vyxalxbD07U%9 zj~^Zm0lwTBVL-i{1s;*b3=DjSL74G){)!Z!V6LZ&V~EE2WCzxsrT_(oCmtnl*qZy? z7PwSbUDr~G2n1c znSb~=)?}V!lvI6-A0X`wF6DA~NcnECRvEjyr8$dBQm{DPIVnxP-4FwN&6udam@Z-UPA3uJ0 zI0UR_H*5ha;w6(}-O;qU+iSu9+ zT;wApDr5CbC|^fe_WGGk*F7z5XUe`*nf2s@{#Di1`L-FhTGF-)7M;3Q9kb@S)>7@g z=Oo^LYPc2czffnRoR7<#@70rBzP+)2e&?M16Yc}tri-QsNhm1-eb2z)>FVdQ&MBb@ E0CZe-VE_OC literal 0 HcmV?d00001 diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png new file mode 100644 index 0000000000000000000000000000000000000000..b5d2dbfcd9c7ac5e7aa8815fc216af105026db42 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#OUmn2`}t5Rfoq$BYXnHr%*z;=zjtFMvvr!H*w5JRAa6 zpZd`W6y+@Nh%9Dc;5!V$jK}j=qyPmMc)B=-Xq-sdz#~%US*Y;xWDD1?IWm)W z^VK%+*EY!C6tG-g>HKtwo~dl}1%qowO7Hbk8c#%W%-Gw1^S7Kf>p_u_I4)Br$F9ou zS(jEnXgKA=C*b?7Vd9-7D>-(*h?v5qe0`RE_o8&YWjxouI&}3LePND`HhL13d|xK( zZ2jx|3-6b1+ZelLv!}I+yCdge^!`oX$E=A)78&q Iol`;+0J+tGWdHyG literal 0 HcmV?d00001 diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png new file mode 100644 index 0000000000000000000000000000000000000000..eb8ed2ceaedcfffb7ce2461f250fba76e6eb2a3a GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA}8naIGv;(&ri!G{k96%__QJRD|dC~VlV;l_mTY|3g7r~bH!*XZ z+7!O9&?0@>_5bWmGdDZV>D%;Yw}ZiA=~I>LED3zoKmY$%IQRekQwP6W_sbIsYP>m V_G*E5KeR!9@pScbS?83{1OP<@YEl3I literal 0 HcmV?d00001 diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png new file mode 100644 index 0000000000000000000000000000000000000000..62211b43105043adc18f882e6c939a4ca2702e35 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#L&}6l~bAAs}JKfekB89N2N=!i5(P9srdfgC9RWcsK+s z6i|2u6y+@Nh%9Dc;5!V$jK}j=qyPnPdAc};Xq?xb;F!m($m4oZ)lH$HnG;HznPs S`C9`hKs;UjT-G@yGywp*0G*}) literal 0 HcmV?d00001 diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png new file mode 100644 index 0000000000000000000000000000000000000000..c03fd75f5f3501222af0b9a9401df09fc8025493 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#IL~$l%A11v@5i{Mf*jUPXLcsK;` zoOrttsFbt7BeIx*f$uN~Gak=hkpdJf^>lFz(Kw&%z}i%B;J^Wm@PF&xRo?wvzFV4A zLSl9Lx>;L`uAK@s4rj0oJu&C{>az9swpLw#7ixWAj%|741CtrSrl0RvD^xIFE#^N` z$$gdip~F{&!hk6gm$RP?5_!JBLgXm-=7c$X3hs-Txf<@daSE^`Bmg~sX6ltA+_M5e O9`JPab6Mw<&;$VHI%T*3 literal 0 HcmV?d00001 diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png new file mode 100644 index 0000000000000000000000000000000000000000..e60d8d579d3bbfd680838aaca0a6e088d1319aa0 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~R7#M8WvEjyr8wm{-KPm!lBp56(5P0!p!HWwGKNx--_))Ro zLO{a~haW$FcsK;`lxA!M>g6o(h%9Dc;5!V$jK}j=qyPmsd%8G=Xq*qdu#vCHfrstE zzDEAV*3GgW?>O|27Vx!PW#740Vp`t3#6p9MN6ZaW3}Tp`tx@dwo`3(+Ki!-|`mzmdKI;Vst05If=LjV8( literal 0 HcmV?d00001 diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png new file mode 100644 index 0000000000000000000000000000000000000000..5e89b4116b0fd30a30c812c7142ececfa836f7ac GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyGz|@bJc8i=|NmZ& zK_TWdO@K!lvI6-A0X`wF6DA}8nGo>f!jB&tZZrf){Ag%+;ovai!iU#DXmF37HUU>&eWS%ky+RpY5T2a&(|z3B-L-v6lorYA7x|2=-Qhxe=% zDwvizhEF*`GDc{k!)+{|U?T1OI*rF_vc92iz^c{wY9# zxz`pDX@EauJrARl_V`njxgN@xNAzq5V< literal 0 HcmV?d00001 diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png new file mode 100644 index 0000000000000000000000000000000000000000..b7af18de73f9e1b9443ca572e22c0d300d605f02 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyfJ{t~H0Rs@>f(D| zj#-A9TlQ|bclF-?|Np%lg9LkbX8~2u_H=O!k(fGn!d|XJ1|qHJ?=3ukx9QwfrFE_! z(t8iuwM$G|S9an&cT2@&@Aj_A@+lStlkU7{`qbv6`tr?s50)dE4kwCpb}bA3TiYa& ze5K`;ZR_IBzJT2?0xk24&i3gsXwHh+9K1+E)GGT|H;b znzQ%rZP~l!-qm~m|Nr-L4C;^;jRUH#^>lFzk(j!5!fxIM10L4BjM=m2XK)HFQr*Dd zC6>UV5y2QZ>C_$;MZv0d8|TN|NLLb66!2Q~im!J^i0qR!Gj&e5-=1i^OWxsHkDY<` zfu4d_N!(|ATRnHOi}|$7Kj74v`F_K!$L9rfd(Zup`4#k`=-!uU&D+d*Z(Vf0w|*Bx Xi|>`KB6qJG06E*!)z4*}Q$iB}%pq5i literal 0 HcmV?d00001 diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png new file mode 100644 index 0000000000000000000000000000000000000000..94a0bcdd9b5446ed1331596fb22af6c9fc1b299e GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DB0wxNw8v#*YdMh6fc4KYnO1WH2zSU?}*Z(ZRrQ!hqq&4xrKv z3>g=G{P^MF5b)$`(q*6kXMsm#F#`kNVGw3Kp1&dmC^*N{#W6(Ve6j_X`Kh9TawEe`A?dG(q>NeetshDFGE}>H36(GG4>?3{A7Vcd<*% zaE`G()wm$`yHH2+E5@K}>#AQc#6(JZNH%Z$Xg{k zx59CqEujV`At6d8k|zvL76_IU3X0}%vlZTAX>|jg8N;bUmB!|zS(zGo)jBSdyH1_%KIJk?k&l;$m$${@ zii)#=z>~ZU;%8!{m|bIJln>0yHruwv#Eeae+a{5j!DvP3MagZEU`Knp`njxgN@xNA DdS_H5 literal 0 HcmV?d00001 diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png new file mode 100644 index 0000000000000000000000000000000000000000..514f8b554fb0b8efd87220d3c385d763ba60d7bb GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wF6DA~d7#OUuusGr1@W8|4M?k=ijEo-*4GU(>xNzXWiw6>(|&K z3j{xY{P1uHuwuTh2;^`UctjR6Fz_7)VaDV6D^h@hk3C%+Lp08ZPB7#;X9yC6?>^?XDC?9h~#~LCSTmC0`ESQnjB@)A0XLEl1cN zGl_+~Vav2{ym;_G*edi+D8msIZknSE?dpfJZEJ}xZ4boSu@P|<1)IO+FVtQ iwT|dUD_QSO-^cLWqkK#HNb6Mw<&;$UMO`59! literal 0 HcmV?d00001 diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png new file mode 100644 index 0000000000000000000000000000000000000000..480751a02b2e1ab03fb4e292c35936c25e19fb07 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*C|tyGz|@bJRk_#%h3Hz zb55~lbCSfGZpUv)&Hv|Y`Tvb!%ib;buHO6q|G$@G5ZlG;20*1Xo-U3d5>t}}QbYt& z7?=!nwYFXmJR&$TO5(%;4a-1=BaD}WHka#(urLYmKATd$WNNdeL#E*bA0-b-kH@hJ z4ALqyG_-&4aj@ujF|HMuUdzrV&MkStLdd{R*~*>gn5WD02PV8ngC-O^$ZRNX;G4?2 j^Q{u+KSxf1CkvPuuD>o}F!lvI6-A0X`wF6DA~R7#IL~$l$?;9}x{Z3T9lGap1>+7e6-a*l^>*jUPXLcsK+Y za$NZhRLWW45n0T@z;_sg8IR|$NC67Y^K@|x(KsI(u#xw$0ncW8kFe(fVxkwAbC%er ztZMX|nWEBPaq^De&V?mR;)V|$S$qR0X>Qp2)_3ilN7L55_lVFGxm>---~{)P*ynvr zE)1aoQVk{1*997GT6oCRo|$KsY}y|!Fi!R+%kg*J1xSV%y-(|k4*oBenB6r)K_#blY4}+gP z{oH>NS%G|m0G|-of)fjV{P>ZOkZ|F`i3c1UKXw!-%;1>tVS+)xi3JBf0Hq$hcmO0B ze#~GvvBRTaLHZJ@`#`;%1s;*b3=DjSL74G){)!Z!pqHnMV~EE2mdKI;Vst0MqwiQUCw| literal 0 HcmV?d00001 diff --git a/graphics/text_window/text_pal1.pal b/graphics/text_window/text_pal1.pal new file mode 100644 index 0000000000..df5d3c3377 --- /dev/null +++ b/graphics/text_window/text_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 255 255 +205 205 222 +205 205 222 +230 246 255 +205 205 222 +106 115 123 diff --git a/graphics/text_window/text_pal2.pal b/graphics/text_window/text_pal2.pal new file mode 100644 index 0000000000..25f63978aa --- /dev/null +++ b/graphics/text_window/text_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 255 255 +74 205 238 +49 164 238 +0 90 131 +24 98 197 +16 115 230 diff --git a/graphics/text_window/text_pal3.pal b/graphics/text_window/text_pal3.pal new file mode 100644 index 0000000000..9cbcdad4ca --- /dev/null +++ b/graphics/text_window/text_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 +205 213 213 +156 205 222 +98 115 123 +65 172 230 +131 164 180 diff --git a/graphics/text_window/text_pal4.pal b/graphics/text_window/text_pal4.pal new file mode 100644 index 0000000000..a004a081a9 --- /dev/null +++ b/graphics/text_window/text_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 +57 98 115 +131 131 131 +164 164 164 +197 197 205 +230 230 238 +65 90 106 diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 218ef68d75..efe38fbae8 100755 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -21,9 +21,9 @@ extern const u8 gBirchHelpGfx[]; extern const u8 gBirchBagTilemap[]; extern const u8 gBirchGrassTilemap[]; extern const u16 gBirchBagGrassPal[]; -extern const u16 gUnknown_0850FEFC[]; +extern const u16 gTextWindowFrame1_Pal[]; extern const u16 gUnknown_0860F074[]; -extern const u32 gUnknown_0850E87C[]; +extern const u32 gTextWindowFrame1_Gfx[]; extern struct SaveSection gSaveDataBuffer; extern u8 gText_SaveFailedCheckingBackup[]; @@ -226,7 +226,7 @@ static void CB2_SaveFailedScreen(void) InitBgsFromTemplates(0, gUnknown_085EFD88, 3); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800); - LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214); + LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214); InitWindows(gUnknown_085EFD94); // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug? gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C); @@ -239,7 +239,7 @@ static void CB2_SaveFailedScreen(void) ResetPaletteFade(); LoadPalette(gBirchBagGrassPal, 0, 0x40); LoadPalette(sSaveFailedClockPal, 0x100, 0x20); - LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20); + LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); diff --git a/src/text_window.c b/src/text_window.c index 336536c046..c5334b11e6 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset); extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); extern const struct TilesPal gUnknown_0851021C[]; -extern const u32 gUnknown_08DDD748[]; +extern const u32 gMessageBox_Gfx[]; extern const u16 gUnknown_0851017C[]; extern const u16 gUnknown_08DDD728[]; @@ -22,7 +22,7 @@ const struct TilesPal* sub_8098758(u8 id) void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) { - LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset); + LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset); LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); }