# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1335930205 25200
# Node ID bbfa7bf6962000a08102cf3a57f36183a5af9c28
# Parent  ea41003cfa70b31e6b8261146dca819c19e41d01
Small fixes to skeleton

diff -r ea41003cfa70 -r bbfa7bf69620 Makefile
--- a/Makefile	Tue May 01 17:47:00 2012 -0700
+++ b/Makefile	Tue May 01 20:43:25 2012 -0700
@@ -6,13 +6,13 @@
 	mkisofs -o fs.iso filesystem
 
 boot.bin : scd_header.s68 mainboot.bin subboot.bin security.bin
-	vasmm68k_mot -Fbin scd_header.s68 -o boot.bin
+	vasmm68k_mot -Fbin -m68000 scd_header.s68 -o boot.bin
 	
 mainboot.bin : mainboot.s68
-	vasmm68k_mot -Fbin mainboot.s68 -o mainboot.bin
+	vasmm68k_mot -Fbin -m68000 mainboot.s68 -o mainboot.bin
 
 subboot.bin : subboot.s68
-	vasmm68k_mot -Fbin subboot.s68 -o subboot.bin
+	vasmm68k_mot -Fbin -m68000 subboot.s68 -o subboot.bin
 	
 clean :
 	rm subboot.bin mainboot.bin boot.bin
diff -r ea41003cfa70 -r bbfa7bf69620 mainboot.s68
--- a/mainboot.s68	Tue May 01 17:47:00 2012 -0700
+++ b/mainboot.s68	Tue May 01 20:43:25 2012 -0700
@@ -1,4 +1,4 @@
-	org $FFFF0000
+	org $FF0000
 	incbin security.bin
-MainMain
-	bra MainMain
+Main
+	bra Main
diff -r ea41003cfa70 -r bbfa7bf69620 subboot.s68
--- a/subboot.s68	Tue May 01 17:47:00 2012 -0700
+++ b/subboot.s68	Tue May 01 20:43:25 2012 -0700
@@ -1,18 +1,19 @@
 	org $6000
 SubHeaderStart
 	dc.b 'MAIN FOOBAR', 0
-	align 8
+	align 4
 	dc.l 0
-	dc.l SubHeaderEnd-SubHeaderStart
+	dc.l End-SubHeaderStart
 	dc.l EntryPoints-SubHeaderStart
 EntryPoints
-	dc.l SubMain-EntryPoints
-	dc.l SubMain-EntryPoints
-	dc.l Int2Handler-EntryPoints
-	dc.l 0
-SubHeaderEnd
-SubMain
-	bra SubMain
+	dc.w Main-EntryPoints
+	dc.w Main-EntryPoints
+	dc.w Int2Handler-EntryPoints
+	dc.w 0
+Main
+	bra Main
 	
 Int2Handler
 	rte
+	
+End