Identify more bit flags (#1153)

engine/rtc/reset_password.asm

@@ -19,7 +19,7 @@ _ResetClock:
 	jr c, .wrongpassword
 	ld a, BANK(sRTCStatusFlags)
 	call OpenSRAM
-	ld a, $80
+	ld a, RTC_RESET
 	ld [sRTCStatusFlags], a
 	call CloseSRAM
 	ld hl, .PasswordAskResetText

engine/rtc/restart_clock.asm

@@ -121,17 +121,17 @@ RestartClock:
 	push af
 	call .PrintTime
 	pop af
-	bit 0, a
+	bit A_BUTTON_F, a
 	jr nz, .press_A
-	bit 1, a
+	bit B_BUTTON_F, a
 	jr nz, .press_B
-	bit 6, a
+	bit D_UP_F, a
 	jr nz, .pressed_up
-	bit 7, a
+	bit D_DOWN_F, a
 	jr nz, .pressed_down
-	bit 5, a
+	bit D_LEFT_F, a
 	jr nz, .pressed_left
-	bit 4, a
+	bit D_RIGHT_F, a
 	jr nz, .pressed_right
 	jr .joy_loop
 

engine/rtc/rtc.asm

@@ -5,7 +5,7 @@ StopRTC: ; unreferenced
 	ld a, RTC_DH
 	ld [MBC3SRamBank], a
 	ld a, [MBC3RTC]
-	set 6, a ; halt
+	set RTC_DH_HALT, a
 	ld [MBC3RTC], a
 	call CloseSRAM
 	ret
@@ -17,7 +17,7 @@ StartRTC:
 	ld a, RTC_DH
 	ld [MBC3SRamBank], a
 	ld a, [MBC3RTC]
-	res 6, a ; halt
+	res RTC_DH_HALT, a
 	ld [MBC3RTC], a
 	call CloseSRAM
 	ret
@@ -80,7 +80,7 @@ SaveRTC:
 	ld hl, MBC3RTC
 	ld a, RTC_DH
 	ld [MBC3SRamBank], a
-	res 7, [hl]
+	res RTC_DH_OVERFLOW, [hl]
 	ld a, BANK(sRTCStatusFlags)
 	ld [MBC3SRamBank], a
 	xor a
@@ -93,9 +93,7 @@ StartClock::
 	call _FixDays
 	call FixDays
 	jr nc, .skip_set
-	; bit 5: Day count exceeds 139
-	; bit 6: Day count exceeds 255
-	call RecordRTCStatus ; set flag on sRTCStatusFlags
+	call RecordRTCStatus
 
 .skip_set
 	call StartRTC
@@ -103,27 +101,26 @@ StartClock::
 
 _FixDays:
 	ld hl, hRTCDayHi
-	bit 7, [hl]
-	jr nz, .set_bit_7
-	bit 6, [hl]
-	jr nz, .set_bit_7
+	bit RTC_DH_OVERFLOW, [hl]
+	jr nz, .reset_rtc
+	bit RTC_DH_HALT, [hl]
+	jr nz, .reset_rtc
 	xor a
 	ret
 
-.set_bit_7
-	; Day count exceeds 16383
-	ld a, %10000000
-	call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
+.reset_rtc
+	ld a, RTC_RESET
+	call RecordRTCStatus
 	ret
 
 ClockContinue:
 	call CheckRTCStatus
 	ld c, a
-	and %11000000 ; Day count exceeded 255 or 16383
+	and RTC_RESET | RTC_DAYS_EXCEED_255
 	jr nz, .time_overflow
 
 	ld a, c
-	and %00100000 ; Day count exceeded 139
+	and RTC_DAYS_EXCEED_139
 	jr z, .dont_update
 
 	call UpdateTime

engine/rtc/timeset.asm

@@ -541,7 +541,7 @@ SetDayOfWeek:
 
 InitialSetDSTFlag:
 	ld a, [wDST]
-	set 7, a
+	set DST_F, a
 	ld [wDST], a
 	hlcoord 1, 14
 	lb bc, 3, 18
@@ -568,7 +568,7 @@ InitialSetDSTFlag:
 
 InitialClearDSTFlag:
 	ld a, [wDST]
-	res 7, a
+	res DST_F, a
 	ld [wDST], a
 	hlcoord 1, 14
 	lb bc, 3, 18
@@ -631,7 +631,7 @@ MrChrono: ; unreferenced
 	inc hl
 
 	ld a, [wDST]
-	bit 7, a
+	bit DST_F, a
 	jr z, .off
 
 	ld [hl], "O"