From 19dfb38262cb15ddae54186d2f0b4d920651294b Mon Sep 17 00:00:00 2001
From: dwsJason <JGAndersen@gmail.com>
Date: Sat, 18 Aug 2018 20:05:59 -0400
Subject: [PATCH] Fixes for the Hall of Fame, Direct Export the Xrick Splash
 into a C1 so that B2S doesn't screw up the palette, now we can see the the
 compiled tiles render

---
 asm/drawtile.s                   |  15 ++++++--
 bin/xrick2png/source/xrick2png.c |  62 +++++++++++++++++++++++++++++++
 data.bat                         |  25 +------------
 data/pics/img_splash.c1          | Bin 0 -> 32768 bytes
 data/pics/splash.c1              | Bin 0 -> 32768 bytes
 include/system.h                 |   4 +-
 src/draw.c                       |   7 +++-
 src/sysvid.c                     |  15 ++++----
 8 files changed, 90 insertions(+), 38 deletions(-)
 create mode 100644 data/pics/img_splash.c1
 create mode 100644 data/pics/splash.c1

diff --git a/asm/drawtile.s b/asm/drawtile.s
index b5a22a4..541f5e3 100644
--- a/asm/drawtile.s
+++ b/asm/drawtile.s
@@ -19,7 +19,7 @@ iOffset equ 5
 iTileNo equ 7
 
 	phb
-
+		
 	lda iOffset,s
 	tay
 	lda iTileNo,s
@@ -28,20 +28,26 @@ iTileNo equ 7
 	
 	anop ; adjust the stack
     anop ; Copy the Return address
-    lda 1,s
-    sta iTileNo-2,s
     lda 3,s
     sta iTileNo,s
+    lda 1,s
+    sta iTileNo-2,s
+
 	pla
 	
 	lda #$0101
 	sta 1,s
 	plb
 	plb
-TILEBANK gequ *	
+TILEBANK2 entry	
+	lda >$880005,x	
+	sta >TILEBANK+1
+	
+TILEBANK entry	
 	jsl >$880000
 	
 	plb
+	
 	rtl
 
 *-------------------------------------------------------------------------------
@@ -53,6 +59,7 @@ iBank equ 4
 	sep #$30
 	lda iBank,s
 	sta >TILEBANK+3
+	sta >TILEBANK2+3
 	rep #$30
 	lda 2,s
 	sta iBank,s
diff --git a/bin/xrick2png/source/xrick2png.c b/bin/xrick2png/source/xrick2png.c
index 12e3ea1..efa6e9d 100644
--- a/bin/xrick2png/source/xrick2png.c
+++ b/bin/xrick2png/source/xrick2png.c
@@ -69,6 +69,67 @@ void savePixelsGS(MYBMP *pBitmap, const char* pFilename)
 	}
 }
 
+//
+//
+//
+void savePixelsGSc1(MYBMP *pBitmap, const char* pFilename)
+{
+	FILE* gsfile = fopen( pFilename, "wb" );
+
+	if (gsfile)
+	{
+		unsigned char* pPixels = pBitmap->map;
+
+		for (int y = 0; y < pBitmap->height; ++y)
+		{
+			for (int x = 0; x < pBitmap->width; x+=2)
+			{
+				unsigned char* pPixel = pPixels + (y*pBitmap->width) + x;
+
+				unsigned char GS_PIXEL = 0;
+				GS_PIXEL = (pPixel[0] << 4) | (pPixel[1] & 0xF);
+				putc(GS_PIXEL, gsfile);
+			}
+		}
+
+		for (int idx = 0; idx < 256; ++idx)
+		{
+			putc(0, gsfile);	// SCBs + Screen holes
+		}
+
+		for (int palnum = 0; palnum < 16; ++palnum)
+		{
+			for (int idx = 0; idx < 16; idx++)
+			{
+				u16 pixel = 0;
+
+				u16 red   = pBitmap->palette[ (idx * 3)+0 ];
+				u16 green = pBitmap->palette[ (idx * 3)+1 ];
+				u16 blue  = pBitmap->palette[ (idx * 3)+2 ];
+
+				red>>=4;
+				green>>=4;
+				blue>>=4;
+
+				pixel |= red << 8;
+				pixel |= green << 4;
+				pixel |= blue;
+
+				putc(pixel & 0xff, gsfile);
+				putc(pixel >> 8, gsfile);
+			}
+		}
+
+		fclose(gsfile);
+	}
+	else
+	{
+		fprintf(stderr,"\nERROR Unable to create output file: %s\n", pFilename);
+		exit(1);
+	}
+}
+
+
 //
 // Save the RawBMP Data as a PNG
 //
