summaryrefslogtreecommitdiff
path: root/home/map_objects.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-01 13:13:49 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-01 13:13:49 -0400
commitfce6243b432d1df1b4ab244023be738a54dbe8f3 (patch)
treec93b0989254b15e86aa0ae07ab255d5bb5fd0afb /home/map_objects.asm
parente171c84c2990df2c1a3773885297089869a0fd58 (diff)
Identify more labels, and use the jumptable macro when possible
Diffstat (limited to 'home/map_objects.asm')
-rw-r--r--home/map_objects.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm
index d91b2ab84..a13aa9769 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -237,7 +237,7 @@ CheckObjectTime::
ld a, [hl]
cp -1
jr z, .timeofday_always
- ld hl, .TimeOfDayValues_191e
+ ld hl, .TimesOfDay
ld a, [wTimeOfDay]
add l
ld l, a
@@ -257,7 +257,7 @@ CheckObjectTime::
and a
ret
-.TimeOfDayValues_191e:
+.TimesOfDay:
; entries correspond to TimeOfDay values
db MORN
db DAY
@@ -362,7 +362,7 @@ CopyPlayerObjectTemplate::
call CopyBytes
ret
-Function19b8: ; unreferenced
+DeleteFollowerMapObject: ; unreferenced
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
@@ -376,7 +376,7 @@ Function19b8: ; unreferenced
pop af
cp -1
ret z
- cp $d
+ cp NUM_OBJECT_STRUCTS
ret nc
ld b, a
ld a, [wObjectFollow_Leader]