Skip to content

Commit 23eaa16

Browse files
rawr51919ISSOtm
andauthored
Add the rest of the constants/register definitions (#31)
Fixes #16 Fixes #21 Co-authored-by: Eldred Habert <[email protected]>
1 parent ea902ef commit 23eaa16

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

hardware.inc

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
;* Rev 4.4 - 11-Jan-22 : Deprecate VRAM CART_SRAM_2KB constant (avivace)
3333
;* Rev 4.5 - 03-Mar-22 : Added bit number definitions for OCPS, BCPS and LCDC (sukus)
3434
;* Rev 4.6 - 15-Jun-22 : Added MBC3 registers and special values
35+
;* Rev 4.7.0 - 27-Jun-22 : Added alternate names for some constants
3536

3637
; NOTE: REVISION NUMBER CHANGES MUST BE REFLECTED
3738
; IN `rev_Check_hardware_inc` BELOW!
@@ -50,7 +51,8 @@ DEF HARDWARE_INC EQU 1
5051
; rev_Check_hardware_inc 4.1 (equivalent to 4.1.0)
5152
; rev_Check_hardware_inc 4 (equivalent to 4.0.0)
5253
MACRO rev_Check_hardware_inc
53-
DEF CUR_VER equs "4,6,0" ; ** UPDATE THIS LINE WHEN CHANGING THE REVISION NUMBER **
54+
DEF CUR_VER equs "4,7,0" ; ** UPDATE THIS LINE WHEN CHANGING THE REVISION NUMBER **
55+
5456
DEF MIN_VER equs STRRPL("\1", ".", ",")
5557
DEF INTERNAL_CHK equs """MACRO ___internal
5658
IF \\1 != \\4 || \\2 < \\5 || (\\2 == \\5 && \\3 < \\6)
@@ -744,39 +746,49 @@ DEF RPF_DATAIN EQU %00000010 ; 0=Receiving IR Signal, 1=Normal
744746
DEF RPF_WRITE_HI EQU %00000001
745747
DEF RPF_WRITE_LO EQU %00000000
746748

749+
DEF RPB_DATAIN EQU 1
750+
747751

748752
; --
749-
; -- BCPS ($FF68)
750-
; -- Background Color Palette Specification (R/W)
753+
; -- BCPS/BGPI ($FF68)
754+
; -- Background Color Palette Specification (aka Background Palette Index) (R/W)
751755
; --
752756
DEF rBCPS EQU $FF68
757+
DEF rBGPI EQU rBCPS
753758

754759
DEF BCPSF_AUTOINC EQU %10000000 ; Auto Increment (0=Disabled, 1=Increment after Writing)
755760
DEF BCPSB_AUTOINC EQU 7
761+
DEF BGPIF_AUTOINC EQU BCPSF_AUTOINC
762+
DEF BGPIB_AUTOINC EQU BCPSB_AUTOINC
756763

757764

758765
; --
759-
; -- BCPD ($FF69)
760-
; -- Background Color Palette Data (R/W)
766+
; -- BCPD/BGPD ($FF69)
767+
; -- Background Color Palette Data (aka Background Palette Data) (R/W)
761768
; --
762769
DEF rBCPD EQU $FF69
770+
DEF rBGPD EQU rBCPD
763771

764772

765773
; --
766-
; -- OCPS ($FF6A)
767-
; -- Object Color Palette Specification (R/W)
774+
; -- OCPS/OBPI ($FF6A)
775+
; -- Object Color Palette Specification (aka Object Background Palette Index) (R/W)
768776
; --
769777
DEF rOCPS EQU $FF6A
778+
DEF rOBPI EQU rOCPS
770779

771780
DEF OCPSF_AUTOINC EQU %10000000 ; Auto Increment (0=Disabled, 1=Increment after Writing)
772781
DEF OCPSB_AUTOINC EQU 7
782+
DEF OBPIF_AUTOINC EQU OCPSF_AUTOINC
783+
DEF OBPIB_AUTOINC EQU OCPSB_AUTOINC
773784

774785

775786
; --
776-
; -- OCPD ($FF6B)
777-
; -- Object Color Palette Data (R/W)
787+
; -- OCPD/OBPD ($FF6B)
788+
; -- Object Color Palette Data (aka Object Background Palette Data) (R/W)
778789
; --
779790
DEF rOCPD EQU $FF6B
791+
DEF rOBPD EQU rOCPD
780792

781793

782794
; --
@@ -862,7 +874,6 @@ DEF AUDENV_DOWN EQU %00000000
862874
; -- Can be used with AUD1HIGH, AUD2HIGH, AUD3HIGH
863875
; -- See AUD1HIGH for more info
864876
; --
865-
866877
DEF AUDHIGH_RESTART EQU %10000000
867878
DEF AUDHIGH_LENGTH_ON EQU %01000000
868879
DEF AUDHIGH_LENGTH_OFF EQU %00000000
@@ -997,7 +1008,7 @@ DEF PADB_A EQU $0
9971008
;***************************************************************************
9981009

9991010
DEF SCRN_X EQU 160 ; Width of screen in pixels
1000-
DEF SCRN_Y EQU 144 ; Height of screen in pixels
1011+
DEF SCRN_Y EQU 144 ; Height of screen in pixels. Also corresponds to the value in LY at the beginning of VBlank.
10011012
DEF SCRN_X_B EQU 20 ; Width of screen in bytes
10021013
DEF SCRN_Y_B EQU 18 ; Height of screen in bytes
10031014

0 commit comments

Comments
 (0)