summaryrefslogtreecommitdiff
path: root/constants/audio_constants.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-22 12:57:02 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-22 12:57:02 -0400
commit3b4ea37c363b70ea1683059329879466dec4a094 (patch)
tree430b2260d025fc28880ce3f76882d97dcd50507d /constants/audio_constants.asm
parent268e2cae0b98779cfb0c590ab9612151c752e868 (diff)
Replace enum with const, and update many constants to be more like pokegold
Diffstat (limited to 'constants/audio_constants.asm')
-rw-r--r--constants/audio_constants.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index f960501..9c11e36 100644
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -5,11 +5,11 @@
const CHAN3
const CHAN4
NUM_MUSIC_CHANS EQU const_value
-NUM_NOISE_CHANS EQU const_value
const CHAN5
const CHAN6
const CHAN7
const CHAN8
+NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
NUM_CHANNELS EQU const_value
; channel_struct members (see macros/wram.asm)
@@ -52,6 +52,8 @@ CHANNEL_FIELD2F EQUS "(wChannel1Field2f - wChannel1)"
CHANNEL_FIELD30 EQUS "(wChannel1Field30 - wChannel1)"
CHANNEL_STRUCT_LENGTH EQUS "(wChannel2 - wChannel1)"
+NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7
+
; Flags1
const_def
const SOUND_CHANNEL_ON ; 0