From 4ea75bc06430ae50a29fb355f36fa3e4c5e8b113 Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 25 Apr 2023 20:57:18 +0100 Subject: [PATCH] add amplitude to combo rom --- examples/combo/Cargo.lock | 8 ++++++++ examples/combo/Cargo.toml | 1 + examples/combo/gfx/amplitude.png | Bin 0 -> 1844 bytes examples/combo/gfx/games.aseprite | Bin 10151 -> 0 bytes examples/combo/gfx/hyperspace.png | Bin 3758 -> 2588 bytes examples/combo/src/lib.rs | 12 +++++++++--- 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 examples/combo/gfx/amplitude.png delete mode 100644 examples/combo/gfx/games.aseprite diff --git a/examples/combo/Cargo.lock b/examples/combo/Cargo.lock index e623a679..b39df590 100644 --- a/examples/combo/Cargo.lock +++ b/examples/combo/Cargo.lock @@ -85,6 +85,13 @@ dependencies = [ "version_check", ] +[[package]] +name = "amplitude" +version = "0.1.0" +dependencies = [ + "agb", +] + [[package]] name = "asefile" version = "0.3.5" @@ -167,6 +174,7 @@ name = "combo" version = "0.1.0" dependencies = [ "agb", + "amplitude", "hyperspace-roll", "the-hat-chooses-the-wizard", "the-purple-night", diff --git a/examples/combo/Cargo.toml b/examples/combo/Cargo.toml index d27c394e..e9d93b33 100644 --- a/examples/combo/Cargo.toml +++ b/examples/combo/Cargo.toml @@ -10,6 +10,7 @@ agb = { version = "0.14.0", path = "../../agb" } the-purple-night = { path = "../the-purple-night" } the-hat-chooses-the-wizard = { path = "../the-hat-chooses-the-wizard" } hyperspace-roll = { path = "../hyperspace-roll" } +amplitude = { path = "../amplitude" } [profile.dev] diff --git a/examples/combo/gfx/amplitude.png b/examples/combo/gfx/amplitude.png new file mode 100644 index 0000000000000000000000000000000000000000..2086f1cbb6fa3b34f1fc414ad109571bc4619db7 GIT binary patch literal 1844 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 M07*qoM6N<$f{9f%aR2}S diff --git a/examples/combo/src/lib.rs b/examples/combo/src/lib.rs index 0092078a..42c9180c 100644 --- a/examples/combo/src/lib.rs +++ b/examples/combo/src/lib.rs @@ -21,6 +21,7 @@ pub enum Game { TheHatChoosesTheWizard, ThePurpleNight, HyperspaceRoll, + Amplitude, } impl Game { @@ -29,6 +30,7 @@ impl Game { Game::TheHatChoosesTheWizard => the_hat_chooses_the_wizard::main(gba), Game::ThePurpleNight => the_purple_night::main(gba), Game::HyperspaceRoll => hyperspace_roll::main(gba), + Game::Amplitude => amplitude::main(gba), } } @@ -37,6 +39,7 @@ impl Game { 0 => Game::TheHatChoosesTheWizard, 1 => Game::ThePurpleNight, 2 => Game::HyperspaceRoll, + 3 => Game::Amplitude, _ => unreachable!("game out of index in an unreachable manner"), } } @@ -46,7 +49,8 @@ include_background_gfx!( games, "121105", hat => "gfx/hat.png", purple => "gfx/purple.png", - hyperspace => "gfx/hyperspace.png" + hyperspace => "gfx/hyperspace.png", + amplitude => "gfx/amplitude.png" ); fn get_game(gba: &mut agb::Gba) -> Game { @@ -58,13 +62,15 @@ fn get_game(gba: &mut agb::Gba) -> Game { let hat = TileSet::new(games::hat.tiles, TileFormat::FourBpp); let purple = TileSet::new(games::purple.tiles, TileFormat::FourBpp); let hyperspace = TileSet::new(games::hyperspace.tiles, TileFormat::FourBpp); + let amplitude = TileSet::new(games::amplitude.tiles, TileFormat::FourBpp); - let tiles = [hat, purple, hyperspace]; + let tiles = [hat, purple, hyperspace, amplitude]; let palette_assignments = &[ games::hat.palette_assignments, games::purple.palette_assignments, games::hyperspace.palette_assignments, + games::amplitude.palette_assignments, ]; vram.set_background_palettes(games::PALETTES); @@ -79,7 +85,7 @@ fn get_game(gba: &mut agb::Gba) -> Game { let y = pos.y.rem_euclid(20); let x = pos.x.rem_euclid(30); - let game = (pos.x).rem_euclid(90) as usize / 30; + let game = (pos.x).rem_euclid(tiles.len() as i32 * 30) as usize / 30; let tile_id = (y * 30 + x) as usize; ( &tiles[game],