alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Rename get_colour to colour

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-23 20:41:24 +00:00
parent 123e8caaa4
commit 81853c6c99
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agb/src/display/palette16.rs
View file

@ -16,7 +16,7 @@ impl Palette16 {
self.colours[index] = colour; self.colours[index] = colour;
} }
pub fn get_colour(&self, index: usize) -> u16 { pub fn colour(&self, index: usize) -> u16 {
self.colours[index] self.colours[index]
} }
} }

6
examples/the-purple-night/src/main.rs
View file

@ -2160,8 +2160,8 @@ impl<'a> Game<'a> {
fn update_sunrise(vram: &mut VRamManager, time: u16) { fn update_sunrise(vram: &mut VRamManager, time: u16) {
let mut modified_palette = background::background.palettes[0].clone(); let mut modified_palette = background::background.palettes[0].clone();
let a = modified_palette.get_colour(0); let a = modified_palette.colour(0);
let b = modified_palette.get_colour(1); let b = modified_palette.colour(1);
modified_palette.update_colour(0, interpolate_colour(a, 17982, time, 120)); modified_palette.update_colour(0, interpolate_colour(a, 17982, time, 120));
modified_palette.update_colour(1, interpolate_colour(b, 22427, time, 120)); modified_palette.update_colour(1, interpolate_colour(b, 22427, time, 120));
@ -2174,7 +2174,7 @@ impl<'a> Game<'a> {
fn update_fade_out(vram: &mut VRamManager, time: u16) { fn update_fade_out(vram: &mut VRamManager, time: u16) {
let mut modified_palette = background::background.palettes[0].clone(); let mut modified_palette = background::background.palettes[0].clone();
let c = modified_palette.get_colour(2); let c = modified_palette.colour(2);
modified_palette.update_colour(0, interpolate_colour(17982, 0x7FFF, time, 600)); modified_palette.update_colour(0, interpolate_colour(17982, 0x7FFF, time, 600));
modified_palette.update_colour(1, interpolate_colour(22427, 0x7FFF, time, 600)); modified_palette.update_colour(1, interpolate_colour(22427, 0x7FFF, time, 600));