Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update hardware.inc to 5.2.0

Browse Source
This commit is contained in:
Rangi42
2025-07-22 11:57:50 -04:00
parent d9ae564440
commit 306d1497c1
2 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
audio/engine.asm
View File

@@ -14,27 +14,28 @@ _InitSound::
push bc push bc
push af push af
call MusicOff call MusicOff
ld hl, rAUDVOL ; channel control registers ld hl, rAUDVOL ; channel control registers
xor a xor a
ld [hli], a ; rAUDVOL ; volume/vin ld [hli], a ; rAUDVOL ; volume/vin
ld [hli], a ; rAUDTERM ; sfx channels ld [hli], a ; rAUDTERM ; sfx channels
ld a, $80 ; all channels on ld a, $80 ; all channels on
ld [hli], a ; rAUDENA ; music channels ld [hli], a ; rAUDENA ; music channels
ld hl, rAUD1SWEEP ; sound channel registers ld hl, AUD1RAM ; sound channel registers
ld e, NUM_MUSIC_CHANS ld e, NUM_MUSIC_CHANS
.clearsound .clearsound
; sound channel 1 2 3 4 ; channel AUD1RAM, AUD2RAM, AUD3RAM, AUD4RAM
xor a xor a
ld [hli], a ; rAUD1SWEEP, rNR20, rAUD3ENA, rNR40 ; sweep = 0 ld [hli], a ; rAUD1SWEEP, unused, rAUD3ENA, unused ; sweep = 0
ld [hli], a ; rAUD1LEN, rAUD2LEN, rAUD3LEN, rAUD4LEN ; length/wavepattern = 0 ld [hli], a ; rAUD1LEN, rAUD2LEN, rAUD3LEN, rAUD4LEN ; length/wavepattern = 0
ld a, $8 ld a, $8
ld [hli], a ; rAUD1ENV, rAUD2ENV, rAUD3LEVEL, rAUD4ENV ; envelope = 0 ld [hli], a ; rAUD1ENV, rAUD2ENV, rAUD3LEVEL, rAUD4ENV ; envelope = 0
xor a xor a
ld [hli], a ; rAUD1LOW, rAUD2LOW, rAUD3LOW, rAUD4POLY ; frequency lo = 0 ld [hli], a ; rAUD1LOW, rAUD2LOW, rAUD3LOW, rAUD4POLY ; frequency lo = 0
ld a, $80 ld a, $80
ld [hli], a ; rAUD1HIGH, rAUD2HIGH, rAUD3HIGH, rAUD4GO ; restart sound (freq hi = 0) ld [hli], a ; rAUD1HIGH, rAUD2HIGH, rAUD3HIGH, rAUD4GO ; restart sound (freq hi = 0)
dec e dec e
jr nz, .clearsound jr nz, .clearsound
@@ -293,7 +294,7 @@ UpdateChannels:
ldh a, [rAUDENA] ldh a, [rAUDENA]
and %10001110 ; ch1 off and %10001110 ; ch1 off
ldh [rAUDENA], a ldh [rAUDENA], a
ld hl, rAUD1SWEEP ld hl, AUD1RAM
call ClearChannel call ClearChannel
ret ret
@@ -353,7 +354,7 @@ UpdateChannels:
ldh a, [rAUDENA] ldh a, [rAUDENA]
and %10001101 ; ch2 off and %10001101 ; ch2 off
ldh [rAUDENA], a ldh [rAUDENA], a
ld hl, rAUD2LEN - 1 ; there is no rNR20 ld hl, AUD2RAM
call ClearChannel call ClearChannel
ret ret
@@ -399,7 +400,7 @@ UpdateChannels:
ldh a, [rAUDENA] ldh a, [rAUDENA]
and %10001011 ; ch3 off and %10001011 ; ch3 off
ldh [rAUDENA], a ldh [rAUDENA], a
ld hl, rAUD3ENA ld hl, AUD3RAM
call ClearChannel call ClearChannel
ret ret
@@ -491,7 +492,7 @@ endr
ldh a, [rAUDENA] ldh a, [rAUDENA]
and %10000111 ; ch4 off and %10000111 ; ch4 off
ldh [rAUDENA], a ldh [rAUDENA], a
ld hl, rAUD4LEN - 1 ; there is no rNR40 ld hl, AUD4RAM
call ClearChannel call ClearChannel
ret ret
@@ -2798,13 +2799,14 @@ ChannelPointers:
ClearChannels:: ClearChannels::
; runs ClearChannel for all 4 channels ; runs ClearChannel for all 4 channels
ld hl, rAUDVOL ld hl, rAUDVOL ; channel control registers
xor a xor a
ld [hli], a ld [hli], a ; rAUDVOL ; volume/vin
ld [hli], a ld [hli], a ; rAUDTERM ; sfx channels
ld a, $80 ld a, $80 ; all channels on
ld [hli], a ld [hli], a ; rAUDENA ; music channels
ld hl, rAUD1SWEEP ld hl, AUD1RAM
ld e, NUM_MUSIC_CHANS ld e, NUM_MUSIC_CHANS
.loop .loop
call ClearChannel call ClearChannel
@@ -2813,20 +2815,20 @@ ClearChannels::
ret ret
ClearChannel: ClearChannel:
; input: hl = beginning hw sound register (rAUD1SWEEP, rNR20, rAUD3ENA, rNR40) ; input: hl = beginning hw sound register (AUD1RAM, AUD2RAM, AUD3RAM, AUD4RAM)
; output: 00 00 80 00 80 ; output: 00 00 80 00 80
; sound channel 1 2 3 4 ; channel AUD1RAM, AUD2RAM, AUD3RAM, AUD4RAM
xor a xor a
ld [hli], a ; rAUD1SWEEP, rNR20, rAUD3ENA, rNR40 ; sweep = 0 ld [hli], a ; rAUD1SWEEP, unused, rAUD3ENA, unused ; sweep = 0
ld [hli], a ; rAUD1LEN, rAUD2LEN, rAUD3LEN, rAUD4LEN ; length/wavepattern = 0 ld [hli], a ; rAUD1LEN, rAUD2LEN, rAUD3LEN, rAUD4LEN ; length/wavepattern = 0
ld a, $8 ld a, $8
ld [hli], a ; rAUD1ENV, rAUD2ENV, rAUD3LEVEL, rAUD4ENV ; envelope = 0 ld [hli], a ; rAUD1ENV, rAUD2ENV, rAUD3LEVEL, rAUD4ENV ; envelope = 0
xor a xor a
ld [hli], a ; rAUD1LOW, rAUD2LOW, rAUD3LOW, rAUD4POLY ; frequency lo = 0 ld [hli], a ; rAUD1LOW, rAUD2LOW, rAUD3LOW, rAUD4POLY ; frequency lo = 0
ld a, $80 ld a, $80
ld [hli], a ; rAUD1HIGH, rAUD2HIGH, rAUD3HIGH, rAUD4GO ; restart sound (freq hi = 0) ld [hli], a ; rAUD1HIGH, rAUD2HIGH, rAUD3HIGH, rAUD4GO ; restart sound (freq hi = 0)
ret ret
PlayTrainerEncounterMusic:: PlayTrainerEncounterMusic::

