diff --git a/agb/src/global_asm.rs b/agb/src/global_asm.rs index 15182dc9..b16f19b2 100644 --- a/agb/src/global_asm.rs +++ b/agb/src/global_asm.rs @@ -1,5 +1,8 @@ use core::arch::global_asm; +global_asm!(include_str!("asm_include.s")); + global_asm!(include_str!("crt0.s")); global_asm!(include_str!("interrupt_handler.s")); global_asm!(include_str!("sound/mixer/mixer.s")); +global_asm!(include_str!("save/asm_routines.s")); diff --git a/agb/src/save/asm_routines.s b/agb/src/save/asm_routines.s index 7dab8516..43173c2d 100644 --- a/agb/src/save/asm_routines.s +++ b/agb/src/save/asm_routines.s @@ -1,5 +1,3 @@ -.include "src/asm_include.s" - @ @ char WramReadByte(const char* offset); @ diff --git a/agb/src/save/mod.rs b/agb/src/save/mod.rs index 324f0b98..915f89ed 100644 --- a/agb/src/save/mod.rs +++ b/agb/src/save/mod.rs @@ -90,16 +90,12 @@ use crate::sync::{Mutex, RawMutexGuard}; use crate::timer::Timer; use core::ops::Range; -use core::arch::global_asm; - mod asm_utils; mod eeprom; mod flash; mod sram; mod utils; -global_asm!(include_str!("asm_routines.s")); - /// A list of save media types. #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)] #[non_exhaustive] diff --git a/agb/src/sound/mixer/mixer.s b/agb/src/sound/mixer/mixer.s index d5536980..04210d2a 100644 --- a/agb/src/sound/mixer/mixer.s +++ b/agb/src/sound/mixer/mixer.s @@ -1,5 +1,3 @@ -.include "src/asm_include.s" - .section .iwram.buffer_size .global agb_rs__buffer_size .balign 4