summaryrefslogtreecommitdiff
path: root/home/map_objects.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-14 14:41:47 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-14 14:41:47 -0500
commited44de4bb4688f6b8c83aeb4f5fd8658d17615fb (patch)
treef5f4eb44bbd16d7d11f25b23c01e1c4d11dd7456 /home/map_objects.asm
parentcc8c36ee149b287b7a1cabb85abb4bf42873a3b2 (diff)
More map object work
Diffstat (limited to 'home/map_objects.asm')
-rw-r--r--home/map_objects.asm7
1 files changed, 5 insertions, 2 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm
index c6b7f271c..c2512b22f 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -6,7 +6,9 @@ GetSpritePalette:: ; 17ff
push de
push bc
ld c, a
+
callba _GetSpritePalette
+
ld a, c
pop bc
pop de
@@ -15,7 +17,7 @@ GetSpritePalette:: ; 17ff
; 180e
-Function180e:: ; 180e
+GetSpriteVTile:: ; 180e
push hl
push bc
ld hl, UsedSprites + 2
@@ -571,7 +573,7 @@ endr
ld [hl], a
ld a, [bc]
inc bc
- ld hl, OBJECT_11
+ ld hl, OBJECT_ACTION
add hl, de
ld [hl], a
ld a, [bc]
@@ -659,6 +661,7 @@ GetObjectSprite:: ; 1af1
; 1af8
SetSpriteDirection:: ; 1af8
+ ; preserves other flags
push af
ld hl, OBJECT_FACING
add hl, bc