diff --git a/agb/src/sound/mixer/hw.rs b/agb/src/sound/mixer/hw.rs index ab24b52..f2dcf45 100644 --- a/agb/src/sound/mixer/hw.rs +++ b/agb/src/sound/mixer/hw.rs @@ -22,8 +22,8 @@ const DMA2_SOURCE_ADDR: MemoryMapped = unsafe { MemoryMapped::new(dma_sourc const DMA2_DEST_ADDR: MemoryMapped = unsafe { MemoryMapped::new(dma_dest_addr(2)) }; const DMA2_CONTROL: MemoryMapped = unsafe { MemoryMapped::new(dma_control_addr(2)) }; -const FIFOA_DEST_ADDR: u32 = 0x0400_00a0; -const FIFOB_DEST_ADDR: u32 = 0x0400_00a4; +const FIFO_A_DEST_ADDR: u32 = 0x0400_00a0; +const FIFO_B_DEST_ADDR: u32 = 0x0400_00a4; const SOUND_CONTROL: MemoryMapped = unsafe { MemoryMapped::new(0x0400_0082) }; const SOUND_CONTROL_X: MemoryMapped = unsafe { MemoryMapped::new(0x0400_0084) }; @@ -56,14 +56,14 @@ pub(super) fn enable_dma_for_sound(sound_memory: &[i8], lr: LeftOrRight) { fn enable_dma1_for_sound(sound_memory: &[i8]) { DMA1_CONTROL.set(0); DMA1_SOURCE_ADDR.set(sound_memory.as_ptr() as u32); - DMA1_DEST_ADDR.set(FIFOA_DEST_ADDR); + DMA1_DEST_ADDR.set(FIFO_A_DEST_ADDR); DMA1_CONTROL.set(DMA_CONTROL_SETTING_FOR_SOUND); } fn enable_dma2_for_sound(sound_memory: &[i8]) { DMA2_CONTROL.set(0); DMA2_SOURCE_ADDR.set(sound_memory.as_ptr() as u32); - DMA2_DEST_ADDR.set(FIFOB_DEST_ADDR); + DMA2_DEST_ADDR.set(FIFO_B_DEST_ADDR); DMA2_CONTROL.set(DMA_CONTROL_SETTING_FOR_SOUND); } diff --git a/agb/src/sound/mixer/mod.rs b/agb/src/sound/mixer/mod.rs index 64b82c4..e0f0ca3 100644 --- a/agb/src/sound/mixer/mod.rs +++ b/agb/src/sound/mixer/mod.rs @@ -306,7 +306,7 @@ impl SoundChannel { /// Creates a new high priority [`SoundChannel`]. /// /// A high priority sound channel will override low priority ones if - /// the mixer runs out of channels. They will also never be overriden + /// the mixer runs out of channels. They will also never be overridden /// by other high priority channels. /// /// High priority channels are intended for background music and for diff --git a/agb/src/sound/mod.rs b/agb/src/sound/mod.rs index f72600e..edfee4f 100644 --- a/agb/src/sound/mod.rs +++ b/agb/src/sound/mod.rs @@ -6,7 +6,7 @@ //! which allows for Game Boy and Game Boy Color style sound effects, or the mixer //! which allows for more advanced sounds. //! -//! The [`dmg`](crate::sound::dmg) module is very rudimentry and doesn't support most of the possible +//! The [`dmg`](crate::sound::dmg) module is very rudimentary and doesn't support most of the possible //! sounds possible. However, it may be expanded in the future. //! //! The [`mixer`](crate::sound::mixer) module is high performance, and allows for playing wav files at