Browse code

Disks are now loaded at 0x0200

neauoire authored on 28/03/2021 18:06:36
Showing 3 changed files
... ...
@@ -713,7 +713,7 @@ RTN
713 713
 @filepath1     [ projects/examples/gui.hover.usm 00 ]
714 714
 @filepath      [ projects/software/noodle.usm 00 ]
715 715
 
716
-|3000 ;document { eof 2 body 8000 }
717
-|c000 ;clip { len 2 body 256 }
716
+@ERROR BRK 
718 717
 
719
-|d000 @ERROR BRK 
720 718
\ No newline at end of file
719
+;clip { len 2 body 256 }
720
+;document { eof 2 body 2 }
721 721
\ No newline at end of file
... ...
@@ -11,6 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 11
 WITH REGARD TO THIS SOFTWARE.
12 12
 */
13 13
 
14
+#define OFFSET 0x0200
15
+
14 16
 typedef unsigned char Uint8;
15 17
 typedef signed char Sint8;
16 18
 typedef unsigned short Uint16;
... ...
@@ -462,7 +464,7 @@ main(int argc, char *argv[])
462 464
 		error("Assembly", "Failed");
463 465
 		return 1;
464 466
 	}
465
-	fwrite(p.data, p.ptr, 1, fopen(argv[2], "wb"));
467
+	fwrite(p.data + OFFSET, p.ptr - OFFSET, 1, fopen(argv[2], "wb"));
466 468
 	fclose(f);
467 469
 	cleanup(argv[2]);
468 470
 	return 0;
... ...
@@ -187,7 +187,7 @@ loaduxn(Uxn *u, char *filepath)
187 187
 	FILE *f;
188 188
 	if(!(f = fopen(filepath, "rb")))
189 189
 		return haltuxn(u, "Missing input rom.", 0);
190
-	fread(u->ram.dat, sizeof(u->ram.dat), 1, f);
190
+	fread(u->ram.dat + PAGE_VECTORS, sizeof(u->ram.dat) - PAGE_VECTORS, 1, f);
191 191
 	printf("Uxn loaded[%s].\n", filepath);
192 192
 	return 1;
193 193
 }