From cf84b4fb4b5a100976bc2f9793dd620a0e9ec79e Mon Sep 17 00:00:00 2001 From: Arne van Iterson Date: Sun, 11 Oct 2020 21:10:50 +0200 Subject: [PATCH] Fixed color and start position not being random --- .gitignore | 1 + bin/DVDASM.8xp | Bin 4879 -> 4961 bytes bin/DVDASM.bin | Bin 4803 -> 4885 bytes bin/DVDASM.map | 32 ++-- obj/gfx/colour.src | 16 +- obj/gfx/dvd.src | 106 ++++++------ obj/main.src | 388 +++++++++++++++++++++++--------------------- src/gfx/colour.c | 6 +- src/gfx/convpng.log | 2 +- src/gfx/dvd.c | 56 +++---- src/gfx/dvd.png | Bin 958 -> 418 bytes src/gfx/logo_gfx.c | 14 -- src/gfx/ubuntu.c | 40 ----- src/gfx/ubuntu.png | Bin 1274 -> 0 bytes src/main.c | 15 +- 15 files changed, 322 insertions(+), 354 deletions(-) create mode 100644 .gitignore delete mode 100644 src/gfx/ubuntu.c delete mode 100644 src/gfx/ubuntu.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dcc0a31 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +backup/ \ No newline at end of file diff --git a/bin/DVDASM.8xp b/bin/DVDASM.8xp index 22acf4ecd8cdba5e2f4d4b19dc5c2bb652b24c93..fe8e91800feec39e3a7914496d959b26c5332c97 100644 GIT binary patch delta 993 zcmZ8fOGs2v7(Qnn_u;(m%vI-_&vD36vTQ)HB+^3Yg_MMm76opiMU6oaWHRmAW%_R- zqfHx~8A@>BA_%9Ng^Ls2pf+)fkfe}HGdLm*P4=I8m~=Mh`@VDj|NH*KnQZym@}O&X ztLh?tRp>w0f8^`{!R1%0)Su&owF(x^#*SB70=C4|NT-`5bhac~SX#6MT#2d2H)sUh zbZ}QvU-^()8*fg>^}u>uza=<>W6JO4d>{>@^qN1pl6wAnW=?08m~M!2$`FMVZBD=% z4MyX0`oyZZXpTnO+UU&}y8Ml8%<9QxaygLM+G4JlZl3BV>nT~> zoNk2kru9sqkCH|6DAOz?*B;l6P@Wy2V{NgYY0F z?YdA8BVr>Za9bR9m1T;H02M-zP-IY~8TceQu+{@t1n-3-yozb9>Js??VJkC zTN^NU7lu<|NfE(quYoaV0J(zt06cNkBK9J#$6bVZQH0OV${m`-Cn!pu(zOaKYk<45 z9kQ-qsZ|f|D%#0-XCGo2C$(EJZrFX0cUySxK2NQLP}r*s6!r<_gjSdc2j98lD^Pgr z?S?9^X2Sz);jM$G725wojm96QSj^w9go@?(2SM~jp;xlQ1*K-%aSYacO_n=v{sIS& BWO)Dp delta 1058 zcmaJ;O=}ZT6n%FxnaL!XNoUf=w5DyQ(%M?96ly6&v`PhCR8s{(1#v4VqANwP_7AAZ z6&F&(rENs&2NV&+C;0?=v1wD*0<}74=Pet=7-xQd%0XZJ!U*EJN%6*@ikSlUzUptm*FfL zFdOmh1-u3qbNue2V={KrJHFQWfqz|eTve;Os#1kdW%Oa&oV?^fj4^%z*w7HGCu!G1~AV1$zqE+=_RQXC>D7vE;bh8+-y-E4@))8Pr_05urKRVG0r= z=o8aj(bL`WI@>HKD1i{{j{06?)LvtZ)Ek8|Df=yDO1-}Nwi|)AUm$TmJ4QQ_xSt&s z;+|BeYOT6T7{lFO8>b=7c2ZfHW(G_u?W8mTO4013K&O5$-SLvX6^|y9n2L7c!|0WSA^v%Ada+x%3Y~aQxdbUZ zpl3=Zp<{SUN%U_GF*yLa8A9u5VK0lX728ULnfNQg*@8uNFKGBlJ*D@wngFy>G>aoj z3O_0uK8eQgLJT4HO#2Sdf%9^vBv0aW;=a+I3|Wj>nQmNFjqn~Pt+-gdEmAb|VB;-gUooG6Jn7~LH`1oIjES)d;JncV za?$LT((3b$)Om=IGn{Xm32vwD$R0)vCO&`N!hP@rVKrYR;e>R>=YV9F$b5OvY;~%Ub5C4iac-+9u)Q<#e&FULQ{&tZJn1iZN2&6G4p-%^UciCp-1h? zuL;7EPMhjrr^B|GBR`|`$|SF|f@otU(H4{PGv{y6v6&CU5lvtDT>LrFR?6wIwVZy- z>5Gpmf0nIS2~>K$Nn0ttS$aCJGh0?SM0e2;okiM~hglk*&duvntKy=0Wvruv-h8LK zzq9o@UDLGXSb1xUNm<<-JW1AytU0S|%$(ENnXJyRik1msndJ%@a(uk?P@` zZX_($PsuK0`B}Aa$@E}S$2#yA4ot$ukUyLH^7B9MR zgW7{{Vi^2b`9SbPmy@fw&=;^ogs;S>1z-9X}c;R`Hk!2jL z31L%4PQfRK3t;tSQOR_TI`5EzzX zP_Tz!Q%YlB6%?OQhWq& zu-9?|?gaYaqoTIf;`N03MgGZ!*+As~(wgx&;dOKfYaHCk#>4^7|Tb#EZAK@z7eaNH2|=Ly<4;&C4PldMb+%O^FL@olRo=mp^ajy*D%eKRx(9r+Z;OjFci_t6hiTEbp5rLoO!Ftpw!zp#cc#+0 z&3Bh=M~RdjMJ~gqBCbRKytHCNm@z&JY-k9wn|5S}SC{NkskCiX_xJhUvh5~n*5sxQ z0%Ptfcb9BFK_bSO)8_F&|D&OIMtz`knfs(~M87F=6u%s>%iLHYU*1kbSGR5pawx-(A^1YnloNw|I#V}Xp)`0?}~Y= z!Wg-Gg(5loEoXvmU#)+x?(G-I+&9N)Ml$!!;lSJ#YLu;(zY!5k+HbPhh8K7kf~P|ZYMh>`aeDDg*u>q?Rp`Wv@-1k?S^0RbyID;GNR1F$C(^8$cvrR(Y7+%t zQ9miXFK6(Y(hCuMq+Hf|S_A+MN90Zv!>=H`{wDkrgaZtZwoRcIeHKr~nncDD9T{8` zk3bl0bq54oiyxvrdvHH?tbR{v_mpTbk1i4;3l?sv=TMg<$dWEioWr`(nm4eO0bi(H zAQ3$yv@7c$<2OL0iSdMfseV7!F95^5o(k0$L03gw@RX58*)ZwVvqtKF eYR|}EGLghD#sra!#5^uVXK+hw$7&)g0Q?2HNFZzg diff --git a/bin/DVDASM.map b/bin/DVDASM.map index fe4a739..058d143 100644 --- a/bin/DVDASM.map +++ b/bin/DVDASM.map @@ -6,10 +6,10 @@ libs D1A8DA D1A917 3Dh startup D1A917 D1A956 3Fh cleanup D1A956 D1A96A 14h exit D1A96A D1A970 6h -code D1A970 D1AB9C 22Ch -data D1AB9C D1BB40 FA4h -strsect D1BB40 D1BB40 0h -text D1BB40 D1BB42 2h +code D1A970 D1ABF0 280h +data D1ABF0 D1BB94 FA4h +strsect D1BB94 D1BB94 0h +text D1BB94 D1BB94 0h bss D031F6 D031F6 D13FD6 0h header D1A87F D1A882 3h @@ -17,14 +17,16 @@ Label Value ------------------------- ------ _os_DisableHomeTextBuffer = D1A970 _os_EnableHomeTextBuffer = D1A982 -_random = D1A994 -__state = D1AB9C -__frameset0 = D1A9EB -__frameset = D1A9F6 -__irems = 00016C +_srandom = D1A994 +__setstate = D1A99B +_random = D1A9AB +__state = D1ABF0 +__frameset0 = D1AA02 +__frameset = D1AA0D +__iremu = 000170 __icmpzero = 000138 +_srand = D1AA1B __setflag = 000218 -_rand = D1AA04 __findlibload = D1A882 __ccleanup = D1A956 _errno = D008DC @@ -33,11 +35,11 @@ _exit = D1A96C __exit = D1A945 __exitsp = D1A945 __errsp = D1A945 -_dvd_data = D1ABCE -_logo_gfx_pal = D1BB20 -_main = D1AA5E -_random_palette = D1AA38 -_draw_sprite = D1AA11 +_dvd_data = D1AC22 +_logo_gfx_pal = D1BB74 +_main = D1AA6F +_random_palette = D1AA4A +_draw_sprite = D1AA23 _gfx_Begin = D1A8ED _gfx_End = D1A8F1 _gfx_SetPalette = D1A8F5 diff --git a/obj/gfx/colour.src b/obj/gfx/colour.src index 9e8119f..406bfc3 100644 --- a/obj/gfx/colour.src +++ b/obj/gfx/colour.src @@ -7,14 +7,14 @@ _colour_data: DB 3 DB 3 - DB 34 - DB 40 - DB 38 - DB 37 - DB 41 - DB 35 - DB 39 - DB 36 + DB 4 + DB 5 + DB 6 + DB 1 + DB 3 + DB 8 + DB 2 + DB 7 DB 0 XDEF _colour_data ; 1 // convpng v7.2 diff --git a/obj/gfx/dvd.src b/obj/gfx/dvd.src index 5997e54..5f0b084 100644 --- a/obj/gfx/dvd.src +++ b/obj/gfx/dvd.src @@ -137,7 +137,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 5 + DB 0 DB 0 DB 0 DB 0 @@ -216,7 +216,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 26 DB 0 DB 0 DB 0 @@ -239,7 +238,8 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 17 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -295,7 +295,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 6 + DB 0 DB 0 DB 0 DB 0 @@ -554,7 +554,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 14 DB 0 DB 0 DB 0 @@ -564,7 +563,8 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 31 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -685,7 +685,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 25 + DB 0 DB 1 DB 1 DB 1 @@ -797,7 +797,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 15 + DB 0 DB 0 DB 0 DB 0 @@ -849,7 +849,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 27 DB 0 DB 0 DB 0 @@ -857,10 +856,11 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 28 + DB 0 + DB 0 DB 1 DB 1 - DB 4 + DB 0 DB 0 DB 0 DB 0 @@ -877,7 +877,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 9 DB 0 DB 0 DB 0 @@ -885,7 +884,8 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 24 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -919,7 +919,7 @@ _dvd_data: DB 0 DB 0 DB 1 - DB 11 + DB 0 DB 0 DB 0 DB 0 @@ -936,7 +936,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 23 + DB 0 DB 1 DB 1 DB 1 @@ -997,7 +997,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 9 + DB 0 DB 1 DB 1 DB 0 @@ -1087,7 +1087,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 30 + DB 0 DB 0 DB 0 DB 0 @@ -1099,7 +1099,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 13 + DB 0 DB 0 DB 0 DB 0 @@ -1303,7 +1303,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 8 + DB 0 DB 0 DB 0 DB 0 @@ -1803,7 +1803,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 21 + DB 0 DB 0 DB 0 DB 0 @@ -2038,8 +2038,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 20 - DB 12 DB 0 DB 0 DB 0 @@ -2049,9 +2047,11 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 18 - DB 22 - DB 29 + DB 0 + DB 0 + DB 0 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -2098,7 +2098,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 8 + DB 0 DB 0 DB 0 DB 0 @@ -2328,7 +2328,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 2 + DB 0 DB 0 DB 0 DB 0 @@ -2371,7 +2371,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 0 + DB 1 DB 0 DB 0 DB 0 @@ -2451,7 +2451,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 0 + DB 1 DB 0 DB 0 DB 0 @@ -2600,13 +2600,11 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 10 - DB 1 + DB 0 + DB 0 DB 1 DB 1 DB 1 - DB 16 - DB 3 DB 0 DB 0 DB 0 @@ -2639,7 +2637,9 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 33 + DB 0 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -2713,7 +2713,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 32 + DB 0 DB 1 DB 1 DB 1 @@ -2787,7 +2787,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 7 + DB 0 DB 1 DB 1 DB 1 @@ -2801,7 +2801,7 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 6 + DB 0 DB 1 DB 0 DB 1 @@ -2829,7 +2829,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 4 DB 0 DB 0 DB 0 @@ -2859,8 +2858,9 @@ _dvd_data: DB 0 DB 0 DB 0 - DB 19 - DB 7 + DB 0 + DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -3222,7 +3222,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 1 DB 0 DB 0 DB 1 @@ -3230,6 +3229,7 @@ _dvd_data: DB 1 DB 1 DB 1 + DB 1 DB 0 DB 0 DB 1 @@ -3302,7 +3302,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 1 DB 0 DB 0 DB 1 @@ -3310,6 +3309,7 @@ _dvd_data: DB 1 DB 1 DB 1 + DB 1 DB 0 DB 0 DB 1 @@ -3378,7 +3378,7 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 + DB 1 DB 1 DB 1 DB 1 @@ -3401,7 +3401,6 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 DB 1 DB 1 DB 0 @@ -3412,6 +3411,7 @@ _dvd_data: DB 1 DB 1 DB 1 + DB 1 DB 0 DB 0 DB 0 @@ -3430,7 +3430,6 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 1 DB 0 DB 0 DB 0 @@ -3457,6 +3456,7 @@ _dvd_data: DB 1 DB 1 DB 1 + DB 1 DB 0 DB 0 DB 1 @@ -3481,12 +3481,12 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 DB 1 DB 1 DB 1 DB 0 DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -3513,7 +3513,6 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 DB 1 DB 1 DB 1 @@ -3537,7 +3536,8 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 5 + DB 1 + DB 0 DB 0 DB 1 DB 1 @@ -3561,12 +3561,12 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 DB 1 DB 1 DB 1 DB 0 DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -3593,7 +3593,6 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 DB 1 DB 1 DB 1 @@ -3622,6 +3621,7 @@ _dvd_data: DB 0 DB 0 DB 0 + DB 0 DB 1 DB 1 DB 1 @@ -3641,7 +3641,7 @@ _dvd_data: DB 1 DB 0 DB 0 - DB 0 + DB 1 DB 1 DB 0 DB 0 @@ -3698,7 +3698,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 1 + DB 0 DB 0 DB 0 DB 0 @@ -3826,7 +3826,7 @@ _dvd_data: DB 1 DB 1 DB 1 - DB 1 + DB 0 DB 0 DB 0 DB 0 diff --git a/obj/main.src b/obj/main.src index e154999..7a2c276 100644 --- a/obj/main.src +++ b/obj/main.src @@ -72,14 +72,16 @@ _draw_sprite: ; 32 ; 33 void random_palette() { _random_palette: -; 34 gfx_SetPalette(logo_gfx_pal[(rand() % (7 - 0 + 1))], sizeof_logo_gfx_pal, 0); +; 34 gfx_SetPalette(logo_gfx_pal[randInt(0, 7)], sizeof_logo_gfx_pal, 0); LD BC,0 PUSH BC LD BC,86 PUSH BC - CALL _rand - LD BC,8 - CALL __irems + CALL _random + LD A,L + AND A,7 + UEXT HL + LD L,A ADD HL,HL ADD HL,HL LD BC,_logo_gfx_pal @@ -95,7 +97,7 @@ _random_palette: ;**************************** _random_palette *************************** ;Name Addr/Register Size Type -;_rand IMPORT ----- function +;_random IMPORT ----- function ;_logo_gfx_pal IMPORT 32 variable ;_gfx_SetPalette IMPORT ----- function @@ -108,220 +110,239 @@ _random_palette: ; 37 void main(void) ; 38 { _main: - LD HL,-11 + LD HL,-15 CALL __frameset ; 39 /* Coordinates used for the sprite */ ; 40 int x, y; -; 41 bool gravity[2] = { -; 42 true, -; 43 true -; 44 }; - LEA DE,IX+-8 - LD HL,_0temp2 - LD BC,2 - LDIR -; 45 float angle; -; 46 -; 47 /* Initialize the 8bpp graphics */ -; 48 gfx_Begin(); +; 41 int gravity[2]; +; 42 float angle; +; 43 +; 44 srand(rtc_Time()); + LD BC,(15925316) + PUSH BC + CALL _srand + POP BC +; 45 +; 46 /* Initialize the 8bpp graphics */ +; 47 gfx_Begin(); CALL _gfx_Begin -; 49 -; 50 /* Set up the palette for our sprites */ -; 51 random_palette(); +; 48 +; 49 /* Set up the palette for our sprites */ +; 50 random_palette(); CALL _random_palette -; 52 -; 53 /* Start at 0, 0 */ -; 54 x = 0; - LD BC,0 - LD (IX+-6),BC -; 55 y = (rand() % (LCD_HEIGHT - 0 + 1)); - CALL _rand +; 51 +; 52 /* Start at 0, 0 */ +; 53 x = randInt(0, LCD_WIDTH - dvd_width); + CALL _random LD BC,241 - CALL __irems + CALL __iremu LD (IX+-3),HL -; 56 -; 57 gfx_SetDrawBuffer(); +; 54 y = randInt(0, LCD_HEIGHT - dvd_height); + CALL _random + LD BC,192 + CALL __iremu + LD (IX+-6),HL +; 55 gravity[0] = randInt(0, 1); + CALL _random + LD A,L + AND A,1 + UEXT HL + LD L,A + LD (IX+-12),HL +; 56 gravity[1] = randInt(0, 1); + CALL _random + LD A,L + AND A,1 + UEXT HL + LEA IY,IX+-12 + LD L,A +; 57 +; 58 gfx_SetDrawBuffer(); LD BC,1 PUSH BC + LD (IY+3),HL CALL _gfx_SetDraw POP BC -; 58 -; 59 gfx_FillScreen(1); +; 59 +; 60 gfx_FillScreen(1); LD BC,1 PUSH BC CALL _gfx_FillScreen POP BC -; 60 -; 61 draw_sprite(x, y); - LD BC,(IX+-3) +; 61 +; 62 draw_sprite(x, y); + LD BC,(IX+-6) PUSH BC - LD BC,0 + LD BC,(IX+-3) PUSH BC CALL _draw_sprite POP BC POP BC -; 62 -; 63 do -L_27: -; 64 { -; 65 /* Scan the keypad to update kb_Data */ -; 66 kb_Scan(); +; 63 +; 64 do +L_26: +; 65 { +; 66 /* Scan the keypad to update kb_Data */ +; 67 kb_Scan(); CALL _kb_Scan -; 67 -; 68 if ((x + dvd_width) <= LCD_WIDTH && x >= 0) - LD IY,(IX+-6) +; 68 +; 69 if ((x + dvd_width) <= LCD_WIDTH && x >= 0) + LD IY,(IX+-3) LEA BC,IY+80 LD HL,320 OR A,A SBC HL,BC CALL __setflag - JP M,L_13 - LD HL,(IX+-6) + JP M,L_12 + LD HL,(IX+-3) CALL __icmpzero CALL __setflag - JP M,L_13 -; 69 { -; 70 if (gravity[0]) - LD A,(IX+-8) - OR A,A - JR Z,L_7 -; 71 { -; 72 x++; - LD BC,(IX+-6) + JP M,L_12 +; 70 { +; 71 if (gravity[0]) + LD HL,(IX+-12) + CALL __icmpzero + JR Z,L_6 +; 72 { +; 73 x++; + LD BC,(IX+-3) INC BC - LD (IX+-6),BC -; 73 } -; 74 else - JR L_25 -L_7: -; 75 { -; 76 x--; - LD BC,(IX+-6) + LD (IX+-3),BC +; 74 } +; 75 else + JR L_24 +L_6: +; 76 { +; 77 x--; + LD BC,(IX+-3) DEC BC - LD (IX+-6),BC -; 77 } -; 78 } -; 79 else - JR L_25 -L_13: -; 80 { -; 81 random_palette(); + LD (IX+-3),BC +; 78 } +; 79 } +; 80 else + JR L_24 +L_12: +; 81 { +; 82 random_palette(); CALL _random_palette -; 82 if (gravity[0]) - LD A,(IX+-8) - OR A,A - JR Z,L_11 -; 83 { -; 84 gravity[0] = false; - LD (IX+-8),0 -; 85 x--; - LD BC,(IX+-6) +; 83 if (gravity[0]) + LD HL,(IX+-12) + CALL __icmpzero + JR Z,L_10 +; 84 { +; 85 gravity[0] = false; + LD BC,0 + LD (IX+-12),BC +; 86 x--; + LD BC,(IX+-3) DEC BC - LD (IX+-6),BC -; 86 } -; 87 else - JR L_25 -L_11: -; 88 { -; 89 gravity[0] = true; - LD (IX+-8),1 -; 90 x++; - LD BC,(IX+-6) + LD (IX+-3),BC +; 87 } +; 88 else + JR L_24 +L_10: +; 89 { +; 90 gravity[0] = true; + LD BC,1 + LD (IX+-12),BC +; 91 x++; + LD BC,(IX+-3) INC BC - LD (IX+-6),BC -; 91 } -; 92 } -L_25: -; 93 -; 94 if ((y + dvd_height) <= LCD_HEIGHT && y >= 0) - LD IY,(IX+-3) + LD (IX+-3),BC +; 92 } +; 93 } +L_24: +; 94 +; 95 if ((y + dvd_height) <= LCD_HEIGHT && y >= 0) + LD IY,(IX+-6) LEA BC,IY+49 LD HL,240 OR A,A SBC HL,BC - JP M,L_24 - LD HL,(IX+-3) + CALL __setflag + JP M,L_23 + LD HL,(IX+-6) CALL __icmpzero CALL __setflag - JP M,L_24 -; 95 { -; 96 if (gravity[1]) - LEA HL,IX+-8 - INC HL - LD A,(HL) - OR A,A - JR Z,L_18 -; 97 { -; 98 y++; - LD BC,(IX+-3) - INC BC - LD (IX+-3),BC -; 99 } -; 100 else - JR L_26 -L_18: -; 101 { -; 102 y--; - LD BC,(IX+-3) - DEC BC - LD (IX+-3),BC -; 103 } -; 104 } -; 105 else - JR L_26 -L_24: -; 106 { -; 107 random_palette(); - CALL _random_palette -; 108 if (gravity[1]) - LEA BC,IX+-8 - INC BC - LD (IX+-11),BC - LD HL,BC - LD A,(HL) - OR A,A - JR Z,L_22 -; 109 { -; 110 gravity[1] = false; - LD HL,(IX+-11) - LD (HL),0 -; 111 y--; - LD BC,(IX+-3) - DEC BC - LD (IX+-3),BC -; 112 } -; 113 else - JR L_26 -L_22: -; 114 { -; 115 gravity[1] = true; - LD HL,(IX+-11) - LD (HL),1 -; 116 y++; - LD BC,(IX+-3) - INC BC - LD (IX+-3),BC -; 117 } -; 118 } -L_26: -; 119 -; 120 draw_sprite(x, y); - LD BC,(IX+-3) - PUSH BC + JP M,L_23 +; 96 { +; 97 if (gravity[1]) + LEA HL,IX+-9 + LD HL,(HL) + CALL __icmpzero + JR Z,L_17 +; 98 { +; 99 y++; LD BC,(IX+-6) + INC BC + LD (IX+-6),BC +; 100 } +; 101 else + JR L_25 +L_17: +; 102 { +; 103 y--; + LD BC,(IX+-6) + DEC BC + LD (IX+-6),BC +; 104 } +; 105 } +; 106 else + JR L_25 +L_23: +; 107 { +; 108 random_palette(); + CALL _random_palette +; 109 if (gravity[1]) + LEA IY,IX+-9 + LD (IX+-15),IY + LD HL,(IX+-15) + LD HL,(HL) + CALL __icmpzero + JR Z,L_21 +; 110 { +; 111 gravity[1] = false; + LD HL,(IX+-15) + LD BC,0 + LD (HL),BC +; 112 y--; + LD BC,(IX+-6) + DEC BC + LD (IX+-6),BC +; 113 } +; 114 else + JR L_25 +L_21: +; 115 { +; 116 gravity[1] = true; + LD HL,(IX+-15) + LD BC,1 + LD (HL),BC +; 117 y++; + LD BC,(IX+-6) + INC BC + LD (IX+-6),BC +; 118 } +; 119 } +L_25: +; 120 +; 121 draw_sprite(x, y); + LD BC,(IX+-6) + PUSH BC + LD BC,(IX+-3) PUSH BC CALL _draw_sprite POP BC POP BC -; 121 } while (kb_Data[6] != kb_Clear); +; 122 } while (kb_Data[6] != kb_Clear); LD A,(16056348) CP A,64 - JR NZ,L_27 -; 122 -; 123 /* Close the graphics */ -; 124 gfx_End(); + JR NZ,L_26 +; 123 +; 124 /* Close the graphics */ +; 125 gfx_End(); CALL _gfx_End -; 125 } +; 126 } LD SP,IX POP IX RET @@ -333,23 +354,19 @@ L_26: ;_kb_Scan IMPORT ----- function ;_gfx_FillScreen IMPORT ----- function ;_gfx_SetDraw IMPORT ----- function -;_rand IMPORT ----- function +;_random IMPORT ----- function ;_gfx_Begin IMPORT ----- function -;_0temp2 STATIC 2 variable -;G_0 IX-11 3 variable -;gravity IX-8 2 variable -;x IX-6 3 variable -;y IX-3 3 variable +;_srand IMPORT ----- function +;G_0 IX-15 3 variable +;gravity IX-12 6 variable +;y IX-6 3 variable +;x IX-3 3 variable -; Stack Frame Size: 17 (bytes) +; Stack Frame Size: 21 (bytes) ; Spill Code: 0 (instruction) - SEGMENT TEXT -_0temp2: - DB 1 - DB 1 XREF _logo_gfx_pal:ROM XREF _dvd_data:ROM XREF _kb_Scan:ROM @@ -360,8 +377,9 @@ _0temp2: XREF _gfx_SetPalette:ROM XREF _gfx_End:ROM XREF _gfx_Begin:ROM - XREF _rand:ROM - XREF __irems:ROM + XREF _srand:ROM + XREF _random:ROM + XREF __iremu:ROM XREF __frameset0:ROM XREF __frameset:ROM XREF __setflag:ROM diff --git a/src/gfx/colour.c b/src/gfx/colour.c index 2a50669..85453b4 100644 --- a/src/gfx/colour.c +++ b/src/gfx/colour.c @@ -5,7 +5,7 @@ // 8 bpp image uint8_t colour_data[11] = { 3,3, // width,height - 0x22,0x28,0x26, - 0x25,0x29,0x23, - 0x27,0x24,0x00, + 0x04,0x05,0x06, + 0x01,0x03,0x08, + 0x02,0x07,0x00, }; diff --git a/src/gfx/convpng.log b/src/gfx/convpng.log index c23164b..2cd7bc6 100644 --- a/src/gfx/convpng.log +++ b/src/gfx/convpng.log @@ -2,7 +2,7 @@ opened convpng.ini --- logo_gfx (C) --- building palette with [256] available indices ... -built palette with [43] indices. +built palette with [9] indices. palette quality : 100.00% transparent color index : 0 transparent color : 0xFFFF diff --git a/src/gfx/dvd.c b/src/gfx/dvd.c index 0f69688..b6e2a46 100644 --- a/src/gfx/dvd.c +++ b/src/gfx/dvd.c @@ -6,52 +6,52 @@ uint8_t dvd_data[3922] = { 80,49, // width,height 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x1A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x1B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x01,0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x0D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x14,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x16,0x1D,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x01,0x01,0x01,0x01,0x10,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x21,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x06,0x01,0x00,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x07,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x01,0x00,0x00,0x01,0x00,0x01,0x01,0x01, + 0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x01,0x00,0x00,0x01,0x00,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x05,0x00,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, }; diff --git a/src/gfx/dvd.png b/src/gfx/dvd.png index 69bb89663f6233dd7237f8dbc68287adf11a3ac5..b07bd8cfc95de3710c013bd5f243eb7b6e90336f 100644 GIT binary patch delta 375 zcmdnTzKD5(1SbnK0|UeU>Bfl@6&30Y0(?STf&Bmf{{u-PLG;r0sX(Qi1s;*b3=DjS zK$uZf!>a)(_}kOPF~sBe(J9eFhZQ(n6WMqCKWoONq+oaHrO(emeRs#E#_+H?t`ox) ztP6tn)GsR%Q)x(@>BqJ#FlkwBVn3tywzW3yGbi0nIo!G3Q|yiKEXQ4pvsddSa*Or7 zIbbJgy?XcC8IHRrZ}EEAC+5OEX}y$$fa`@tryCabygFXzx%jxuukAIP$E*qfG!M(#A;eMBb8&+TMkx5D~l2aiQ_>Z8}_O|prdy-rK> z{7f5JO*jw@e0cxcl7P()b!R_qO1aUH+OV;QujQ5VOXis?Y~unp{Q7Z3tApIQ%OWY zRA@u(n!Sz_F%W>00HWX-C@83T0tyN$T3YCM93B8lN_Yei6%92Vf}RQq2|>dp%=pHU zF9HP~TH!T7qKoZzdjX~!YBu4?p-X?j zp42QD6z^BB;vtwr1bpA4ZWgi9=zzqbcy<7!cmr<#E?d)4%4wDbM65*|onxNY?2fR9 zQ!H>E(|lB{^qQ2m1GPAsJqJARK7!dJY8HXee>R)V9h8efS`*al5%f{gll*JGCBKN| zJ7S4}_sNd1B}oa`4Pk|ItP`7>m`8tA0Y@YWA%2r+re|JIpBE>$z^$?8qO|?t`JH zB%=J5#3LLea0F131$=xUwE%UqkctYa7a=wO zOT@Z@CHn}D!<#Ie07)0)N#jVKlje^^5o=8L2y4czVDMNxBqqZFyXy&wEV+Lz=-(!> z8f)B8GXnn?t#<=n%UK_jxJyO1oMJr(`W>A2mc^`DYhMtM>u5iw& z7Pypm=p32UxfL*ckZzrnhf@`x1*ty!Zz7|Mm;#TG&v4zP;Q+KB!1aHPRQAyDNW^bz zrlOrF@zFelJ@koWGflhhiWc@U6zbs5pd8HHZi3wf_NS+{>Bj_gR04+IU22U5=Jy3| zSfmna@eou@@4)2$gLrntU6|exlou8j&H~e0IG+3Dfx4%5EE086Bz=UlL2B$Y8;#lh zq>q#e)I!N;Yb;as(;$E8ipBoYDr)0M)Ip*i*O#J==SccqUpb~7$T^OIYl3Qcd}1CE z>MAltuI3{Q`E5yDNN}%6y3*Q;MqNoS_m{UxJiwxpQquSO;cy#yf<|3QFZGu)$_A0_ uG^*diEkQM=@QpqZYVP6s7KX7}{Rbq@@=S#f`kw#*002ovPDBK*LSTY-aIk6s diff --git a/src/gfx/logo_gfx.c b/src/gfx/logo_gfx.c index d735c46..9a85650 100644 --- a/src/gfx/logo_gfx.c +++ b/src/gfx/logo_gfx.c @@ -37,17 +37,3 @@ uint16_t logo_gfx_pal[8][2] = { 0x0000, // 42 :: rgb(0,0,0)} }, }; - -// uint16_t logo_gfx_pal[2] = { -// 0xFFFF, // 33 :: rgb(255,255,255) -// 0x0000, // 42 :: rgb(0,0,0) -// }; - -// 0xECC1, // 34 :: rgb(222,53,11) -// 0x0000, // 35 :: rgb(0,0,0) -// 0x7E64, // 36 :: rgb(255,153,31) -// 0x0159, // 37 :: rgb(0,82,204) -// 0xD2B7, // 38 :: rgb(165,173,186) -// 0x820B, // 39 :: rgb(0,135,90) -// 0xA915, // 40 :: rgb(82,67,170) -// 0x0297, // 41 :: rgb(0,163,191) diff --git a/src/gfx/ubuntu.c b/src/gfx/ubuntu.c deleted file mode 100644 index 4838894..0000000 --- a/src/gfx/ubuntu.c +++ /dev/null @@ -1,40 +0,0 @@ -// convpng v7.2 -#include -#include "logo_gfx.h" - -// 8 bpp image -uint8_t ubuntu_data[1026] = { - 32,32, // width,height - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2B,0x66,0x48,0x3F,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x33,0x22,0x22,0x27,0x40,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x80,0x61,0x6E,0x2E,0xB0,0x34,0xC4,0x22,0x22,0x22,0x22,0x47,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xA2,0x30,0x24,0x24,0x24,0x24,0x24,0xC2,0xC7,0x22,0x22,0x22,0x22,0x67,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xA4,0x00,0xA6,0x35,0x24,0x24,0x24,0x24,0x24,0xBE,0x25,0xBC,0x22,0x22,0xB1,0x79,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xA7,0xA5,0x2F,0x00,0xA9,0x24,0x24,0x24,0x24,0x24,0x35,0xC3,0xC0,0xC6,0xBF,0xB5,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x29,0x23,0x2C,0x00,0xAB,0xA1,0x95,0xAD,0xB3,0x3A,0x24,0xC5,0xBB,0xC8,0xB6,0x31,0x7A,0x25,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x72,0x23,0x23,0x28,0x36,0x00,0x9D,0x7E,0x00,0x00,0xB4,0xC1,0xBD,0x24,0x24,0xAE,0x24,0x24,0x5C,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xB9,0x23,0x23,0x23,0x23,0xA8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0xB2,0xAF,0x24,0x24,0x24,0x75,0x69,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xCD,0x29,0x23,0x23,0x23,0x84,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x24,0x24,0x24,0x24,0x2E,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xDB,0x23,0x23,0x23,0x28,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x74,0x24,0x24,0x24,0x30,0x25,0x00,0x00, - 0x00,0x00,0x00,0xAC,0xCB,0xCC,0xDC,0x00,0x37,0x23,0x23,0xBA,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x24,0x24,0x24,0x24,0x34,0x00,0x00, - 0x00,0x00,0x2D,0xCA,0x24,0x24,0xD5,0x39,0xD1,0xD7,0x23,0xCF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x91,0x99,0x8B,0x9C,0x90,0x81,0x00,0x00, - 0x00,0x00,0xA3,0x24,0x24,0x24,0x24,0xDD,0x00,0xD3,0x23,0xD4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x31,0x24,0x24,0x24,0x24,0xD8,0x00,0xD0,0x23,0xC9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x93,0x86,0x98,0x7D,0x76,0x00,0x00, - 0x00,0x00,0x25,0xAA,0x24,0x24,0x3A,0xDA,0xD9,0xD6,0x23,0xB7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x22,0x22,0x22,0x22,0x6D,0x00,0x00, - 0x00,0x00,0x00,0x2D,0x39,0xB8,0xCE,0x38,0xD2,0x23,0x23,0xA0,0x6A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x22,0x22,0x22,0x6F,0x2B,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x23,0x23,0x23,0x23,0x4E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5F,0x26,0x22,0x22,0x22,0x65,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x9F,0x23,0x23,0x23,0x23,0x56,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9A,0x70,0x22,0x22,0x22,0x49,0x44,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6C,0x23,0x23,0x23,0x23,0x55,0x00,0x5B,0x25,0x00,0x00,0x00,0x32,0x92,0x27,0x22,0x22,0x22,0x22,0x41,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x57,0x23,0x23,0x4D,0x25,0x5A,0x52,0x63,0x6B,0x77,0x8F,0x9E,0x22,0x22,0x26,0x27,0x22,0x5E,0x42,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x2C,0x2A,0x4F,0x00,0x58,0x22,0x22,0x22,0x22,0x22,0x22,0x85,0x83,0x32,0x8C,0x8E,0x60,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x00,0x54,0x59,0x22,0x22,0x22,0x22,0x22,0x87,0x97,0x9B,0x96,0x89,0x71,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x51,0x26,0x22,0x22,0x22,0x22,0x22,0x94,0x25,0x8D,0x23,0x23,0x29,0x4A,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x4C,0x46,0x4B,0x5D,0x62,0x33,0x7B,0x8A,0x23,0x23,0x23,0x23,0x43,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2F,0x28,0x23,0x23,0x23,0x3C,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x37,0x23,0x23,0x2A,0x3D,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0x3B,0x3E,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -}; diff --git a/src/gfx/ubuntu.png b/src/gfx/ubuntu.png deleted file mode 100644 index 4f1c7472d4f819fbc234187482d9c0c403df356e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 zcmZ`(X;4#V6#WQ^AWMc-+^Er+x~1A+s*-4HsRRfTCdL)iVHH~{YFlvaw1EgDq>9Kc zD$tN>svrTyvJP>pfDMcdf~-LV6qAC@p{^*@K_sl(a&aZRlO8AkX?kP1Xz#&QIZy0FJ`%(W0zjGTip5brEEB>6JOIwF1VDHm0MsrC-vE%t z0AM;60CougekZOr?c53giOrAL&9T`F#|?FLy1YE=(2$KFUPVW10O)mfMcUi(@t0_u z+^P^;WkU3R88P#AuD@R!9u7MjOo^+JFaRG_Th!`N4u>#K;uC`i&uK0{c_b)EBuKY zq%*S11HD&Dm<=|F;$ywmTT)_X80NY{DT$cs!nM7GL2t7WHVnmj+RQ&iAQAJ>`a)PM zz*MKuhAT+8BeK(-n3*PKhoO9{4M(lDm+;;yLf2K8~j3I3@h=4N583-&}r{4-^({Lxx*&RTxfT7Cw9tHp-8&8N4+DmMPS%Ez$zB@SAnIcr_a|{#!HhM3IPad8vL$)lm6FR0W3Ivsoe-iAZ?3z?YyTVGiC!ox#fQbIt8 zj*g;ZW4N{%)9Lzre0nJqb4P~_TJY{-T$P58wdzYt$75pP9X|d-j%u~~;^Now@!F7( zk!{;dj~^57wXiA>-uN6JxsMOu!=L36`u>o;npXRHImGV>4F+P0f0%ukejS>1gla)_h=Szjcn+wCz1GDauMO8lg(?7fAwx#*@(x#S{j1?lU{pkgDIlo_F zH??H_R?0S`I01bIbT`h?B+sMy7oSI+1|ihnn>PO zvdDAI3NK%O?_0jvw`pH24_L#ZJd2cYQLhB{b_lxu$z-D#;gT0YOXE4|dM&LP`@IQu>