@@ -412,6 +473,7 @@ int main(int argc, char **argv)
 
 	pBitmap = loadPic( pic_splash, 320, 200 );
 	savePng(pBitmap, "splash.png");
+	savePixelsGSc1(pBitmap, "splash.c1");
 
 	pBitmap = loadImage( IMG_SPLASH );
 	savePng(pBitmap, "img_splash.png");
diff --git a/data.bat b/data.bat
index 49570b8..1a35fe0 100644
--- a/data.bat
+++ b/data.bat
@@ -6,32 +6,11 @@ rem
 
 echo Y |del data.lib
 
-if exist "bmp" (
-	echo Y |del bmp\*
-	rmdir bmp
-)
-
-rem
-rem bmp directory if it doesn't exist
-rem 
-if not exist "bmp" (
-	mkdir bmp
-)
-
-rem
-rem convert all the pngs to bmp
-rem
-png2bmp -D bmp data\pics\*.png
-rem
-rem for now just convert the splash screen, to GS format
-rem
-b2s bmp\splash.bmp
-b2s bmp\img_splash16.bmp
 rem
 rem Compress the title page
 rem
-lz4 -c2 bmp\splash.SHR#C10000 data\splash.lz4
-lz4 -c2 bmp\img_splash16.SHR#C10000 data\img_splash16.lz4
+lz4 -c2 data\pics\splash.c1 data\splash.lz4
+lz4 -c2 data\pics\img_splash.c1 data\img_splash16.lz4
 rem
 rem Hall of Fame
 rem
