replace music track

evanbowman · Apr 29, 2020 · 0ad29a5 · 0ad29a5
1 parent ad0e8e4
commit 0ad29a5
Show file tree

Hide file tree

Showing 7 changed files with 103,272 additions and 119,702 deletions.
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -71,7 +71,7 @@ if(GAMEBOY_ADVANCE)
     ${SOURCES}
     ${SOURCE_DIR}/platform/memcpy.s
     ${SOURCE_DIR}/platform/sb_omega.s
-    ${SOURCE_DIR}/platform/sb_ephemera.s
+    ${SOURCE_DIR}/platform/sb_computations.s
     ${SOURCE_DIR}/platform/frostellar.s
     ${SOURCE_DIR}/graphics/overlay.s
     ${SOURCE_DIR}/graphics/tilesheet.s

diff --git a/source/game.cpp b/source/game.cpp
@@ -264,7 +264,7 @@ const ZoneInfo& zone_info(Level level)
                                                "the depths",
                                                "spritesheet2",
                                                "tilesheet2",
-                                               "sb_ephemera",
+                                               "sb_computations",
                                                seconds(5),
                                                ColorConstant::turquoise_blue,
                                                ColorConstant::safety_orange};

diff --git a/source/platform/gba_platform.cpp b/source/platform/gba_platform.cpp
@@ -1471,7 +1471,7 @@ void Platform::Speaker::play_note(Note n, Octave o, Channel c)
 #define REG_TM0CNT_H *(u16*)0x4000102            //Timer 0 Control
 
 
-#include "sb_ephemera.hpp"
+#include "sb_computations.hpp"
 #include "frostellar.hpp"
 #include "sb_omega.hpp"
 
@@ -1494,7 +1494,7 @@ static const struct AudioTrack {
     int length_;
 } music_tracks[] = {DEF_AUDIO(ambience, frostellar),
                     DEF_AUDIO(sb_omega, sb_omega),
-                    DEF_AUDIO(sb_ephemera, sb_ephemera)};
+                    DEF_AUDIO(sb_computations, sb_computations)};
 
 
 static const AudioTrack* find_track(const char* name)

diff --git a/source/platform/sb_computations.hpp b/source/platform/sb_computations.hpp
@@ -0,0 +1,3 @@
+#pragma once
+constexpr int sb_computationsLen = 1468576;
+extern const unsigned char sb_computations[sb_computationsLen];
diff --git a/source/platform/sb_computations.s b/source/platform/sb_computations.s
diff --git a/source/platform/sb_ephemera.hpp b/source/platform/sb_ephemera.hpp
diff --git a/source/platform/sb_ephemera.s b/source/platform/sb_ephemera.s