summaryrefslogtreecommitdiff
path: root/engine/overworld/map_objects.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-10-30 12:26:04 -0400
committerGitHub <noreply@github.com>2020-10-30 12:26:04 -0400
commitd831e40b99853c8e29e3939bb100b6ecf03b1028 (patch)
tree7d97e9277ee405a77046481100bf11adbc325367 /engine/overworld/map_objects.asm
parent26ddba8cfd8f035c06bd6419b64a6c4d7dbc226f (diff)
parentdb72c5103e807c4960ff62ca1764cac151288586 (diff)
Merge pull request #64 from Rangi42/unreferenced
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'engine/overworld/map_objects.asm')
-rw-r--r--engine/overworld/map_objects.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index db82248e..3d3b1cab 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2823,18 +2823,17 @@ InitSprites:
.InitSprite:
xor a
-.skip1
ld hl, OBJECT_FLAGS2
add hl, bc
ld e, [hl]
bit OBJ_FLAGS2_7, e
- jr z, .skip2
+ jr z, .not_priority
or PRIORITY
-.skip2
+.not_priority
bit USE_OBP1_F, e
- jr z, .skip3
+ jr z, .not_obp_num
or OBP_NUM
-.skip3
+.not_obp_num
ld hl, OBJECT_PALETTE
add hl, bc
ld d, a
@@ -2844,9 +2843,9 @@ InitSprites:
ld d, a
xor a
bit OVERHEAD_F, e
- jr z, .skip4
+ jr z, .not_overhead
or PRIORITY
-.skip4
+.not_overhead
ldh [hCurSpriteOAMFlags], a
ld hl, OBJECT_SPRITE_TILE
add hl, bc