From: sparky4 <sparky4@cock.li>
Date: Thu, 5 Jan 2017 15:53:25 +0000 (-0600)
Subject: makefile fixed from ym mistake from yesterday. i made improvements to the automated... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=bcb4483eef0a8886e23085d7f477319cbc7152f3;p=16.git

makefile fixed from ym mistake from yesterday. i made improvements to the automated distribution functions of the make file <3
---

diff --git a/DEBUG.16W b/DEBUG.16W
index 4e58075f..bcb2b4be 100755
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,210 @@
-Seg:0	Size:10046	Owner:0x0
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000
-Seg:2837	Size:44	Owner:0x0
-++
-Seg:2863	Size:256	Owner:0x1650
-++++
-Seg:2963	Size:256	Owner:0x1442
+Seg:0	Size:10277	Owner:0x0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000
+Seg:290e	Size:44	Owner:0x0
++
+Seg:293a	Size:256	Owner:0x1650
++++++
+Seg:2a3a	Size:256	Owner:0x1442
 ++++
-Seg:2a63	Size:256	Owner:0x1444
+Seg:2b3a	Size:256	Owner:0x1444
 ++++
-Seg:2b63	Size:256	Owner:0x1446
+Seg:2c3a	Size:256	Owner:0x1446
+++++
+Seg:2d3a	Size:256	Owner:0x1448
+++++
+Seg:2e3a	Size:256	Owner:0x144a
 +++++
-Seg:2c63	Size:256	Owner:0x1448
+Seg:2f3a	Size:256	Owner:0x144c
 ++++
-Seg:2d63	Size:256	Owner:0x144a
+Seg:303a	Size:256	Owner:0x144e
 ++++
-Seg:2e63	Size:256	Owner:0x144c
+Seg:313a	Size:256	Owner:0x1450
 ++++
-Seg:2f63	Size:256	Owner:0x144e
+Seg:323a	Size:256	Owner:0x1452
 ++++
-Seg:3063	Size:256	Owner:0x1450
+Seg:333a	Size:256	Owner:0x1454
 +++++
-Seg:3163	Size:256	Owner:0x1452
+Seg:343a	Size:256	Owner:0x1456
 ++++
-Seg:3263	Size:256	Owner:0x1454
+Seg:353a	Size:256	Owner:0x1458
 ++++
-Seg:3363	Size:256	Owner:0x1456
+Seg:363a	Size:256	Owner:0x145a
 ++++
-Seg:3463	Size:256	Owner:0x1458
+Seg:373a	Size:256	Owner:0x145c
 ++++
-Seg:3563	Size:256	Owner:0x145a
+Seg:383a	Size:256	Owner:0x145e
 +++++
-Seg:3663	Size:256	Owner:0x145c
+Seg:393a	Size:256	Owner:0x1460
 ++++
-Seg:3763	Size:256	Owner:0x145e
+Seg:3a3a	Size:256	Owner:0x1462
 ++++
-Seg:3863	Size:256	Owner:0x1460
+Seg:3b3a	Size:256	Owner:0x1464
 ++++
-Seg:3963	Size:256	Owner:0x1462
+Seg:3c3a	Size:256	Owner:0x1466
 ++++
-Seg:3a63	Size:256	Owner:0x1464
+Seg:3d3a	Size:256	Owner:0x1468
 +++++
-Seg:3b63	Size:256	Owner:0x1466
+Seg:3e3a	Size:256	Owner:0x146a
 ++++
-Seg:3c63	Size:256	Owner:0x1468
+Seg:3f3a	Size:256	Owner:0x146c
 ++++
-Seg:3d63	Size:256	Owner:0x146a
+Seg:403a	Size:256	Owner:0x146e
 ++++
-Seg:3e63	Size:256	Owner:0x146c
+Seg:413a	Size:256	Owner:0x1470
 ++++
-Seg:3f63	Size:256	Owner:0x146e
+Seg:423a	Size:256	Owner:0x1472
 +++++
-Seg:4063	Size:256	Owner:0x1470
+Seg:433a	Size:256	Owner:0x1474
 ++++
