thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't include old audio constants

Browse source
This commit is contained in:
dannye 2021-04-03 20:15:12 -05:00
parent a3bfcb1abf
commit e2220aaa57
4 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants.asm
View file

@ -29,7 +29,7 @@ INCLUDE "constants/map_data_constants.asm"
INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/map_object_constants.asm"
INCLUDE "constants/hide_show_constants.asm" INCLUDE "constants/hide_show_constants.asm"
INCLUDE "constants/credits_constants.asm" INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/audio_constants.asm" ;INCLUDE "constants/audio_constants.asm"
INCLUDE "constants/music_constants.asm" INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_constants.asm"

32
constants/audio_constants.asm
View file

@ -1,18 +1,18 @@
; pitch ; pitch
; Audio[1|2|3]_Pitches indexes (see audio/notes.asm) ; Audio[1|2|3]_Pitches indexes (see audio/notes.asm)
; const_def const_def
; const C_ ; 0 const C_ ; 0
; const C# ; 1 const C# ; 1
; const D_ ; 2 const D_ ; 2
; const D# ; 3 const D# ; 3
; const E_ ; 4 const E_ ; 4
; const F_ ; 5 const F_ ; 5
; const F# ; 6 const F# ; 6
; const G_ ; 7 const G_ ; 7
; const G# ; 8 const G# ; 8
; const A_ ; 9 const A_ ; 9
; const A# ; A const A# ; A
; const B_ ; B const B_ ; B
; channel ; channel
; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks, ; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks,
@ -22,13 +22,13 @@
const Ch2 ; 1 const Ch2 ; 1
const Ch3 ; 2 const Ch3 ; 2
const Ch4 ; 3 const Ch4 ; 3
;NUM_MUSIC_CHANS EQU const_value NUM_MUSIC_CHANS EQU const_value
const Ch5 ; 4 const Ch5 ; 4
const Ch6 ; 5 const Ch6 ; 5
const Ch7 ; 6 const Ch7 ; 6
const Ch8 ; 7 const Ch8 ; 7
;NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
;NUM_CHANNELS EQU const_value NUM_CHANNELS EQU const_value
; HW sound channel register base addresses ; HW sound channel register base addresses
HW_CH1_BASE EQU LOW(rNR10) HW_CH1_BASE EQU LOW(rNR10)

9
constants/music_constants.asm
View file

@ -2,9 +2,10 @@
; SFX_Headers_(1|2|3) indexes (see audio/headers/*.asm) ; SFX_Headers_(1|2|3) indexes (see audio/headers/*.asm)
;music_const: MACRO ;music_const: MACRO
;\1 EQUS "RB(\2)" ;\1 EQUS "((\2 - SFX_Headers_1) / 3)"
;ENDM ;ENDM
const_value = 1
const_def 1
const MUSIC_PALLET_TOWN const MUSIC_PALLET_TOWN
const MUSIC_POKECENTER const MUSIC_POKECENTER
@ -57,6 +58,7 @@ const_value = 1
const NUM_SONGS const NUM_SONGS
const_def const_def
const SFX_CRY_00 const SFX_CRY_00
const SFX_CRY_01 const SFX_CRY_01
const SFX_CRY_02 const SFX_CRY_02
@ -96,7 +98,8 @@ const_value = 1
const SFX_CRY_24 const SFX_CRY_24
const SFX_CRY_25 const SFX_CRY_25
const_value = 1 const_def 1
; AUDIO_1 AUDIO_3 ; AUDIO_1 AUDIO_3
const SFX_GET_ITEM_1 const SFX_GET_ITEM_1

9
crysaudio/audio_constants.asm
View file

@ -29,6 +29,15 @@ NUM_MUSIC_CHANS EQU const_value
NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
NUM_CHANNELS EQU const_value NUM_CHANNELS EQU const_value
Ch1 EQU CHAN1
Ch2 EQU CHAN2
Ch3 EQU CHAN3
Ch4 EQU CHAN4
Ch5 EQU CHAN5
Ch6 EQU CHAN6
Ch7 EQU CHAN7
Ch8 EQU CHAN8
; channel_struct members (see macros/wram.asm) ; channel_struct members (see macros/wram.asm)
CHANNEL_MUSIC_ID EQUS "(wChannel1MusicID - wChannel1)" CHANNEL_MUSIC_ID EQUS "(wChannel1MusicID - wChannel1)"
CHANNEL_MUSIC_BANK EQUS "(wChannel1MusicBank - wChannel1)" CHANNEL_MUSIC_BANK EQUS "(wChannel1MusicBank - wChannel1)"