FILE SIZE SIGNIFICANTLY REDUCED

also a bug fix, but mostly 300 MBs of fat have been trimmed from the files.

Makefile.xa

@@ -2,22 +2,9 @@ all: \
   iso/music/menu.xa \
   iso/music/week1a.xa \
   iso/music/week1b.xa \
-  iso/music/week2a.xa \
-  iso/music/week2b.xa \
   iso/music/week3a.xa \
   iso/music/week3b.xa \
-  iso/music/week4a.xa \
-  iso/music/week4b.xa \
-  iso/music/week5a.xa \
-  iso/music/week5b.xa \
-  iso/music/week6a.xa \
-  iso/music/week6b.xa \
-  iso/music/week7a.xa \
-  iso/music/week7b.xa \
-  iso/music/clwna.xa \
-  iso/music/clwnb.xa \
-  iso/music/kapia.xa \
-  iso/music/kapib.xa
+
 
 # XA converts
 iso/music/%.xa: iso/music/%.mp3
@@ -29,19 +16,5 @@ iso/music/%.xa:
 iso/music/menu.xa: iso/music/freaky.xa iso/music/gameover.xa
 iso/music/week1a.xa: iso/music/bopeeboi.xa iso/music/bopeebov.xa iso/music/freshi.xa iso/music/freshv.xa
 iso/music/week1b.xa: iso/music/dadbattlei.xa iso/music/dadbattlev.xa iso/music/tutorial.xa
-iso/music/week2a.xa: iso/music/spookeezi.xa iso/music/spookeezv.xa iso/music/southi.xa iso/music/southv.xa
-iso/music/week2b.xa: iso/music/monsteri.xa iso/music/monsterv.xa iso/music/cluckedi.xa iso/music/cluckedv.xa
 iso/music/week3a.xa: iso/music/picoi.xa iso/music/picov.xa iso/music/phillyi.xa iso/music/phillyv.xa
 iso/music/week3b.xa: iso/music/blammedi.xa iso/music/blammedv.xa
-iso/music/week4a.xa: iso/music/satinpantiesi.xa iso/music/satinpantiesv.xa iso/music/highi.xa iso/music/highv.xa
-iso/music/week4b.xa: iso/music/milfi.xa iso/music/milfv.xa iso/music/testi.xa iso/music/testv.xa
-iso/music/week5a.xa: iso/music/cocoai.xa iso/music/cocoav.xa iso/music/eggnogi.xa iso/music/eggnogv.xa
-iso/music/week5b.xa: iso/music/winterhorrorlandi.xa iso/music/winterhorrorlandv.xa
-iso/music/week6a.xa: iso/music/senpaii.xa iso/music/senpaiv.xa iso/music/rosesi.xa iso/music/rosesv.xa
-iso/music/week6b.xa: iso/music/thornsi.xa iso/music/thornsv.xa
-iso/music/week7a.xa: iso/music/ughi.xa iso/music/ughv.xa iso/music/gunsi.xa iso/music/gunsv.xa
-iso/music/week7b.xa: iso/music/stressi.xa iso/music/stressv.xa
-iso/music/clwna.xa: iso/music/improbableoutseti.xa iso/music/improbableoutsetv.xa iso/music/madnessi.xa iso/music/madnessv.xa
-iso/music/clwnb.xa: iso/music/hellclowni.xa iso/music/hellclownv.xa iso/music/expurgationi.xa iso/music/expurgationv.xa
-iso/music/kapia.xa: iso/music/wockyi.xa iso/music/wockyv.xa iso/music/beathoveni.xa iso/music/beathovenv.xa
-iso/music/kapib.xa: iso/music/hairballi.xa iso/music/hairballv.xa iso/music/nyawi.xa iso/music/nyawv.xa

funkin.xml

@@ -255,38 +255,10 @@
 				<dummy sectors="128"/>
 				<file name = "week1b.xa" type = "xa" source = "iso/music/week1b.xa"/>
 				<dummy sectors="128"/>
-				<file name = "week2a.xa" type = "xa" source = "iso/music/week2a.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week2b.xa" type = "xa" source = "iso/music/week2b.xa"/>
-				<dummy sectors="128"/>
 				<file name = "week3a.xa" type = "xa" source = "iso/music/week3a.xa"/>
 				<dummy sectors="128"/>
 				<file name = "week3b.xa" type = "xa" source = "iso/music/week3b.xa"/>
 				<dummy sectors="128"/>
