alex/gba
1
0
Fork 0
mirror of https://github.com/italicsjenga/gba.git synced 2024-12-23 19:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lokathor

Browse source
This commit is contained in:
Lokathor 2019-01-12 13:38:16 -07:00
parent bc10122d58 de62113e86
commit a1e35a9ed1
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linker.ld
View file

@ -26,6 +26,12 @@ SECTIONS {
__data_end = ABSOLUTE(.);
} >iwram AT>rom = 0xff
.bss : {
*(.bss .bss.*);
. = ALIGN(4);
__bss_end = ABSOLUTE(.);
} >iwram
/* debugging sections */
/* Stabs */
.stab 0 : { *(.stab) }

4
src/io/background.rs
View file

@ -71,9 +71,9 @@ pub const BG0HOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_00
pub const BG0VOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0012) };
/// BG1 X-Offset. Write only. Text mode only. 9 bits.
pub const BG1HOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0012) };
pub const BG1HOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0014) };
/// BG1 Y-Offset. Write only. Text mode only. 9 bits.
pub const BG1VOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0012) };
pub const BG1VOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0016) };
/// BG2 X-Offset. Write only. Text mode only. 9 bits.
pub const BG2HOFS: VolAddress<u16> = unsafe { VolAddress::new_unchecked(0x400_0018) };

14
src/oam.rs
View file

@ -130,9 +130,9 @@ impl OBJAttr2 {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct ObjectAttributes {
attr0: OBJAttr0,
attr1: OBJAttr1,
attr2: OBJAttr2,
pub attr0: OBJAttr0,
pub attr1: OBJAttr1,
pub attr2: OBJAttr2,
}
/// The object attributes, but there are gaps in the array, so we must not
@ -160,10 +160,10 @@ pub fn read_obj_attributes(slot: usize) -> Option<ObjectAttributes> {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct AffineParameters {
pa: i16,
pb: i16,
pc: i16,
pd: i16,
pub pa: i16,
pub pb: i16,
pub pc: i16,
pub pd: i16,
}
// TODO: find the correct fixed-point type here.