X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld45_start_nothing;a=blobdiff_plain;f=src%2Fmain.asm;h=ce5e5add52e15ec55d0857b84430f3874a69a321;hp=243ff0da6e8f4ba874059d8e4eb2349710bb0c8e;hb=371bbe72cccdd5c40d5118bd0417fab062f3699a;hpb=78cf90d60c7cdbfcb8bc1d3e3d03a577d1b70f7b

diff --git a/src/main.asm b/src/main.asm
index 243ff0d..ce5e5ad 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -1,10 +1,9 @@
 ; vi:filetype=nasm ts=8 sts=8 sw=8:
 	bits 32
-	extern init_gfx
-	extern clear
-	extern slow_sprite
-	extern wait_vsync
-	extern swap_buffers
+%include "gfx.inc"
+%include "keyb.inc"
+%include "intr.inc"
+%include "dbglog.inc"
 
 	; this is placed at the beginning of our binary at 1mb (see game.ld)
 	; and it's what gets executed directly by the boot loader
@@ -14,17 +13,33 @@
 	; start of main
 	section .text
 main:
+	call init_intr
+	call kb_init
 	call init_gfx
 
+	dbglog `hello\n`
+
+	sti
 main_loop:
+	call update
+
 	call clear
 
-	push dword 100
-	push dword 160
 	push dword 0
-	call slow_sprite
+	push dword [ship_y]
+	push dword [ship_x]
+	push dword FRAMEBUF_ADDR
+	call sprsheet
 	add esp, 16
 
 	call wait_vsync
 	call swap_buffers
 	jmp main_loop
+
+update:
+	ret
+
+	section .data
+	align 4
+ship_x: dd 160
+ship_y: dd 100