-Seg:4163	Size:256	Owner:0x1472
+Seg:443a	Size:256	Owner:0x1476
 ++++
-Seg:4263	Size:256	Owner:0x1474
+Seg:453a	Size:256	Owner:0x1478
 ++++
-Seg:4363	Size:256	Owner:0x1476
+Seg:463a	Size:256	Owner:0x147a
 ++++
-Seg:4463	Size:256	Owner:0x1478
+Seg:473a	Size:256	Owner:0x147c
 +++++
-Seg:4563	Size:256	Owner:0x147a
+Seg:483a	Size:256	Owner:0x147e
 ++++
-Seg:4663	Size:256	Owner:0x147c
+Seg:493a	Size:256	Owner:0x1480
 ++++
-Seg:4763	Size:256	Owner:0x147e
+Seg:4a3a	Size:256	Owner:0x1482
 ++++
-Seg:4863	Size:256	Owner:0x1480
+Seg:4b3a	Size:256	Owner:0x1484
 ++++
-Seg:4963	Size:256	Owner:0x1482
+Seg:4c3a	Size:256	Owner:0x1486
 +++++
-Seg:4a63	Size:256	Owner:0x1484
+Seg:4d3a	Size:256	Owner:0x1488
 ++++
-Seg:4b63	Size:256	Owner:0x1486
+Seg:4e3a	Size:256	Owner:0x148a
 ++++
-Seg:4c63	Size:256	Owner:0x1488
+Seg:4f3a	Size:256	Owner:0x148c
 ++++
-Seg:4d63	Size:256	Owner:0x148a
+Seg:503a	Size:256	Owner:0x148e
 ++++
-Seg:4e63	Size:256	Owner:0x148c
+Seg:513a	Size:256	Owner:0x1490
 +++++
-Seg:4f63	Size:256	Owner:0x148e
+Seg:523a	Size:256	Owner:0x1492
 ++++
-Seg:5063	Size:256	Owner:0x1490
+Seg:533a	Size:256	Owner:0x1494
 ++++
-Seg:5163	Size:256	Owner:0x1492
+Seg:543a	Size:256	Owner:0x1496
 ++++
-Seg:5263	Size:256	Owner:0x1494
+Seg:553a	Size:256	Owner:0x1498
 ++++
-Seg:5363	Size:256	Owner:0x1496
+Seg:563a	Size:256	Owner:0x149a
 +++++
-Seg:5463	Size:256	Owner:0x1498
+Seg:573a	Size:256	Owner:0x149c
 ++++
-Seg:5563	Size:256	Owner:0x149a
+Seg:583a	Size:256	Owner:0x149e
 ++++
-Seg:5663	Size:256	Owner:0x149c
+Seg:593a	Size:256	Owner:0x14a0
 ++++
-Seg:5763	Size:256	Owner:0x149e
+Seg:5a3a	Size:256	Owner:0x14a2
 ++++
-Seg:5863	Size:256	Owner:0x14a0
+Seg:5b3a	Size:256	Owner:0x14a4
 +++++
-Seg:5963	Size:256	Owner:0x14a2
+Seg:5c3a	Size:256	Owner:0x14a6
 ++++
-Seg:5a63	Size:256	Owner:0x14a4
+Seg:5d3a	Size:256	Owner:0x14a8
 ++++
-Seg:5b63	Size:256	Owner:0x14a6
+Seg:5e3a	Size:256	Owner:0x14aa
 ++++
-Seg:5c63	Size:256	Owner:0x14a8
+Seg:5f3a	Size:256	Owner:0x14ac
 ++++
-Seg:5d63	Size:256	Owner:0x14aa
+Seg:603a	Size:256	Owner:0x14ae
 +++++
-Seg:5e63	Size:256	Owner:0x14ac
+Seg:613a	Size:256	Owner:0x14b0
 ++++
-Seg:5f63	Size:256	Owner:0x14ae
+Seg:623a	Size:256	Owner:0x14b2
 ++++
