From 926dd3db88bb73a4298f002e8f440c58fcf9a59e Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 11 Aug 2026 15:33:53 -0400 Subject: [PATCH] Rename `RAMB_RTC_DH_*` flags to `RTCREG_DH_*` --- hardware.inc | 14 ++++++++------ hardware_compat.inc | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hardware.inc b/hardware.inc index bcb3cbe..54e963a 100644 --- a/hardware.inc +++ b/hardware.inc @@ -815,12 +815,6 @@ def RAMB_RTC_M equ $09 ; minutes counter (0-59) def RAMB_RTC_H equ $0A ; hours counter (0-23) def RAMB_RTC_DL equ $0B ; days counter, low byte (0-255) def RAMB_RTC_DH equ $0C ; days counter, high bit and other flags - def B_RAMB_RTC_DH_CARRY equ 7 ; 1 = days counter overflowed [r/w] - def B_RAMB_RTC_DH_HALT equ 6 ; 0 = run timer, 1 = stop timer [r/w] - def B_RAMB_RTC_DH_HIGH equ 0 ; days counter, high bit (bit 8) [r/w] - def RAMB_RTC_DH_CARRY equ 1 << B_RAMB_RTC_DH_CARRY - def RAMB_RTC_DH_HALT equ 1 << B_RAMB_RTC_DH_HALT - def RAMB_RTC_DH_HIGH equ 1 << B_RAMB_RTC_DH_HIGH def B_RAMB_RUMBLE equ 3 ; (MBC5 and MBC7 only) enable the rumble motor (if any) def RAMB_RUMBLE equ 1 << B_RAMB_RUMBLE @@ -859,6 +853,14 @@ def RTCLATCH_FINISH equ $01 ; RTC register [r/w] def rRTCREG equ $A000 +; Applicable after writing RAMB_RTC_DH to RAMB +def B_RTCREG_DH_CARRY equ 7 ; 1 = days counter overflowed [r/w] +def B_RTCREG_DH_HALT equ 6 ; 0 = run timer, 1 = stop timer [r/w] +def B_RTCREG_DH_HIGH equ 0 ; days counter, high bit (bit 8) [r/w] + def RTCREG_DH_CARRY equ 1 << B_RTCREG_DH_CARRY + def RTCREG_DH_HALT equ 1 << B_RTCREG_DH_HALT + def RTCREG_DH_HIGH equ 1 << B_RTCREG_DH_HIGH + ; ** MBC5 only **************************************************************** diff --git a/hardware_compat.inc b/hardware_compat.inc index 140b481..effd613 100644 --- a/hardware_compat.inc +++ b/hardware_compat.inc @@ -312,12 +312,18 @@ def RTC_M equ RAMB_RTC_M def RTC_H equ RAMB_RTC_H def RTC_DL equ RAMB_RTC_DL def RTC_DH equ RAMB_RTC_DH - def RTC_DHB_CARRY equ B_RAMB_RTC_DH_CARRY - def RTC_DHB_HALT equ B_RAMB_RTC_DH_HALT - def RTC_DHB_HIGH equ B_RAMB_RTC_DH_HIGH - def RTC_DHF_CARRY equ RAMB_RTC_DH_CARRY - def RTC_DHF_HALT equ RAMB_RTC_DH_HALT - def RTC_DHF_HIGH equ RAMB_RTC_DH_HIGH + def RTC_DHB_CARRY equ B_RTCREG_DH_CARRY + def RTC_DHB_HALT equ B_RTCREG_DH_HALT + def RTC_DHB_HIGH equ B_RTCREG_DH_HIGH + def RTC_DHF_CARRY equ RTCREG_DH_CARRY + def RTC_DHF_HALT equ RTCREG_DH_HALT + def RTC_DHF_HIGH equ RTCREG_DH_HIGH + def B_RAMB_RTC_DH_CARRY equ B_RTCREG_DH_CARRY + def B_RAMB_RTC_DH_HALT equ B_RTCREG_DH_HALT + def B_RAMB_RTC_DH_HIGH equ B_RTCREG_DH_HIGH + def RAMB_RTC_DH_CARRY equ RTCREG_DH_CARRY + def RAMB_RTC_DH_HALT equ RTCREG_DH_HALT + def RAMB_RTC_DH_HIGH equ RTCREG_DH_HIGH def CARTB_RUMBLE_ON equ B_RAMB_RUMBLE def CARTF_RUMBLE_ON equ RAMB_RUMBLE