diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /constants/hardware_constants.asm | |
| parent | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff) | |
| parent | 33456b8fb28ef547a54d04d22baa2313b72fdb1d (diff) | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'constants/hardware_constants.asm')
| -rw-r--r-- | constants/hardware_constants.asm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 21a3ad93..9f2aa1b7 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -22,14 +22,6 @@ JOYPAD EQU 4 LY_VBLANK EQU 145 -; OAM attribute flags -OAM_PALETTE EQU %111 -OAM_TILE_BANK EQU 3 -OAM_OBP_NUM EQU 4 ; Non CGB Mode Only -OAM_X_FLIP EQU 5 -OAM_Y_FLIP EQU 6 -OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) - ; serial START_TRANSFER_EXTERNAL_CLOCK EQU $80 START_TRANSFER_INTERNAL_CLOCK EQU $81 @@ -68,7 +60,7 @@ rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Inital (R/W) +rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) rNR52 EQU $ff26 ; Sound on/off |