-Seg:6063	Size:256	Owner:0x14b0
+Seg:633a	Size:256	Owner:0x14b4
 ++++
-Seg:6163	Size:256	Owner:0x14b2
+Seg:643a	Size:256	Owner:0x14b6
 ++++
-Seg:6263	Size:256	Owner:0x14b4
+Seg:653a	Size:256	Owner:0x14b8
 +++++
-Seg:6363	Size:256	Owner:0x14b6
+Seg:663a	Size:256	Owner:0x14ba
 ++++
-Seg:6463	Size:256	Owner:0x14b8
+Seg:673a	Size:256	Owner:0x14bc
 ++++
-Seg:6563	Size:256	Owner:0x14ba
+Seg:683a	Size:256	Owner:0x14be
 ++++
-Seg:6663	Size:256	Owner:0x14bc
+Seg:693a	Size:256	Owner:0x14c0
 ++++
-Seg:6763	Size:256	Owner:0x14be
+Seg:6a3a	Size:256	Owner:0x14c2
 +++++
-Seg:6863	Size:256	Owner:0x14c0
+Seg:6b3a	Size:256	Owner:0x14c4
 ++++
-Seg:6963	Size:256	Owner:0x14c2
+Seg:6c3a	Size:256	Owner:0x14c6
 ++++
-Seg:6a63	Size:256	Owner:0x14c4
+Seg:6d3a	Size:256	Owner:0x14c8
 ++++
-Seg:6b63	Size:256	Owner:0x14c6
+Seg:6e3a	Size:256	Owner:0x14ca
 ++++
-Seg:6c63	Size:256	Owner:0x14c8
+Seg:6f3a	Size:256	Owner:0x14cc
 +++++
-Seg:6d63	Size:256	Owner:0x14ca
+Seg:703a	Size:256	Owner:0x14ce
 ++++
-Seg:6e63	Size:256	Owner:0x14cc
+Seg:713a	Size:256	Owner:0x14d0
 ++++
-Seg:6f63	Size:256	Owner:0x14ce
+Seg:723a	Size:256	Owner:0x14d2
 ++++
-Seg:7063	Size:256	Owner:0x14d0
+Seg:733a	Size:256	Owner:0x14d4
 ++++
-Seg:7163	Size:256	Owner:0x14d2
+Seg:743a	Size:256	Owner:0x14d6
 +++++
-Seg:7263	Size:256	Owner:0x14d4
+Seg:753a	Size:256	Owner:0x14d8
 ++++
-Seg:7363	Size:256	Owner:0x14d6
+Seg:763a	Size:256	Owner:0x14da
 ++++
-Seg:7463	Size:256	Owner:0x14d8
+Seg:773a	Size:256	Owner:0x14dc
 ++++
-Seg:7563	Size:256	Owner:0x14da
+Seg:783a	Size:256	Owner:0x14de
 ++++
-Seg:7663	Size:256	Owner:0x14dc
+Seg:793a	Size:256	Owner:0x14e0
 +++++
-Seg:7763	Size:256	Owner:0x14de
+Seg:7a3a	Size:256	Owner:0x14e2
 ++++
-Seg:7863	Size:256	Owner:0x14e0
+Seg:7b3a	Size:256	Owner:0x14e4
 ++++
-Seg:7963	Size:256	Owner:0x14e2
+Seg:7c3a	Size:256	Owner:0x14e6
 ++++
-Seg:7a63	Size:256	Owner:0x14e4
+Seg:7d3a	Size:256	Owner:0x14e8
 ++++
-Seg:7b63	Size:256	Owner:0x14e6
+Seg:7e3a	Size:256	Owner:0x14ea
 +++++
-Seg:7c63	Size:256	Owner:0x14e8
+Seg:7f3a	Size:256	Owner:0x14ec
 ++++
-Seg:7d63	Size:256	Owner:0x14ea
+Seg:803a	Size:256	Owner:0x14ee
 ++++
-Seg:7e63	Size:256	Owner:0x14ec
+Seg:813a	Size:256	Owner:0x14f0
 ++++
