diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 01:02:28 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 01:02:28 -0500 |
| commit | 41acb0667a321865277f50a45e662b1aae939a00 (patch) | |
| tree | 7e6646403fd0a61371e4d1d48956d908655c1321 /engine/timeset.asm | |
| parent | c6fefd0fe878a350a5e8cb1140d0356c78648ba5 (diff) | |
Document macros/map.asm
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
Diffstat (limited to 'engine/timeset.asm')
| -rwxr-xr-x | engine/timeset.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/timeset.asm b/engine/timeset.asm index ca5d9b85a..e8b0642e4 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -362,18 +362,18 @@ OakText_ResponseToSetTime: ; 0x908b8 ld c, l ld a, [wInitHourBuffer] cp 4 - jr c, .NITE + jr c, .nite cp 11 - jr c, .MORN + jr c, .morn cp 18 - jr c, .DAY -.NITE: + jr c, .day +.nite: ld hl, .sodark ret -.MORN: +.morn: ld hl, .overslept ret -.DAY: +.day: ld hl, .yikes ret ; 908ec (24:48ec) @@ -738,19 +738,19 @@ GetTimeOfDayString: ; 90b58 (24:4b58) cp 18 jr c, .day .nite - ld de, .NITE + ld de, .nite_string ret .morn - ld de, .MORN + ld de, .morn_string ret .day - ld de, .DAY + ld de, .day_string ret ; 90b71 (24:4b71) -.NITE: db "NITE@" -.MORN: db "MORN@" -.DAY: db "DAY@" +.nite_string: db "NITE@" +.morn_string: db "MORN@" +.day_string: db "DAY@" ; 90b7f AdjustHourForAMorPM: |