diff options
Diffstat (limited to 'home')
-rw-r--r-- | home/init.asm | 2 | ||||
-rw-r--r-- | home/map_objects.asm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/home/init.asm b/home/init.asm index eb8453b51..76dc28422 100644 --- a/home/init.asm +++ b/home/init.asm @@ -50,7 +50,7 @@ Init:: ldh [rOBP1], a ldh [rTMA], a ldh [rTAC], a - ld [WRAM1_Begin], a + ld [wd000], a ld a, %100 ; Start timer at 4096Hz ldh [rTAC], a 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] |