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
2017-12-11 01:02:28 -05:00
parent c6fefd0fe8
commit 41acb0667a
22 changed files with 219 additions and 179 deletions
--- 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