-				<file name = "week4a.xa" type = "xa" source = "iso/music/week4a.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week4b.xa" type = "xa" source = "iso/music/week4b.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week5a.xa" type = "xa" source = "iso/music/week5a.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week5b.xa" type = "xa" source = "iso/music/week5b.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week6a.xa" type = "xa" source = "iso/music/week6a.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week6b.xa" type = "xa" source = "iso/music/week6b.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week7a.xa" type = "xa" source = "iso/music/week7a.xa"/>
-				<dummy sectors="128"/>
-				<file name = "week7b.xa" type = "xa" source = "iso/music/week7b.xa"/>
-				<dummy sectors="128"/>
-				<file name = "kapia.xa" type = "xa" source = "iso/music/kapia.xa"/>
-				<dummy sectors="128"/>
-				<file name = "kapib.xa" type = "xa" source = "iso/music/kapib.xa"/>
-				<dummy sectors="128"/>
-				<file name = "clwna.xa" type = "xa" source = "iso/music/clwna.xa"/>
-				<dummy sectors="128"/>
-				<file name = "clwnb.xa" type = "xa" source = "iso/music/clwnb.xa"/>
-				<dummy sectors="128"/>
 			</dir>
 
 			<!-- Dummy sectors -->

src/audio.h

@@ -9,22 +9,8 @@ typedef enum
 	XA_Menu,   //MENU.XA
 	XA_Week1A, //WEEK1A.XA
 	XA_Week1B, //WEEK1B.XA
-	XA_Week2A, //WEEK2A.XA
-	XA_Week2B, //WEEK2B.XA
 	XA_Week3A, //WEEK3A.XA
 	XA_Week3B, //WEEK3B.XA
-	XA_Week4A, //WEEK4A.XA
-	XA_Week4B, //WEEK4B.XA
-	XA_Week5A, //WEEK5A.XA
-	XA_Week5B, //WEEK5B.XA
-	XA_Week6A, //WEEK6A.XA
-	XA_Week6B, //WEEK6B.XA
-	XA_Week7A, //WEEK7A.XA
-	XA_Week7B, //WEEK7B.XA
-	XA_KapiA,  //KAPIA.XA
-	XA_KapiB,  //KAPIB.XA
-	XA_ClwnA,  //CLWNA.XA
-	XA_ClwnB,  //CLWNB.XA
 
 	XA_Max,
 } XA_File;
@@ -40,50 +26,11 @@ typedef enum
 	//WEEK1B.XA
 	XA_Dadbattle, //DadBattle
 	XA_Tutorial,  //Tutorial
-	//WEEK2A.XA
-	XA_Spookeez, //Spookeez
-	XA_South,    //South
-	//WEEK2B.XA
-	XA_Monster, //Monster
-	XA_Clucked, //Clucked
 	//WEEK3A.XA
 	XA_Pico,   //Pico
 	XA_Philly, //Philly
 	//WEEK3B.XA
 	XA_Blammed, //Blammed
-	//WEEK4A.XA
-	XA_SatinPanties, //Satin Panties
-	XA_High,         //High
-	//WEEK4B.XA
-	XA_MILF, //M.I.L.F
-	XA_Test, //Test
-	//WEEK5A.XA
-	XA_Cocoa,  //Cocoa
-	XA_Eggnog, //Eggnog
-	//WEEK5B.XA
-	XA_WinterHorrorland, //Winter Horrorland
-	//WEEK6A.XA
-	XA_Senpai, //Senpai
-	XA_Roses,  //Roses
-	//WEEK6B.XA
-	XA_Thorns, //Thorns
-	//WEEK7A.XA
-	XA_Ugh,  //Ugh
-	XA_Guns, //Guns
-	//WEEK7B.XA
-	XA_Stress, //Stress
-	//KAPIA.XA
-	XA_Wocky,     //Wocky
-	XA_Beathoven, //Beathoven
-	//KAPIB.XA
-	XA_Hairball, //Hairball
-	XA_Nyaw,     //Nyaw
-	//CLWNA.XA
-	XA_ImprobableOutset, //Improbable Outset
-	XA_Madness,          //Madness
-	//CLWNB.XA
-	XA_Hellclown,   //Hellclown
-	XA_Expurgation, //Expurgation
 
 	XA_TrackMax,
 } XA_Track;

src/audio_def.h

