diff --git a/src/playlist.cpp b/src/playlist.cpp index a3bdc8b..db57abf 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -3,9 +3,10 @@ #include "playlist.hpp" #include "xm.h" -#include "xm/milkypack01.xm.h" -#include "xm/CottageFantasy2.xm.h" -#include "xm/CloudsAhead6.xm.h" +#include "xm/CloudsAhead.xm.h" +#include "xm/CottageFantasy.xm.h" +#include "xm/RedBlossom.xm.h" +#include "xm/TheClockOfElery.xm.h" #include "xm/SummerDreamsDemoTrackv4.xm.h" #include "scene/tracker/cover.hpp" @@ -19,15 +20,27 @@ namespace playlist { const playlist_item playlist[] = { { .artist = "Shiroiii", - .title = "CottageFantasy2", - .start = (int)&_binary_xm_CottageFantasy2_xm_start, + .title = "Clouds Ahead", + .start = (int)&_binary_xm_CloudsAhead_xm_start, + .cover_ix = scene::tracker::cover::thebeach, + }, + { + .artist = "Shiroiii", + .title = "Cottage Fantasy", + .start = (int)&_binary_xm_CottageFantasy_xm_start, .cover_ix = scene::tracker::cover::mossycottage, }, { .artist = "Shiroiii", - .title = "CloudsAhead6", - .start = (int)&_binary_xm_CloudsAhead6_xm_start, - .cover_ix = scene::tracker::cover::mountain, + .title = "Red Blossom", + .start = (int)&_binary_xm_RedBlossom_xm_start, + .cover_ix = scene::tracker::cover::redtree, + }, + { + .artist = "Shiroiii", + .title = "The Clock Of Elery", + .start = (int)&_binary_xm_TheClockOfElery_xm_start, + .cover_ix = scene::tracker::cover::clocks, }, { .artist = "Cai", diff --git a/src/scene/tracker/cover.cpp b/src/scene/tracker/cover.cpp index c9466d1..aecba52 100644 --- a/src/scene/tracker/cover.cpp +++ b/src/scene/tracker/cover.cpp @@ -179,7 +179,7 @@ namespace scene::tracker::cover { float z = 1.0 / 3.5f; const vec3& bg = cover.color; - int color = (((int)bg.x) << 24) | (((int)bg.y) << 8) | (((int)bg.z) << 0); + int color = (((int)bg.x) << 16) | (((int)bg.y) << 8) | (((int)bg.z) << 0); quad_type_0(writer, {0, 0, z}, @@ -195,7 +195,7 @@ namespace scene::tracker::cover { if (newbg.x != bg_color.x || newbg.y != bg_color.y || newbg.z != bg_color.z) { bg_color = newbg; - int color = (((int)newbg.x) << 24) | (((int)newbg.y) << 8) | (((int)newbg.z) << 0); + int color = (((int)newbg.x) << 16) | (((int)newbg.y) << 8) | (((int)newbg.z) << 0); background_parameter2(texture_memory_alloc.background[1].start, color); diff --git a/xm/CloudsAhead6.xm b/xm/CloudsAhead.xm similarity index 99% rename from xm/CloudsAhead6.xm rename to xm/CloudsAhead.xm index 1538e85..2118b04 100644 Binary files a/xm/CloudsAhead6.xm and b/xm/CloudsAhead.xm differ diff --git a/xm/CloudsAhead.xm.h b/xm/CloudsAhead.xm.h new file mode 100644 index 0000000..944467f --- /dev/null +++ b/xm/CloudsAhead.xm.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_xm_CloudsAhead_xm_start __asm("_binary_xm_CloudsAhead_xm_start"); +extern uint32_t _binary_xm_CloudsAhead_xm_end __asm("_binary_xm_CloudsAhead_xm_end"); +extern uint32_t _binary_xm_CloudsAhead_xm_size __asm("_binary_xm_CloudsAhead_xm_size"); + +#ifdef __cplusplus +} +#endif diff --git a/xm/CloudsAhead6.xm.h b/xm/CloudsAhead6.xm.h deleted file mode 100644 index cf48f6c..0000000 --- a/xm/CloudsAhead6.xm.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32_t _binary_xm_CloudsAhead6_xm_start __asm("_binary_xm_CloudsAhead6_xm_start"); -extern uint32_t _binary_xm_CloudsAhead6_xm_end __asm("_binary_xm_CloudsAhead6_xm_end"); -extern uint32_t _binary_xm_CloudsAhead6_xm_size __asm("_binary_xm_CloudsAhead6_xm_size"); - -#ifdef __cplusplus -} -#endif diff --git a/xm/CottageFantasy2.xm b/xm/CottageFantasy.xm similarity index 99% rename from xm/CottageFantasy2.xm rename to xm/CottageFantasy.xm index 67e836a..bd79925 100644 Binary files a/xm/CottageFantasy2.xm and b/xm/CottageFantasy.xm differ diff --git a/xm/CottageFantasy.xm.h b/xm/CottageFantasy.xm.h new file mode 100644 index 0000000..3a9d08f --- /dev/null +++ b/xm/CottageFantasy.xm.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_xm_CottageFantasy_xm_start __asm("_binary_xm_CottageFantasy_xm_start"); +extern uint32_t _binary_xm_CottageFantasy_xm_end __asm("_binary_xm_CottageFantasy_xm_end"); +extern uint32_t _binary_xm_CottageFantasy_xm_size __asm("_binary_xm_CottageFantasy_xm_size"); + +#ifdef __cplusplus +} +#endif diff --git a/xm/CottageFantasy2.xm.h b/xm/CottageFantasy2.xm.h deleted file mode 100644 index 038316a..0000000 --- a/xm/CottageFantasy2.xm.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32_t _binary_xm_CottageFantasy2_xm_start __asm("_binary_xm_CottageFantasy2_xm_start"); -extern uint32_t _binary_xm_CottageFantasy2_xm_end __asm("_binary_xm_CottageFantasy2_xm_end"); -extern uint32_t _binary_xm_CottageFantasy2_xm_size __asm("_binary_xm_CottageFantasy2_xm_size"); - -#ifdef __cplusplus -} -#endif diff --git a/xm/RedBlossom.xm b/xm/RedBlossom.xm new file mode 100644 index 0000000..dfaded2 Binary files /dev/null and b/xm/RedBlossom.xm differ diff --git a/xm/RedBlossom.xm.h b/xm/RedBlossom.xm.h new file mode 100644 index 0000000..86f5bdf --- /dev/null +++ b/xm/RedBlossom.xm.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_xm_RedBlossom_xm_start __asm("_binary_xm_RedBlossom_xm_start"); +extern uint32_t _binary_xm_RedBlossom_xm_end __asm("_binary_xm_RedBlossom_xm_end"); +extern uint32_t _binary_xm_RedBlossom_xm_size __asm("_binary_xm_RedBlossom_xm_size"); + +#ifdef __cplusplus +} +#endif diff --git a/xm/TheClockOfElery.xm b/xm/TheClockOfElery.xm new file mode 100644 index 0000000..2d86f38 Binary files /dev/null and b/xm/TheClockOfElery.xm differ diff --git a/xm/TheClockOfElery.xm.h b/xm/TheClockOfElery.xm.h new file mode 100644 index 0000000..f1c88e5 --- /dev/null +++ b/xm/TheClockOfElery.xm.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_xm_TheClockOfElery_xm_start __asm("_binary_xm_TheClockOfElery_xm_start"); +extern uint32_t _binary_xm_TheClockOfElery_xm_end __asm("_binary_xm_TheClockOfElery_xm_end"); +extern uint32_t _binary_xm_TheClockOfElery_xm_size __asm("_binary_xm_TheClockOfElery_xm_size"); + +#ifdef __cplusplus +} +#endif diff --git a/xm/milkypack01.xm b/xm/milkypack01.xm deleted file mode 100644 index 84d6531..0000000 Binary files a/xm/milkypack01.xm and /dev/null differ diff --git a/xm/milkypack01.xm.h b/xm/milkypack01.xm.h deleted file mode 100644 index 98ca287..0000000 --- a/xm/milkypack01.xm.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32_t _binary_xm_milkypack01_xm_start __asm("_binary_xm_milkypack01_xm_start"); -extern uint32_t _binary_xm_milkypack01_xm_end __asm("_binary_xm_milkypack01_xm_end"); -extern uint32_t _binary_xm_milkypack01_xm_size __asm("_binary_xm_milkypack01_xm_size"); - -#ifdef __cplusplus -} -#endif diff --git a/xm_player.mk b/xm_player.mk index 46565b1..c026bd5 100644 --- a/xm_player.mk +++ b/xm_player.mk @@ -1,7 +1,8 @@ XM_OBJ = \ - xm/milkypack01.xm.o \ - xm/CottageFantasy2.xm.o \ - xm/CloudsAhead6.xm.o \ + xm/CloudsAhead.xm.o \ + xm/CottageFantasy.xm.o \ + xm/RedBlossom.xm.o \ + xm/TheClockOfElery.xm.o \ xm/SummerDreamsDemoTrackv4.xm.o TEXTURE_OBJ = \