diff --git a/data/pics/img_splash.c1 b/data/pics/img_splash.c1
new file mode 100644
index 0000000000000000000000000000000000000000..b97626e6323211421a06c6670cfbcbea33ec9855
GIT binary patch
literal 32768
zcmeHPzi-^g6@E*JV_eSWN`L_u0WJiCC9YC))m@N42Gqv4Sbz&v!hir-x?KqB9IUZ1
z4k-gm3DOCWRisHJyK#BQe~@!S3Ep!j>i_}jtbA{VLvnv;e`sY}3Fbk&9KLz;=9_QG
z;Uo7^L{=;VmI2FvWxz6E8L$jk1}p=X0n318z%pPNunbrRECZH-Tf%_1@yA<&WIT)q
zoujAYYi@<M-r3oUZUvI@AeLV3?zgh>bye;0@2h*CuDrB&5Czk_^E!L}bgPeGakm!*
z>2$xforC6dtB+veL_s(MzNMq?+DGVpx=R6gv*6o{{OQg<hDDmDa=PE8gO)$t>hoDx
ze2Z~!`Lp~j#=v5&Z|?Y8?);;G^6S5v;>EwXblmB5UR5vj7f^JLUK^`&`;aR-h;4kW
ztKh3||Dm*-zw~ZrFUwoq+1{7Bc(1efny3zRySuyp%&Up+b#`98I@)_uC`_S-3Rv#$
z9<;Tpg73l0QG3&FhV6fLi!1qqmyyifzdG0=0v!jv!^4AINwl<k$onJlp9jkxOV`9U
zCB8d5GsR<9BK_&G*V2{so&6w(vcyEZ+j$;AHoJhT#ZmjwNc^WP110&jxxnXjUbaHh
z{yJM1efp~5Md@j2uiHilhgc;JqA15tBwD}_8IFqH>dF!qW)`h2@V(pa&JynwzD5cH
z_|!q;fxgFi_0nPQ>6@c&fd1k}WM-X6?YD;G(~E6o$>`EddocLwo#!p18|ivBMFM~l
zrgyfVguG<|z8`iElxNY1T2d+Vuf{NcwVhE62H(X|w{Ti@GDjHzB93)=q^240^?EJs
zIf({Cr4f7&#$d?t)o^kYPL1<<w>YA3M%HkkNYfPfaF}V&Ze-3HUHkPAe|4tMG&I{B
zAD<l3=&rkU8qwx!!r4*wvUG@*BGsPVXt0YPhw$AQLmvSj;`?_y`-`0%dPu<cr+aXv
z@vv^`pxZK@-Bu1%8`HnLgXhPaG4wIMkUTzQN~d}I`8RR2`R6yFFDsfZ9YmqobqtYt
z?RP`?zAaYGqB#!`ivrH;(5wiRy19!uL!RNTyPRG%e3|?443YW%2)=GO+9Tt`vRL&w
zYBaN^5%oZrEbTEpC0ei4b7>ggcjNJOpZ@NsddLhqnQzaDdff^jo}R%quj+0#e22Yf
zyL;o1S6$6q-s}x7!Z(4hhc(Kd8Np=3pBBP5cs{G1)B-wsrJju9%35!)8x2Gm^YJ$p
zA3Wm1ghlWM<O|>{qZBw?93K|YAOOJZ2H??y=MgS)l?P71=U?S``1}}NuT?v>fTlsT
z`SdC`bLi{a`#jbn%v1dNS2-BQ_hWY?UR4f4Dd4mxuktgyo&(dLF&BQ(WFG#2PZkYL
z0S>T$o`Aq7Ms@8i0#jUuFu^KJRc_|N_jPq(1_T^Pl$pTSMt9vU2c{Xth_W){Vjg@+
zwPD49MA-p>KN#J0w>mI2VXE>n4?Y+8O6GGAIe!#`z`tA<m~LkRQ%rDihD^fu?a=wa
zH!ve-fx#z0;7H|scuipHRL+oz`1Z^DCDjviG(3rg1Fl?XjVS|D;4|}7xF0jrZx4p>
zVHw$cR(%SBMutC9Ym7g}&8(_-MPSNjh}6yQj$1QOb%AFrM+ecfza9O(;y(_e-iucQ
z&tFOhs4S10N~2keyZh$%44fh6s&ThFcu$l&<L58CxHWn9Vz290ItUQpz8HA^QgMLF
z%F0@4HB(XGMnUG5aS(*M=nO=wg(H6cf*U(L^N9HNrx2dR&4K4H6$b*(9Q?v`-hwc<
zk!XlJjmNsZGycBjE~ZL7Wx<!M_Jon;f~y8g)j>RT1EVcw{jN4He%cUKZRrWmU(`bk
z{*t8{4`vE=KESF2R1O$d8%{5ae8g;7meY#1;-i2uT<@70V_Y@(dAu`YYPXgF%YbFz
z)-xdHLpZ1Tc;^!8Q+#-9L}I1JXFz=H^|Jxh$c_S3qRP!B+m+gpR+AMWs#CQ0OEZBR
zVYl4XrOM6ma8<GINEDM|R~NKr?&ew&1`;6xxrnS<2=5b#YdbzMKsz8+IyseXJjB4C
zKqwN2B;qv+gNy<l#iRjws7UypEkwJN)(}6y+zUeCJ7_k`@W$eAq)o!l9-=L&?MgKd
zF$|mN!^O};H^<kC(Z8f5ZBsjuNf=Wr^_@_$C0em`fzeIXL^xrSBDjTlKb68qP!7-6
zlu$uY^V`fP8U8?FeA1_8v+16kDBoNOZAu_S$OHp{#*ykcV2zu`ig-qX`_v}5XD0y6
zF*y(UdNPC$V`h|~C5~gp=fts^sRCb{(I|?&roxBW_J!{Tm{_Ti;MWSCPc<Bk@7mLg
z!zH9xNYPAb%kg=BnUWBjMt~!-=`<SZzymDqFp1j?OCJI#^x0P7%NUT)z<7Rhd`X7N
z7C!KKJz1kQaxo!|Hu0}CkQ5)Ed)cDIl^&lMkQQukpCi(c8ZA131|U3r!{_;)FSs&l
z3dsZHNx?L;rtSIpQ2@<i(v-8bFMe#D#rQ^TW;saQ1#ZP|6s&b-8L$jk1}p=X0n318
zz%pPNunbrRECb^h@Ycs^Z;x(yWdO^gjK05IU%ou2_vb{Hms$OiSTkVs`F6bXb^7Y<
z8J!-J2YjdR*S%vrOFJDL#7D(fr)8>NX5QONTE0A^_h+E#1HJuTQB+&KPb(f&HKGl`
zSYGE6(I>=LqxW?Ac4hfD@7Iq{ACb30^$!o};iIn@2lEGf-o`_PZv&`-@9oAX#8+QG
zr}NX5<#jKs-&fSsvl__y!1!|h>gSJu@6@{w4r|MFxsh?@rxEXL1;_mvW)810fHd%@
z@ZoSP_^W3qZ*1^HQ>~_<qxfm${uu!a<Ma3!1HScR6!>r>!ugB&{jB&NW^}xY`2~He
zEA()6-NQ*?@B!j4tLydERaD&fR#(?+DE<OFE0zJvfMvikU>UFsSOzQumI2FvWxz6E
z8L$jk1}p>rYYcEg*NsSeBVI<FAg8V(PT+ISrpQ$iTYSu}(qi9Hh00d|CDPn{qe5aL
zG{Z7RHEc3%KSBCjKOslEQfYfl&g(1NaXBt`b?F332u!tbN}wqh+p3pBd1XO>1!gOj
z<RIDA34JzYAFd;FS0W7XB2376ucCpxI#8t2bDQK-3Q{HK(6Znl5g`#$1(6Vo9NGe(
z6J!F3sd!sOw^Y_MeR0xYoccUa7s;+ctOt+WQ<snzseEwWtB1r{<h_b!qB9p^fLf%_
zI#T$^q1A@42dT)Rb&!V2IkY){LE6;GvuK9DIfU`KXu|m5TW35X1$zLW4`THEikwsK
z7nruzLMKgq&Y@+28RJ8asz8b{a%c@cxD~#aakg@fSlQ3;g^XMHY-)V{0w2TWyj<mh
z^Gd7uFu!O7TMEOF-zwr9S`R7EB|iL%m;xUVGd}p@@pH>LMEDKlwX2B$k(4BAeg!*n
zc?MZDJ{+eKK>KQb(WiiA&}!nfOUXI36?~l93tzF&^UL@=osk-}ncul2N~j<C)QI5G
zCGl9{bCK|hKS!s^a^5RW4wd(+GhuT!sUQ1D(<aWLWr4Ya*Ta!Ri-cGd*VrvfKa$KJ
z{;v(UTtvLd?Zx9ooU3DEAqQ?GC$?8COthF(>0qL)SO%&L;QDl<f-BfW@#Mtnk;;Bn
zRmFkNr+^cL6a=b<`{OY{TL|l9u{T%<26xS#&jr3XW7%YPS36LZSAB_C;S&j7Q%TiQ
z!&rDtt*$#L=S%lheunk=RZTC>sx2??lSJV969<xmkrb<J97<)4C7KIxq+gD}`yW2x
z#UGAe0=)R+qLw>Lz=9xO$1iArHQL7;$ciF<K?ow?Jq<E1z!2dUmFyPoI8d58K)zPD
zQ%PVdNw@fA9px04bS}VA8=fFsnWV(=OW^pb)`glcRF2H!7q;WbCrxxq9t5{U(31LY
z3b-Ly(3RlL!6k=#m?(YVOMEpB1RA(vN@b3tg9{}-jzZWMro#j`=#1kBT%hy#g<Eo^
zhszvn`5hYwyT$uG92Rlwyb?wABFMBb%SC%84+n$7hb;u(246nEL-<@6pfeYLz?a7_
zjDYd=vjX2qrrokBGmUGouFUb}2PC?@LR>@_5>^UdO09-u!vxfDfrqRw#VPtppldpc
z4wSev)Vp}&Cy!rv7m*J$#6^BV=p;jFi%~c@Y!gi%S28{XK`u%Y1#hk+x{&<#4MPyA
zWb+1I%|R66LL2EzF;_Y$B7SM$-5!X84=5DPwuxU@i^zvta{QvB9uzt5!8~)=hu}w7
zCXsX+Z8)7%n3X9KPBbYapWzpTn6*U(FFQ>YtO{34CGr8e6%mmR4l62Kv<z4VECZGS
z%YbFTGGH073|Iy%0}C>cenG$b?U&yyBh}pP)mQ6L{hNAPU;Q$0SDg)k8#!D5f6UK+
E0V935LjV8(

literal 0
HcmV?d00001

diff --git a/data/pics/splash.c1 b/data/pics/splash.c1
new file mode 100644
index 0000000000000000000000000000000000000000..7b1584e1fd826fc6cbd45a95c2a8492dae62bf7f
GIT binary patch
literal 32768
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
I53JAs0ln;uBme*a

literal 0
HcmV?d00001

diff --git a/include/system.h b/include/system.h
index af0e0b7..350b6a7 100644
--- a/include/system.h
+++ b/include/system.h
@@ -88,7 +88,7 @@ extern void sys_sleep(int);
  */
 #define SYSVID_ZOOM 2
 #define SYSVID_MAXZOOM 4
-#ifdef GS
+#ifdef IIGS
 #define SYSVID_WIDTH 160
 #else
 #define SYSVID_WIDTH 320
@@ -180,7 +180,7 @@ extern volatile unsigned long* tick;
 
 // GS Rendering Stuff
 extern void SetTileBank(short bank);
-extern void DrawTile(short offset, short tileNo);
+extern void DrawTile(int offset, int tileNo);
 
 // ADB Support Code
 extern char KeyArray[128];
diff --git a/src/draw.c b/src/draw.c
index 82a90df..c21a6a1 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -111,7 +111,7 @@ static U8 *fb;     /* frame buffer pointer */
 void
 draw_setfb(U16 x, U16 y)
 {
-#ifdef GSGFX
+#ifdef IIGS
 	fb = sysvid_fb + (x>>1) + (y * SYSVID_WIDTH);
 #else
 	fb = sysvid_fb + x + y * SYSVID_WIDTH;
@@ -242,7 +242,10 @@ draw_tile(U8 tileNumber)
 
 	int tileNo = (draw_tilesBank*256)+tileNumber;
 
-	DrawTile((short)fb,tileNo);
+	//printf("fb=%04x tileNo=%04x\n", (int)fb, tileNo);
+	//sys_sleep(1000);  // Wait 1 second
+
+	DrawTile(((int)fb),tileNo);
 
 	fb += 4;  /* next tile */
 #else
diff --git a/src/sysvid.c b/src/sysvid.c
index 9761bb1..cc44195 100644
--- a/src/sysvid.c
+++ b/src/sysvid.c
@@ -226,8 +226,8 @@ sysvid_init(void)
 {
 #ifdef IIGS
 	handle hndl;   // "generic memory handle"
-	void* directPageHandle;
-	void* tilesPageHandle;
+	U32* directPageHandle;
+	U32* tilesPageHandle;
 
 //   PushLong  #0                   ;/* Ask Shadowing Screen ($8000 bytes from $01/2000)*/
 //           PushLong  #$8000
@@ -270,7 +270,7 @@ sysvid_init(void)
 
 	// Allocate Some Direct Page memory
 	printf("Allocate Direct Page space 512 bytes\n");
-	directPageHandle = NewHandle( 0x200, userid(), 0xC005, 0 );
+	directPageHandle = (U32*)NewHandle( 0x200, userid(), 0xC005, 0 );
 	if (toolerror())
 	{
 		printf("Unable to allocate 512 bytes Direct Page\n");
@@ -282,7 +282,7 @@ sysvid_init(void)
 
 	//BlitFieldHndl   = NewHandle(0x10000, userid(), 0xC014, 0);
 	printf("Allocate Bank for 8x8 Tiles\n");
-	tilesPageHandle = NewHandle(0x10000, userid(), 0xC014, 0); 
+	tilesPageHandle = (U32*)NewHandle(0x10000, userid(), 0xC014, 0); 
 	if (toolerror())
 	{
 		printf("Unable to allocate 64k Tiles Bank\n");
@@ -291,13 +291,14 @@ sysvid_init(void)
 		exit(1);
 	}
 	printf("SUCCESS\n");
-	SetTileBank(((U8*)*tilesPageHandle)[2]);
+	SetTileBank((*tilesPageHandle)>>16);
+
 	LZ4_Unpack((char*)*tilesPageHandle, &tiles_lz4);
 
 	sysvid_fb = (U8*)0x12000;
 
 	// SHR ON
-	//*VIDEO_REGISTER|=0xC0;
+	*VIDEO_REGISTER|=0xC0;
 
 	// ENABLE Shadowing of SHR
 	*SHADOW_REGISTER&=~0x08; // Shadow Enable
@@ -505,7 +506,7 @@ sysvid_clear(void)
 #ifndef IIGS
   memset(sysvid_fb, 0, SYSVID_WIDTH * SYSVID_HEIGHT);
 #else
-  size_t length = SYSVID_WIDTH /2 * SYSVID_HEIGHT;
+  size_t length = SYSVID_WIDTH * SYSVID_HEIGHT;
   //printf("sysvid_clear: target = %08p\n", sysvid_fb);
   //printf("sysvid_clear: length = %08p\n", length);
   //sys_sleep(10000);