diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-01 13:08:08 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-01 13:13:40 -0400 |
| commit | e6f75432928ccd915016162a68df43b0adf6ce04 (patch) | |
| tree | 8b3efc7441195cb12dcdbd34442da00f45e2fdcc /home/map_objects.asm | |
| parent | 534863abe1d7c57707135574ef8bb1094aa5be22 (diff) | |
Identify more labels, and use the jumptable macro when possible
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index d811d421..edbc23f1 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_17bb + ld hl, .TimesOfDay ld a, [wTimeOfDay] add l ld l, a @@ -257,7 +257,7 @@ CheckObjectTime:: and a ret -.TimeOfDayValues_17bb: +.TimesOfDay: ; entries correspond to TimeOfDay values db MORN db DAY @@ -362,7 +362,7 @@ CopyPlayerObjectTemplate:: call CopyBytes ret -Function1855: ; unreferenced +DeleteFollowerMapObject: ; unreferenced call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc @@ -376,7 +376,7 @@ Function1855: ; unreferenced pop af cp -1 ret z - cp $d + cp NUM_OBJECT_STRUCTS ret nc ld b, a ld a, [wObjectFollow_Leader] |