-Seg:7f63	Size:256	Owner:0x14ee
+Seg:823a	Size:256	Owner:0x14f2
 ++++
-Seg:8063	Size:256	Owner:0x14f0
+Seg:833a	Size:256	Owner:0x14f4
 +++++
-Seg:8163	Size:256	Owner:0x14f2
+Seg:843a	Size:256	Owner:0x14f6
 ++++
-Seg:8263	Size:256	Owner:0x14f4
+Seg:853a	Size:256	Owner:0x14f8
 ++++
-Seg:8363	Size:256	Owner:0x14f6
+Seg:863a	Size:256	Owner:0x14fa
 ++++
-Seg:8463	Size:256	Owner:0x14f8
+Seg:873a	Size:256	Owner:0x14fc
 ++++
-Seg:8563	Size:256	Owner:0x14fa
+Seg:883a	Size:256	Owner:0x14fe
 +++++
-Seg:8663	Size:256	Owner:0x14fc
+Seg:893a	Size:256	Owner:0x1500
 ++++
-Seg:8763	Size:256	Owner:0x14fe
+Seg:8a3a	Size:256	Owner:0x1502
 ++++
-Seg:8863	Size:256	Owner:0x1500
+Seg:8b3a	Size:256	Owner:0x1504
 ++++
-Seg:8963	Size:256	Owner:0x1502
+Seg:8c3a	Size:256	Owner:0x1506
 ++++
-Seg:8a63	Size:256	Owner:0x1504
+Seg:8d3a	Size:256	Owner:0x1508
 +++++
-Seg:8b63	Size:256	Owner:0x1506
-++++
-Seg:8c63	Size:256	Owner:0x1508
-++++
-Seg:8d63	Size:401	Owner:0xec1c
+Seg:8e3a	Size:401	Owner:0xec1c
 ++++++
-Seg:b863	Size:18332	Owner:0x0
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
+Seg:b93a	Size:18117	Owner:0x0
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/HEAP.16W b/HEAP.16W
index c45d5f21..0c8996e9 100755
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,69 +1,69 @@
 
 	== default ==
 
-  USED block at 28590016 of size 136
-  FREE block at 2859009e of size 68
-  USED block at 285900e2 of size 50
-  USED block at 28590114 of size 50
-  USED block at 28590146 of size 50
-  USED block at 28590178 of size 50
-  USED block at 285901aa of size 50
-  USED block at 285901dc of size 50
-  USED block at 2859020e of size 50
-  USED block at 28590240 of size 50
-  USED block at 28590272 of size 50
-  USED block at 285902a4 of size 50
-  USED block at 285902d6 of size 50
-  USED block at 28590308 of size 50
-  FREE block at 2859033a of size 14
-  USED block at 28590348 of size 20
-  FREE block at 2859035c of size 7328
+  USED block at 29300016 of size 136
+  FREE block at 2930009e of size 68
+  USED block at 293000e2 of size 50
+  USED block at 29300114 of size 50
+  USED block at 29300146 of size 50
+  USED block at 29300178 of size 50
+  USED block at 293001aa of size 50
+  USED block at 293001dc of size 50
+  USED block at 2930020e of size 50
+  USED block at 29300240 of size 50
+  USED block at 29300272 of size 50
+  USED block at 293002a4 of size 50
+  USED block at 293002d6 of size 50
+  USED block at 29300308 of size 50
+  FREE block at 2930033a of size 14
+  USED block at 29300348 of size 20
+  FREE block at 2930035c of size 7328
 OK - end of heap
 
 	== near ==
 
-  USED block at 1858ec66 of size 12
-  USED block at 1858ec72 of size 330
-  USED block at 1858edbc of size 52
-  USED block at 1858edf0 of size 20
-  USED block at 1858ee04 of size 20
-  USED block at 1858ee18 of size 20
-  USED block at 1858ee2c of size 20
-  USED block at 1858ee40 of size 20
-  USED block at 1858ee54 of size 4520
+  USED block at 192fec66 of size 12
+  USED block at 192fec72 of size 564
+  USED block at 192feea6 of size 72
+  USED block at 192feeee of size 20
+  USED block at 192fef02 of size 20
+  USED block at 192fef16 of size 20
+  USED block at 192fef2a of size 20
+  USED block at 192fef3e of size 20
+  USED block at 192fef52 of size 4266
 OK - end of heap
 
 	== far ==
 
