diff --git a/src/playlist.cpp b/src/playlist.cpp index 555b3ae..9ee1799 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -5,6 +5,7 @@ #include "xm.h" #include "xm/milkypack01.xm.h" #include "xm/CottageFantasy2.xm.h" +#include "xm/CloudsAhead6.xm.h" namespace playlist { @@ -14,12 +15,16 @@ namespace playlist { const static playlist_item playlist[] = { { - "leon du star", - (int)&_binary_xm_milkypack01_xm_start, + "Shiroiii", + (int)&_binary_xm_CottageFantasy2_xm_start, }, { "Shiroiii", - (int)&_binary_xm_CottageFantasy2_xm_start, + (int)&_binary_xm_CloudsAhead6_xm_start, + }, + { + "leon du star", + (int)&_binary_xm_milkypack01_xm_start, }, }; @@ -31,7 +36,7 @@ namespace playlist { if (state.playlist_ix >= playlist_length) state.playlist_ix = 0; - printf("deferred_load\n"); + printf("next deferred_load playlist_ix %d\n", state.playlist_ix); interpreter::deferred_load(playlist[state.playlist_ix].start); } @@ -41,6 +46,7 @@ namespace playlist { if (state.playlist_ix < 0) state.playlist_ix = playlist_length - 1; + printf("prev deferred_load playlist_ix %d\n", state.playlist_ix); interpreter::deferred_load(playlist[state.playlist_ix].start); } } diff --git a/xm/CloudsAhead6.xm b/xm/CloudsAhead6.xm new file mode 100644 index 0000000..1538e85 Binary files /dev/null and b/xm/CloudsAhead6.xm differ diff --git a/xm/CloudsAhead6.xm.h b/xm/CloudsAhead6.xm.h new file mode 100644 index 0000000..cf48f6c --- /dev/null +++ b/xm/CloudsAhead6.xm.h @@ -0,0 +1,15 @@ +#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_player.mk b/xm_player.mk index c421959..15b4142 100644 --- a/xm_player.mk +++ b/xm_player.mk @@ -1,6 +1,7 @@ XM_OBJ = \ xm/milkypack01.xm.o \ - xm/CottageFantasy2.xm.o + xm/CottageFantasy2.xm.o \ + xm/CloudsAhead6.xm.o TEXTURE_OBJ = \ font/tandy1k.data.o \