summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 01:02:28 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 01:02:28 -0500
commit41acb0667a321865277f50a45e662b1aae939a00 (patch)
tree7e6646403fd0a61371e4d1d48956d908655c1321 /main.asm
parentc6fefd0fe878a350a5e8cb1140d0356c78648ba5 (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 'main.asm')
-rw-r--r--main.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/main.asm b/main.asm
index a3161f7a6..dd3a3f5d9 100644
--- a/main.asm
+++ b/main.asm
@@ -269,10 +269,10 @@ CheckTime:: ; c000
ret
TimeOfDayTable: ; c012
- db MORN, 1 << MORN
- db DAY, 1 << DAY
- db NITE, 1 << NITE
- db NITE, 1 << NITE
+ db MORN_F, MORN
+ db DAY_F, DAY
+ db NITE_F, NITE
+ db NITE_F, NITE
db -1
INCLUDE "engine/specials.asm"
@@ -1430,7 +1430,7 @@ PlayBattleMusic: ; 2ee6c
ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [TimeOfDay]
- cp NITE
+ cp NITE_F
jr nz, .done
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done