Use rgbasm -h to use halt without nops.

This commit is contained in:
yenatch 2014-05-31 00:39:09 -07:00
parent f59f03c685
commit d424eb4438
2 changed files with 2 additions and 5 deletions

View file

@ -50,7 +50,7 @@ $(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep))
@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=) @$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
@$(gfx) 1bpp $(1bppq); $(eval 1bppq :=) @$(gfx) 1bpp $(1bppq); $(eval 1bppq :=)
@$(pic) compress $(picq); $(eval picq :=) @$(pic) compress $(picq); $(eval picq :=)
rgbasm -o $@ $*.tx rgbasm -h -o $@ $*.tx
link := rgblink -n $*.sym -m $*.map link := rgblink -n $*.sym -m $*.map

View file

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