Skip to content

Commit 4f8fc23

Browse files
committed
2.6: Added GBC OAM and cart defines (AntonioND)
1 parent efd1a42 commit 4f8fc23

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

hardware.inc

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
;* Rev 2.3 - : Fixed incorrect _HRAM equate
2121
;* Rev 2.4 - 27-Apr-13 : Added some cart defines (AntonioND)
2222
;* Rev 2.5 - 03-May-15 : Fixed format (AntonioND)
23-
;* Rev 2.6 - 04-Apr-16 : Added GBC OAM and cart defines (AntonioND)
23+
;* Rev 2.6 - 09-Apr-16 : Added GBC OAM and cart defines (AntonioND)
2424

2525
; If all of these are already defined, don't do it again.
2626

@@ -65,8 +65,15 @@ OAMF_PAL0 EQU %00000000 ; Palette number; 0,1 (DMG)
6565
OAMF_PAL1 EQU %00010000 ; Palette number; 0,1 (DMG)
6666
OAMF_BANK0 EQU %00000000 ; Bank number; 0,1 (GBC)
6767
OAMF_BANK1 EQU %00001000 ; Bank number; 0,1 (GBC)
68+
6869
OAMF_PALMASK EQU %00000111 ; Palette (GBC)
6970

71+
OAMB_PRI EQU 7 ; Priority
72+
OAMB_YFLIP EQU 6 ; Y flip
73+
OAMB_XFLIP EQU 5 ; X flip
74+
OAMB_PAL1 EQU 4 ; Palette number; 0,1 (DMG)
75+
OAMB_BANK1 EQU 3 ; Bank number; 0,1 (GBC)
76+
7077

7178
;***************************************************************************
7279
;*

0 commit comments

Comments
 (0)