Use rgbasm -h to use halt without nops.

anthonycicc · May 31, 2014 · d424eb4 · d424eb4
1 parent f59f03c
commit d424eb4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ $(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep))
 	@$(gfx) 2bpp $(2bppq);    $(eval 2bppq :=)
 	@$(gfx) 1bpp $(1bppq);    $(eval 1bppq :=)
 	@$(pic) compress $(picq); $(eval picq  :=)
-	rgbasm -o $@ $*.tx
+	rgbasm -h -o $@ $*.tx
 
 
 link    := rgblink -n $*.sym -m $*.map

diff --git a/home.asm b/home.asm
@@ -1861,10 +1861,7 @@ NOT_VBLANKED EQU 1
 	ld a, NOT_VBLANKED
 	ld [H_VBLANKOCCURRED], a
 .halt
-	; XXX this is a hack--rgbasm adds
-	; a nop after halts by default.
-	db $76 ; halt
-
+	halt
 	ld a, [H_VBLANKOCCURRED]
 	and a
 	jr nz, .halt