From 2b7961759b3786725b95ee8f4a0b6e556091db7a Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 30 Aug 2015 18:56:44 -0400 Subject: Fixes. --- home/pic.asm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'home/pic.asm') diff --git a/home/pic.asm b/home/pic.asm index 28ffcbc7..96cd6cd1 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -535,13 +535,8 @@ ReverseNybble:: ; 272d (0:272d) ret ; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS -<<<<<<< HEAD ResetSpriteBufferPointers:: ; 2737 (0:2737) ld a, [W_SPRITELOADFLAGS] ; wd0a8 -======= -ResetSpriteBufferPointers:: ; 2841 (0:2841) - ld a, [W_SPRITELOADFLAGS] ->>>>>>> 1a987d1e1ab96ca9553d4253c72858057332a03a bit 0, a jr nz, .buffer2Selected ld de, S_SPRITEBUFFER1 -- cgit v1.3.1-sl0p