@@ -8,80 +8,27 @@ typedef struct
 
 static const XA_TrackDef xa_tracks[] = {
 	//MENU.XA
-	{XA_Menu, XA_LENGTH(11295)}, //XA_GettinFreaky
+	{XA_Menu, XA_LENGTH(7130)}, //XA_GettinFreaky
 	{XA_Menu, XA_LENGTH(3840)},  //XA_GameOver
 	//WEEK1A.XA
 	{XA_Week1A, XA_LENGTH(18800)}, //XA_Bopeebo
 	{XA_Week1A, XA_LENGTH(17000)}, //XA_Fresh
 	//WEEK1B.XA
 	{XA_Week1B, XA_LENGTH(12100)}, //XA_Dadbattle
 	{XA_Week1B, XA_LENGTH(6800)}, //XA_Tutorial
-	//WEEK2A.XA
-	{XA_Week2A, XA_LENGTH(9923)}, //XA_Spookeez
-	{XA_Week2A, XA_LENGTH(8880)}, //XA_South
-	//WEEK2B.XA
-	{XA_Week2B, XA_LENGTH(17778)}, //XA_Monster
-	{XA_Week2B, XA_LENGTH(11000)}, //XA_Clucked
 	//WEEK3A.XA
 	{XA_Week3A, XA_LENGTH(7100)},  //XA_Pico
 	{XA_Week3A, XA_LENGTH(10000)}, //XA_Philly
 	//WEEK3B.XA
 	{XA_Week3B, XA_LENGTH(10700)}, //XA_Blammed
-	//WEEK4A.XA
-	{XA_Week4A, XA_LENGTH(9300)},  //XA_SatinPanties
-	{XA_Week4A, XA_LENGTH(10300)}, //XA_High
-	//WEEK4B.XA
-	{XA_Week4B, XA_LENGTH(12300)}, //XA_MILF
-	{XA_Week4B, XA_LENGTH(10300)}, //XA_Test
-	//WEEK5A.XA
-	{XA_Week5A, XA_LENGTH(11520)}, //XA_Cocoa
-	{XA_Week5A, XA_LENGTH(9401)},  //XA_Eggnog
-	//WEEK5B.XA
-	{XA_Week5B, XA_LENGTH(13223)}, //XA_WinterHorrorland
-	//WEEK6A.XA
-	{XA_Week6A, XA_LENGTH(9800)}, //XA_Senpai
-	{XA_Week6A, XA_LENGTH(8928)}, //XA_Roses
-	//WEEK6B.XA
-	{XA_Week6B, XA_LENGTH(10298)}, //XA_Thorns
-	//WEEK7A.XA
-	{XA_Week7A, XA_LENGTH(8493)},  //XA_Ugh
-	{XA_Week7A, XA_LENGTH(13866)}, //XA_Guns
-	//WEEK7B.XA
-	{XA_Week7B, XA_LENGTH(12200)}, //XA_Stress
-	//KAPIA.XA
-	{XA_KapiA, XA_LENGTH(12138)}, //XA_Wocky
-	{XA_KapiA, XA_LENGTH(12000)}, //XA_Beathoven
-	//KAPIB.XA
-	{XA_KapiB, XA_LENGTH(17159)}, //XA_Hairball
-	{XA_KapiB, XA_LENGTH(15157)}, //XA_Nyaw
-	//CLWNA.XA
-	{XA_ClwnA, XA_LENGTH(10740)}, //XA_ImprobableOutset
-	{XA_ClwnA, XA_LENGTH(15169)}, //XA_Madness
-	//CLWNB.XA
-	{XA_ClwnB, XA_LENGTH(21886)}, //XA_Hellclown
-	{XA_ClwnB, XA_LENGTH(19550)}, //XA_Expurgation
 };
 
 static const char *xa_paths[] = {
 	"\\MUSIC\\MENU.XA;1",   //XA_Menu
 	"\\MUSIC\\WEEK1A.XA;1", //XA_Week1A
 	"\\MUSIC\\WEEK1B.XA;1", //XA_Week1B
-	"\\MUSIC\\WEEK2A.XA;1", //XA_Week2A
-	"\\MUSIC\\WEEK2B.XA;1", //XA_Week2B
 	"\\MUSIC\\WEEK3A.XA;1", //XA_Week3A
 	"\\MUSIC\\WEEK3B.XA;1", //XA_Week3B
-	"\\MUSIC\\WEEK4A.XA;1", //XA_Week4A
-	"\\MUSIC\\WEEK4B.XA;1", //XA_Week4B
-	"\\MUSIC\\WEEK5A.XA;1", //XA_Week5A
-	"\\MUSIC\\WEEK5B.XA;1", //XA_Week5B
-	"\\MUSIC\\WEEK6A.XA;1", //XA_Week6A
-	"\\MUSIC\\WEEK6B.XA;1", //XA_Week6B
-	"\\MUSIC\\WEEK7A.XA;1", //XA_Week7A
-	"\\MUSIC\\WEEK7B.XA;1", //XA_Week7B
-	"\\MUSIC\\KAPIA.XA;1",  //XA_KapiA
-	"\\MUSIC\\KAPIB.XA;1",  //XA_KapiB
-	"\\MUSIC\\CLWNA.XA;1",  //XA_ClwnA
-	"\\MUSIC\\CLWNB.XA;1",  //XA_ClwnB
 	NULL,
 };
 
