xm: add new songs

src/playlist.cpp

@@ -3,9 +3,10 @@
 #include "playlist.hpp"
 
 #include "xm.h"
-#include "xm/milkypack01.xm.h"
+#include "xm/CloudsAhead.xm.h"
-#include "xm/CottageFantasy2.xm.h"
+#include "xm/CottageFantasy.xm.h"
-#include "xm/CloudsAhead6.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",
+      .title = "Clouds Ahead",
-      .start = (int)&_binary_xm_CottageFantasy2_xm_start,
+      .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",
+      .title = "Red Blossom",
-      .start = (int)&_binary_xm_CloudsAhead6_xm_start,
+      .start = (int)&_binary_xm_RedBlossom_xm_start,
-      .cover_ix = scene::tracker::cover::mountain,
+      .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",

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);

xm/CloudsAhead.xm.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#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

xm/CloudsAhead6.xm.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#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

xm/CottageFantasy.xm.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#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

xm/CottageFantasy2.xm.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#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

xm/RedBlossom.xm.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#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

xm/TheClockOfElery.xm.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#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

xm/milkypack01.xm.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#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

xm_player.mk

@@ -1,7 +1,8 @@
 XM_OBJ = \
-	xm/milkypack01.xm.o \
+	xm/CloudsAhead.xm.o \
-	xm/CottageFantasy2.xm.o \
+	xm/CottageFantasy.xm.o \
-	xm/CloudsAhead6.xm.o \
+	xm/RedBlossom.xm.o \
+	xm/TheClockOfElery.xm.o \
 	xm/SummerDreamsDemoTrackv4.xm.o
 
 TEXTURE_OBJ = \