alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-10-17 23:51:36 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243 from corwinkuiper/hatwiz-fixes

Browse source 
Hatwiz fixes
This commit is contained in:
Gwilym Kuiper 2022-06-22 21:39:54 +01:00 committed by GitHub
parent e0e6686ac3 ccec26706e
commit 067a994ab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
examples/the-hat-chooses-the-wizard/src/main.rs
View file

@ -503,6 +503,22 @@ impl<'a> Player<'a> {
_ => (0, 8).into(),
};
match self.facing {
agb::input::Tri::Negative => {
self.wizard.sprite.set_hflip(true);
self.hat
.sprite
.set_sprite(controller.sprite(hat_base_tile.sprite(5)));
}
agb::input::Tri::Positive => {
self.wizard.sprite.set_hflip(false);
self.hat
.sprite
.set_sprite(controller.sprite(hat_base_tile.sprite(0)));
}
_ => {}
}
match self.hat_state {
HatState::Thrown => {
// hat is thrown, make hat move towards wizard
@ -554,21 +570,6 @@ impl<'a> Player<'a> {
self.hat_slow_counter = 0;
self.hat_left_range = false;
self.hat.position = self.wizard.position - hat_resting_position;
match self.facing {
agb::input::Tri::Negative => {
self.wizard.sprite.set_hflip(true);
self.hat
.sprite
.set_sprite(controller.sprite(hat_base_tile.sprite(5)));
}
agb::input::Tri::Positive => {
self.wizard.sprite.set_hflip(false);
self.hat
.sprite
.set_sprite(controller.sprite(hat_base_tile.sprite(0)));
}
_ => {}
}
}
HatState::WizardTowards => {
self.hat.sprite.set_sprite(
@ -806,6 +807,9 @@ fn main(mut agb: agb::Gba) -> ! {
);
loop {
world_display.commit(&mut vram);
world_display.show();
vram.set_background_palettes(tile_sheet::background.palettes);
let object = agb.display.object.get();