@@ -101,50 +48,11 @@ static const XA_Mp3 xa_mp3s[] = {
 	//WEEK1B.XA
 	{"dadbattle", true}, //XA_Dadbattle
 	{"tutorial", false}, //XA_Tutorial
-	//WEEK2A.XA
-	{"spookeez", true}, //XA_Spookeez
-	{"south", true},    //XA_South
-	//WEEK2B.XA
-	{"monster", true}, //XA_Monster
-	{"clucked", true}, //XA_Clucked
 	//WEEK3A.XA
 	{"pico", true},   //XA_Pico
 	{"philly", true}, //XA_Philly
 	//WEEK3B.XA
 	{"blammed", true}, //XA_Blammed
-	//WEEK4A.XA
-	{"satinpanties", true}, //XA_SatinPanties
-	{"high", true},         //XA_High
-	//WEEK4B.XA
-	{"milf", true}, //XA_MILF
-	{"test", true}, //XA_Test
-	//WEEK5A.XA
-	{"cocoa", true},  //XA_Cocoa
-	{"eggnog", true}, //XA_Eggnog
-	//WEEK5B.XA
-	{"winterhorrorland", true}, //XA_WinterHorrorland
-	//WEEK6A.XA
-	{"senpai", true}, //XA_Senpai
-	{"roses", true},  //XA_Roses
-	//WEEK6B.XA
-	{"thorns", true}, //XA_Thorns
-	//WEEK7A.XA
-	{"ugh", true},  //XA_Ugh
-	{"guns", true}, //XA_Guns
-	//WEEK7B.XA
-	{"stress", true}, //XA_Stress
-	//KAPIA.XA
-	{"wocky", true},     //XA_Wocky
-	{"beathoven", true}, //XA_Beathoven
-	//KAPIB.XA
-	{"hairball", true}, //XA_Hairball
-	{"nyaw", true},     //XA_Nyaw
-	//CLWNA.XA
-	{"improbableoutset", true}, //XA_ImprobableOutset
-	{"madness", true}, //XA_Madness
-	//CLWNB.XA
-	{"hellclown", true}, //XA_Hellclown
-	{"expurgation", true}, //XA_Expurgation
 
 	{NULL, false}
 };

src/menu.c

@@ -154,8 +154,8 @@ static void Menu_DifficultySelector(s32 x, s32 y)
 		{{240, 64, 16, 32}, {240, 96, 16, 32}}, //right
 	};
 
-	Gfx_BlitTex(&menu.tex_story, &arrow_src[0][(pad_state.held & PAD_LEFT) != 0], x - 40 - 16, y - 16);
-	Gfx_BlitTex(&menu.tex_story, &arrow_src[1][(pad_state.held & PAD_RIGHT) != 0], x + 40, y - 16);
+	Gfx_BlitTex(&menu.tex_story, &arrow_src[0][(pad_state.held & PAD_LEFT) != 0], x - 40 - 16, y + 23);
+	Gfx_BlitTex(&menu.tex_story, &arrow_src[1][(pad_state.held & PAD_RIGHT) != 0], x + 40, y + 23);
 
 	//Draw difficulty
 	static const RECT diff_srcs[] = {
@@ -165,7 +165,7 @@ static void Menu_DifficultySelector(s32 x, s32 y)
 	};
 
 	const RECT *diff_src = &diff_srcs[menu.page_param.stage.diff];
-	Gfx_BlitTex(&menu.tex_story, diff_src, x - (diff_src->w >> 1), y - 9 + ((pad_state.press & (PAD_LEFT | PAD_RIGHT)) != 0));
+	Gfx_BlitTex(&menu.tex_story, diff_src, x - (diff_src->w >> 1), y + 30 + ((pad_state.press & (PAD_LEFT | PAD_RIGHT)) != 0));
 }
 
 static void Menu_DrawWeek(const char *week, s32 x, s32 y)
@@ -559,7 +559,7 @@ void Menu_Tick(void)
 			}
 
 			//Draw difficulty selector
-			Menu_DifficultySelector(SCREEN_WIDTH - 75, 80);
+			Menu_DifficultySelector(SCREEN_WIDTH - 75, 40);
 
 			//Handle option and selection
 			if (menu.trans_time > 0 && (menu.trans_time -= timer_dt) <= 0)
@@ -917,7 +917,7 @@ void Menu_Tick(void)
 				if (pad_state.press & PAD_CIRCLE)
 				{
 					menu.next_page = MenuPage_Main;
-					menu.next_select = 3; //Options
+					menu.next_select = 2; //Options
 					Trans_Start();
 				}
 			}