-  USED block at 28590016 of size 136
-  USED block at 2859009e of size 68
-  USED block at 285900e2 of size 50
-  USED block at 28590114 of size 50
-  USED block at 28590146 of size 50
-  USED block at 28590178 of size 50
-  USED block at 285901aa of size 50
-  USED block at 285901dc of size 50
-  USED block at 2859020e of size 50
-  USED block at 28590240 of size 50
-  USED block at 28590272 of size 50
-  USED block at 285902a4 of size 50
-  USED block at 285902d6 of size 50
-  USED block at 28590308 of size 50
-  USED block at 2859033a of size 14
-  USED block at 28590348 of size 20
-  USED block at 2859035c of size 7328
+  USED block at 29300016 of size 136
+  USED block at 2930009e of size 68
+  USED block at 293000e2 of size 50
+  USED block at 29300114 of size 50
+  USED block at 29300146 of size 50
+  USED block at 29300178 of size 50
+  USED block at 293001aa of size 50
+  USED block at 293001dc of size 50
+  USED block at 2930020e of size 50
+  USED block at 29300240 of size 50
+  USED block at 29300272 of size 50
+  USED block at 293002a4 of size 50
+  USED block at 293002d6 of size 50
+  USED block at 29300308 of size 50
+  USED block at 2930033a of size 14
+  USED block at 29300348 of size 20
+  USED block at 2930035c of size 7328
 OK - end of heap
 
 Memory Type         Total      Used       Free
 ----------------  --------   --------   --------
 Default		   8166		756	  7410
-Near		   5014		494	  4520
+Near		   5014		748	  4266
 Far		   8166		756	  7410
 ----------------  --------   --------   --------
-coreleft = 4518
-farcoreleft = 28156
+coreleft = 4264
+farcoreleft = 27902
 GetFreeSize = 23660
-GetNearFreeSize = 4520
+GetNearFreeSize = 4266
 GetFarFreeSize = 23660
-memavl = 4518
+memavl = 4264
 stackavail = 31539
diff --git a/MMDUMP.16W b/MMDUMP.16W
index 83946afe..3c7a7e1f 100755
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ
diff --git a/src/0.c b/src/0.c
index e9dc876e..be5f18eb 100755
--- a/src/0.c
+++ b/src/0.c
@@ -116,7 +116,6 @@ int main(int argc,char **argv) {
 		VGA_RAM_PTR omemptr;
 		int xdir=1,ydir=1;
 
-		//4	this dose the sprite? wwww
 		/* fill pattern offset with a distinctive pattern */
 		for (i=0;i < gvar.video.page[0].width;i++) {
 			o = (i >> 2) + (0x10000UL - (uint16_t)gvar.video.page[1].data);
diff --git a/src/vrstest.c b/src/vrstest.c
index d3c28297..a555818b 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -106,10 +106,13 @@ void main() {
 /*	sega = mm.bufferseg;
 	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
 
-	/* clear and draw one sprite and one bitmap */
 	VGAmodeX(1, 1, &gvar);
 	modexHiganbanaPageSetup(&gvar.video);
 
+	/* simulate scroll's zetup */
+	gvar.video.page[0].dx = gvar.video.page[0].dy = 16;
+	modexShowPage(&gvar.video.page[0]);
+
 	/* non sprite comparison */
 	start = *clockw;
 	modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
diff --git a/src/zcroll.c b/src/zcroll.c
index 3346ddb0..024e5ff0 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -138,7 +138,6 @@ void main(int argc, char *argv[])
 #ifdef FADE
 		modexFadeOn(4, dpal);
 #endif
-	exit(-4);
 	}
 	//animate_spri((player[0].ent->spri), &gvar);