diff -ru a/feline/src/fe_scene_butano.cpp b/feline/src/fe_scene_butano.cpp --- a/feline/src/fe_scene_butano.cpp +++ b/feline/src/fe_scene_butano.cpp @@ -24,11 +24,9 @@ //assets #include "bn_sprite_items_butano.h" #include "bn_sprite_items_explosion.h" -#include "bn_affine_bg_items_gbajam_splash.h" #include "bn_regular_bg_items_butano_background.h" #include "bn_regular_bg_items_butano_colour.h" -#include "bn_music_items.h" #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" diff -ru a/feline/src/fe_scene_death.cpp b/feline/src/fe_scene_death.cpp --- a/feline/src/fe_scene_death.cpp +++ b/feline/src/fe_scene_death.cpp @@ -24,7 +24,6 @@ #include "bn_sprite_items_rip.h" #include "bn_affine_bg_items_title.h" -#include "bn_music_items.h" #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" @@ -43,7 +42,6 @@ _player->set_can_teleport(false); _player->set_hp(9); - bn::music_items::mystic.play(); bn::sprite_text_generator text_generator(variable_8x8_sprite_font); bn::vector text_sprites; diff -ru a/feline/src/fe_scene_dungeon_return.cpp b/feline/src/fe_scene_dungeon_return.cpp --- a/feline/src/fe_scene_dungeon_return.cpp +++ b/feline/src/fe_scene_dungeon_return.cpp @@ -46,7 +46,6 @@ #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -62,8 +61,6 @@ int kill_timer = 0; - bn::music_items::mellowdy.play(); - bn::music::set_volume(0.2); // map bn::affine_bg_ptr map = bn::affine_bg_items::dungeon_other.create_bg(512, 512); diff -ru a/feline/src/fe_scene_dungeon.cpp b/feline/src/fe_scene_dungeon.cpp --- a/feline/src/fe_scene_dungeon.cpp +++ b/feline/src/fe_scene_dungeon.cpp @@ -46,7 +46,6 @@ #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -58,8 +57,6 @@ { // spawn_location = bn::fixed_point(760, 900); - bn::music_items::mellowdy.play(); - bn::music::set_volume(0.2); bn::camera_ptr camera = bn::camera_ptr::create(spawn_location.x(), spawn_location.y()); diff -ru a/feline/src/fe_scene_end.cpp b/feline/src/fe_scene_end.cpp --- a/feline/src/fe_scene_end.cpp +++ b/feline/src/fe_scene_end.cpp @@ -33,7 +33,6 @@ #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" namespace fe { @@ -52,7 +51,6 @@ bn::affine_bg_ptr map = bn::affine_bg_items::title.create_bg(0, 0); bn::fixed_point init_pos = bn::fixed_point(-70, 44); - bn::music_items::mystic.play(); bn::sprite_text_generator text_generator(variable_8x8_sprite_font); bn::vector text_sprites; diff -ru a/feline/src/fe_scene_gba.cpp b/feline/src/fe_scene_gba.cpp --- a/feline/src/fe_scene_gba.cpp +++ b/feline/src/fe_scene_gba.cpp @@ -24,11 +24,8 @@ //assets #include "bn_sprite_items_rip.h" -#include "bn_affine_bg_items_gbajam_splash.h" -#include "bn_regular_bg_items_splash.h" #include "bn_regular_bg_items_loading_bg.h" -#include "bn_music_items.h" #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" @@ -38,17 +35,7 @@ Scene GBA::execute() { - - bn::regular_bg_ptr map = bn::regular_bg_items::splash.create_bg(0 , 0); - int timer = 0; - while(true) - { - if(timer > 180){ - return Scene::BUTANO; - } - - ++timer; - bn::core::update(); - } + // The GBA Jam 2021 splash screen was removed (its logo is only licensed for the jam submission itself). + return Scene::BUTANO; +} } -} \ No newline at end of file diff -ru a/feline/src/fe_scene_house.cpp b/feline/src/fe_scene_house.cpp --- a/feline/src/fe_scene_house.cpp +++ b/feline/src/fe_scene_house.cpp @@ -31,7 +31,6 @@ #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -45,8 +44,6 @@ bn::camera_ptr camera = bn::camera_ptr::create(spawn_location.x(), spawn_location.y()); - bn::music_items::piana.play(); - bn::music::set_volume(0.7); //NPC NPC tortoise = NPC(bn::fixed_point(380, 376), camera, NPC_TYPE::TORTOISE, text_generator); diff -ru a/feline/src/fe_scene_lab_after.cpp b/feline/src/fe_scene_lab_after.cpp --- a/feline/src/fe_scene_lab_after.cpp +++ b/feline/src/fe_scene_lab_after.cpp @@ -41,7 +41,6 @@ #include "fe_tooltip.h" -#include "bn_music_items.h" #include "bn_music_actions.h" #include "bn_blending_actions.h" diff -ru a/feline/src/fe_scene_lab.cpp b/feline/src/fe_scene_lab.cpp --- a/feline/src/fe_scene_lab.cpp +++ b/feline/src/fe_scene_lab.cpp @@ -40,7 +40,6 @@ #include "fe_tooltip.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -54,8 +53,6 @@ // spawn_location = bn::fixed_point(447, 661); bn::sprite_text_generator text_generator(variable_8x8_sprite_font); - bn::music_items::wiskedaway.play(); - bn::music::set_volume(0.1); // map bn::affine_bg_ptr map = bn::affine_bg_items::lab.create_bg(512, 512); diff -ru a/feline/src/fe_scene_loading.cpp b/feline/src/fe_scene_loading.cpp --- a/feline/src/fe_scene_loading.cpp +++ b/feline/src/fe_scene_loading.cpp @@ -23,10 +23,8 @@ #include "bn_regular_bg_items_lab_bg.h" #include "bn_regular_bg_items_loading_bg_other.h" -#include "bn_music_items.h" #include "bn_music_actions.h" -#include "bn_music_items.h" namespace fe { @@ -35,9 +33,7 @@ bn::fixed_point init_pos = bn::fixed_point(0, 0); if(next_scene == Scene::OTHER){ - bn::music_items::crystal.play(); } else { - bn::music::set_volume(0.3); } // player sprite diff -ru a/feline/src/fe_scene_other.cpp b/feline/src/fe_scene_other.cpp --- a/feline/src/fe_scene_other.cpp +++ b/feline/src/fe_scene_other.cpp @@ -41,7 +41,6 @@ #include "fe_tooltip.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -54,8 +53,6 @@ bn::camera_ptr camera = bn::camera_ptr::create(spawn_location.x(), spawn_location.y()); bn::sprite_text_generator text_generator(variable_8x8_sprite_font); - bn::music_items::sanctuary.play(); - bn::music::set_volume(0.8); // map bn::affine_bg_ptr map = bn::affine_bg_items::other.create_bg(512, 512); diff -ru a/feline/src/fe_scene_sky_return.cpp b/feline/src/fe_scene_sky_return.cpp --- a/feline/src/fe_scene_sky_return.cpp +++ b/feline/src/fe_scene_sky_return.cpp @@ -31,7 +31,6 @@ #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -46,8 +45,6 @@ bn::sprite_text_generator text_generator(variable_8x8_sprite_font); - bn::music_items::piana.play(); - bn::music::set_volume(0.6); //NPC NPC penguin = NPC(bn::fixed_point(231, 376), camera, NPC_TYPE::PENGUIN2, text_generator); diff -ru a/feline/src/fe_scene_sky.cpp b/feline/src/fe_scene_sky.cpp --- a/feline/src/fe_scene_sky.cpp +++ b/feline/src/fe_scene_sky.cpp @@ -30,7 +30,6 @@ #include "bn_sprite_text_generator.h" #include "variable_8x8_sprite_font.h" -#include "bn_music_items.h" #include "bn_music_actions.h" namespace fe @@ -45,8 +44,6 @@ bn::sprite_text_generator text_generator(variable_8x8_sprite_font); - bn::music_items::piana.play(); - bn::music::set_volume(0.6); //NPC NPC penguin = NPC(bn::fixed_point(231, 376), camera, NPC_TYPE::PENGUIN, text_generator); diff -ru a/feline/src/fe_scene_title.cpp b/feline/src/fe_scene_title.cpp --- a/feline/src/fe_scene_title.cpp +++ b/feline/src/fe_scene_title.cpp @@ -29,7 +29,6 @@ #include "bn_sprite_items_title_2.h" #include "bn_regular_bg_items_title.h" -#include "bn_music_items.h" namespace fe { @@ -48,7 +47,6 @@ bn::regular_bg_ptr map = bn::regular_bg_items::title.create_bg(0, 0); bn::fixed_point init_pos = bn::fixed_point(-70, 44); - bn::music_items::mystic.play(); // player sprite bn::sprite_ptr cat_sprite = bn::sprite_items::cat_sprite.create_sprite(init_pos.x(), init_pos.y());