37
constants/hardware.inc
View File

@@ -22,7 +22,7 @@ endc
; Define the include guard and the current hardware.inc version ; Define the include guard and the current hardware.inc version
; (do this after the RGBDS version check since the `def` syntax depends on it) ; (do this after the RGBDS version check since the `def` syntax depends on it)
def HARDWARE_INC equ 1 def HARDWARE_INC equ 1
def HARDWARE_INC_VERSION equs "5.1.0" def HARDWARE_INC_VERSION equs "5.2.0"
; Usage: rev_Check_hardware_inc <min_ver> ; Usage: rev_Check_hardware_inc <min_ver>
; Examples: ; Examples:
@@ -66,7 +66,7 @@ def B_JOYP_DOWN equ 3 ; 0 = Down is pressed (if reading Control Pad) [ro]
def B_JOYP_UP equ 2 ; 0 = Up is pressed (if reading Control Pad) [ro] def B_JOYP_UP equ 2 ; 0 = Up is pressed (if reading Control Pad) [ro]
def B_JOYP_LEFT equ 1 ; 0 = Left is pressed (if reading Control Pad) [ro] def B_JOYP_LEFT equ 1 ; 0 = Left is pressed (if reading Control Pad) [ro]
def B_JOYP_RIGHT equ 0 ; 0 = Right is pressed (if reading Control Pad) [ro] def B_JOYP_RIGHT equ 0 ; 0 = Right is pressed (if reading Control Pad) [ro]
def JOYP_INPUTS equ %0000_1111 def JOYP_INPUTS equ %0000_1111 ; bits equal to 0 indicate pressed (when reading inputs)
def JOYP_START equ 1 << B_JOYP_START def JOYP_START equ 1 << B_JOYP_START
def JOYP_SELECT equ 1 << B_JOYP_SELECT def JOYP_SELECT equ 1 << B_JOYP_SELECT
def JOYP_B equ 1 << B_JOYP_B def JOYP_B equ 1 << B_JOYP_B
@@ -422,8 +422,6 @@ def B_AUDENA_ENABLE_CH1 equ 0 ; 1 = channel 1 is running [ro]
; -- AUD3WAVE ($FF30-$FF3F) --------------------------------------------------- ; -- AUD3WAVE ($FF30-$FF3F) ---------------------------------------------------
; Audio channel 3 wave pattern RAM [r/w] ; Audio channel 3 wave pattern RAM [r/w]
def _AUD3WAVERAM equ $FF30 ; $FF30-$FF3F
def rAUD3WAVE_0 equ $FF30 def rAUD3WAVE_0 equ $FF30
def rAUD3WAVE_1 equ $FF31 def rAUD3WAVE_1 equ $FF31
def rAUD3WAVE_2 equ $FF32 def rAUD3WAVE_2 equ $FF32
@@ -441,8 +439,6 @@ def rAUD3WAVE_D equ $FF3D
def rAUD3WAVE_E equ $FF3E def rAUD3WAVE_E equ $FF3E
def rAUD3WAVE_F equ $FF3F def rAUD3WAVE_F equ $FF3F
def AUD3WAVE_SIZE equ 16
; -- LCDC ($FF40) ------------------------------------------------------------- ; -- LCDC ($FF40) -------------------------------------------------------------
; PPU graphics control ; PPU graphics control
def rLCDC equ $FF40 def rLCDC equ $FF40
@@ -551,7 +547,7 @@ def rWY equ $FF4A
; X coordinate of the Window's top-left pixel, plus 7 (7-166) [r/w] ; X coordinate of the Window's top-left pixel, plus 7 (7-166) [r/w]
def rWX equ $FF4B def rWX equ $FF4B
def WX_OFS equ 7 ; subtract this to get the actual Window Y coordinate def WX_OFS equ 7 ; subtract this to get the actual Window X coordinate
; -- SYS / KEY0 ($FF4C) ------------------------------------------------------- ; -- SYS / KEY0 ($FF4C) -------------------------------------------------------
; (CGB boot ROM only) CPU mode select ; (CGB boot ROM only) CPU mode select
@@ -606,7 +602,7 @@ def rVDMA_SRC_LOW equ $FF52
; (CGB only) VRAM DMA destination address (high 8 bits) [wo] ; (CGB only) VRAM DMA destination address (high 8 bits) [wo]
def rVDMA_DEST_HIGH equ $FF53 def rVDMA_DEST_HIGH equ $FF53
; -- VDMA_DEST_LOW / HDMA3 ($FF54) -------------------------------------------- ; -- VDMA_DEST_LOW / HDMA4 ($FF54) --------------------------------------------
; (CGB only) VRAM DMA destination address (low 8 bits) [wo] ; (CGB only) VRAM DMA destination address (low 8 bits) [wo]
def rVDMA_DEST_LOW equ $FF54 def rVDMA_DEST_LOW equ $FF54
@@ -812,7 +808,7 @@ def rRTCREG equ $A000
; ** MBC5 only **************************************************************** ; ** MBC5 only ****************************************************************
; -- ROMB0 ($2000-$3FFF) ------------------------------------------------------ ; -- ROMB0 ($2000-$2FFF) ------------------------------------------------------
; ROM bank number low byte (bits 0-7) [wo] ; ROM bank number low byte (bits 0-7) [wo]
def rROMB0 equ $2000 def rROMB0 equ $2000
@@ -868,12 +864,14 @@ def RAMREG_ENABLE equ $40
; Latch accelerometer start [wo] ; Latch accelerometer start [wo]
def rACCLATCH0 equ $A000 def rACCLATCH0 equ $A000
; Write $55 to ACCLATCH0 to erase the latched data
def ACCLATCH0_START equ $55 def ACCLATCH0_START equ $55
; -- ACCLATCH1 ($Ax1x) -------------------------------------------------------- ; -- ACCLATCH1 ($Ax1x) --------------------------------------------------------
; Latch accelerometer finish [wo] ; Latch accelerometer finish [wo]
def rACCLATCH1 equ $A010 def rACCLATCH1 equ $A010
; Write $AA to ACCLATCH1 to latch the accelerometer and update ACCEL*
def ACCLATCH1_FINISH equ $AA def ACCLATCH1_FINISH equ $AA
; -- ACCELX0 ($Ax2x) ---------------------------------------------------------- ; -- ACCELX0 ($Ax2x) ----------------------------------------------------------
@@ -903,6 +901,7 @@ def rEEPROM equ $A080
; IR register [r/w] ; IR register [r/w]
def rIRREG equ $A000 def rIRREG equ $A000
; whether the IR transmitter sees light
def IR_LED_OFF equ $C0 def IR_LED_OFF equ $C0
def IR_LED_ON equ $C1 def IR_LED_ON equ $C1
@@ -938,6 +937,12 @@ def COLOR_SIZE equ 2 ; size of color in bytes (little-endian BGR555)
def PAL_COLORS equ 4 ; colors per palette def PAL_COLORS equ 4 ; colors per palette
def PAL_SIZE equ COLOR_SIZE * PAL_COLORS ; size of palette in bytes def PAL_SIZE equ COLOR_SIZE * PAL_COLORS ; size of palette in bytes
; (DMG only) grayscale shade indexes for BGP, OBP0, and OBP1
def SHADE_WHITE equ %00
def SHADE_LIGHT equ %01
def SHADE_DARK equ %10
def SHADE_BLACK equ %11
; Tilemaps the BG or Window can read from (controlled by LCDC) ; Tilemaps the BG or Window can read from (controlled by LCDC)
def TILEMAP0 equ $9800 ; $9800-$9BFF def TILEMAP0 equ $9800 ; $9800-$9BFF
def TILEMAP1 equ $9C00 ; $9C00-$9FFF def TILEMAP1 equ $9C00 ; $9C00-$9FFF
@@ -986,6 +991,20 @@ def OAM_COUNT equ 40 ; how many OBJs there are room for in OAM
def OAM_SIZE equ OBJ_SIZE * OAM_COUNT def OAM_SIZE equ OBJ_SIZE * OAM_COUNT
;******************************************************************************
; Audio channel RAM addresses
;******************************************************************************
def AUD1RAM equ $FF10 ; $FF10-$FF14
def AUD2RAM equ $FF15 ; $FF15-$FF19
def AUD3RAM equ $FF1A ; $FF1A-$FF1E
def AUD4RAM equ $FF1F ; $FF1F-$FF23
def AUDRAM_SIZE equ 5 ; size of each audio channel RAM in bytes
def _AUD3WAVERAM equ $FF30 ; $FF30-$FF3F
def AUD3WAVE_SIZE equ 16 ; size of wave pattern RAM in bytes
;****************************************************************************** ;******************************************************************************
; Interrupt vector addresses ; Interrupt vector addresses
;****************************************************************************** ;******************************************************************************