summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--home.asm5
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4dc35a7a..312f7787 100644
--- 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
index 11879c3e..dd2433ad 100644
--- 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