Album: Reclaim 2 more banks

kandowontu · kandowontu · commit b18f04284b38 · 2025-09-13T00:16:02.000-04:00
diff --git a/CONFIG/mmc3-album.cfg b/CONFIG/mmc3-album.cfg
@@ -163,16 +163,16 @@ SEGMENTS {
     DAT_BANK_34:   load = ROM_M_34, type = ro, optional = yes;
     DAT_BANK_35:   load = ROM_M_35, type = ro, optional = yes;
     DAT_BANK_36:   load = ROM_M_36, type = ro, optional = yes;
+    DAT_BANK_37:   load = ROM_M_37, type = ro, optional = yes;
+    DAT_BANK_38:   load = ROM_M_38, type = ro, optional = yes;
 
-    SFX_BANK:      load = ROM_M_37, type = ro, optional = yes;
+    SFX_BANK:      load = ROM_M_39, type = ro, optional = yes;
 
-    PCM_BANK_B:    load = ROM_M_38, type = ro, optional = yes;
-    PCM_BANK:      load = ROM_M_39, type = ro, optional = yes;
+    PCM_BANK_B:    load = ROM_M_3A, type = ro, optional = yes;
+    PCM_BANK:      load = ROM_M_3B, type = ro, optional = yes;
 
-    XCD_BANK_06:   load = ROM_M_3A, type = ro, optional = yes;
-    XCD_BANK_05:   load = ROM_M_3B, type = ro, optional = yes;
-    XCD_BANK_04:   load = ROM_M_3C, type = ro, optional = yes;
-    XCD_BANK_03:   load = ROM_M_3D, type = ro, optional = yes;
+    XCD_BANK_06:   load = ROM_M_3C, type = ro, optional = yes;
+    XCD_BANK_05:   load = ROM_M_3D, type = ro, optional = yes;
 
     # Fixed banks
     TVDETECT: load = PRG, type = ro, define = yes, optional = yes, align = $20;
diff --git a/LIB/asm/nesdash.s b/LIB/asm/nesdash.s
@@ -105,7 +105,7 @@ sprite_data = _sprite_data
 ; <empty line>
 ; .export declaration
 ; the function itself
-
+.if !__THE_ALBUM
 ; void __fastcall__ oam_meta_spr_flipped(uint8_t x,uint8_t y,const void *data);
 .segment _PLAYER_RENDER_BANK
 
@@ -170,7 +170,7 @@ end:
 	stx SPRID
 	rts
 .endproc
-
+.endif
 .segment "RODATA"
 
 .export _shiftBy4table := shiftBy4table
@@ -1998,7 +1998,7 @@ early_exit:
 	RTS
 .endproc
 
-
+.if !__THE_ALBUM
 ; void cap_scroll_y_at_top();
 .segment _SCROLL_BANK
 
@@ -2116,7 +2116,7 @@ doit:
 
 	rts
 .endproc
-
+.endif
 
 ; void check_spr_objects();
 .segment "CODE_2"
diff --git a/MUSIC/EXPORTS/lvlset_Album/music_data_header.s b/MUSIC/EXPORTS/lvlset_Album/music_data_header.s
@@ -1,115 +1,115 @@
 ; Generated by export.py using data in metadata.json
 
 ; Music data banks
-.segment "DAT_BANK_02"
+.segment "DAT_BANK_04"
 	firstMusicBankPtr := *
 	.include "music_0.s"
-.segment "DAT_BANK_03"
+.segment "DAT_BANK_05"
 	.include "music_1.s"
-.segment "DAT_BANK_04"
+.segment "DAT_BANK_06"
 	.include "music_2.s"
-.segment "DAT_BANK_05"
+.segment "DAT_BANK_07"
 	.include "music_3.s"
-.segment "DAT_BANK_06"
+.segment "DAT_BANK_08"
 	.include "music_4.s"
-.segment "DAT_BANK_07"
+.segment "DAT_BANK_09"
 	.include "music_5.s"
-.segment "DAT_BANK_08"
+.segment "DAT_BANK_0A"
 	.include "music_6.s"
-.segment "DAT_BANK_09"
+.segment "DAT_BANK_0B"
 	.include "music_7.s"
-.segment "DAT_BANK_0A"
+.segment "DAT_BANK_0C"
 	.include "music_8.s"
-.segment "DAT_BANK_0B"
+.segment "DAT_BANK_0D"
 	.include "music_9.s"
-.segment "DAT_BANK_0C"
+.segment "DAT_BANK_0E"
 	.include "music_10.s"
-.segment "DAT_BANK_0D"
+.segment "DAT_BANK_0F"
 	.include "music_11.s"
-.segment "DAT_BANK_0E"
+.segment "DAT_BANK_10"
 	.include "music_12.s"
-.segment "DAT_BANK_0F"
+.segment "DAT_BANK_11"
 	.include "music_13.s"
-.segment "DAT_BANK_10"
+.segment "DAT_BANK_12"
 	.include "music_14.s"
-.segment "DAT_BANK_11"
+.segment "DAT_BANK_13"
 	.include "music_15.s"
-.segment "DAT_BANK_12"
+.segment "DAT_BANK_14"
 	.include "music_16.s"
-.segment "DAT_BANK_13"
+.segment "DAT_BANK_15"
 	.include "music_17.s"
-.segment "DAT_BANK_14"
+.segment "DAT_BANK_16"
 	.include "music_18.s"
-.segment "DAT_BANK_15"
+.segment "DAT_BANK_17"
 	.include "music_19.s"
-.segment "DAT_BANK_16"
+.segment "DAT_BANK_18"
 	.include "music_20.s"
-.segment "DAT_BANK_17"
+.segment "DAT_BANK_19"
 	.include "music_21.s"
-.segment "DAT_BANK_18"
+.segment "DAT_BANK_1A"
 	.include "music_22.s"
-.segment "DAT_BANK_19"
+.segment "DAT_BANK_1B"
 	.include "music_23.s"
-.segment "DAT_BANK_1A"
+.segment "DAT_BANK_1C"
 	.include "music_24.s"
-.segment "DAT_BANK_1B"
+.segment "DAT_BANK_1D"
 	.include "music_25.s"
-.segment "DAT_BANK_1C"
+.segment "DAT_BANK_1E"
 	.include "music_26.s"
-.segment "DAT_BANK_1D"
+.segment "DAT_BANK_1F"
 	.include "music_27.s"
-.segment "DAT_BANK_1E"
+.segment "DAT_BANK_20"
 	.include "music_28.s"
-.segment "DAT_BANK_1F"
+.segment "DAT_BANK_21"
 	.include "music_29.s"
-.segment "DAT_BANK_20"
+.segment "DAT_BANK_22"
 	.include "music_30.s"
-.segment "DAT_BANK_21"
+.segment "DAT_BANK_23"
 	.include "music_31.s"
-.segment "DAT_BANK_22"
+.segment "DAT_BANK_24"
 	.include "music_32.s"
-.segment "DAT_BANK_23"
+.segment "DAT_BANK_25"
 	.include "music_33.s"
-.segment "DAT_BANK_24"
+.segment "DAT_BANK_26"
 	.include "music_34.s"
-.segment "DAT_BANK_25"
+.segment "DAT_BANK_27"
 	.include "music_35.s"
-.segment "DAT_BANK_26"
+.segment "DAT_BANK_28"
 	.include "music_36.s"
-.segment "DAT_BANK_27"
+.segment "DAT_BANK_29"
 	.include "music_37.s"
-.segment "DAT_BANK_28"
+.segment "DAT_BANK_2A"
 	.include "music_38.s"
-.segment "DAT_BANK_29"
+.segment "DAT_BANK_2B"
 	.include "music_39.s"
-.segment "DAT_BANK_2A"
+.segment "DAT_BANK_2C"
 	.include "music_40.s"
 
 ; DMC banks
-.segment "DAT_BANK_2B"
+.segment "DAT_BANK_2D"
 	firstDMCBankPtr := *
 	.incbin "music_bank0.dmc"
-.segment "DAT_BANK_2C"
+.segment "DAT_BANK_2E"
 	.incbin "music_bank1.dmc"
-.segment "DAT_BANK_2D"
+.segment "DAT_BANK_2F"
 	.incbin "music_bank2.dmc"
-.segment "DAT_BANK_2E"
+.segment "DAT_BANK_30"
 	.incbin "music_bank3.dmc"
-.segment "DAT_BANK_2F"
+.segment "DAT_BANK_31"
 	.incbin "music_bank4.dmc"
-.segment "DAT_BANK_30"
+.segment "DAT_BANK_32"
 	.incbin "music_bank5.dmc"
-.segment "DAT_BANK_31"
+.segment "DAT_BANK_33"
 	.incbin "music_bank6.dmc"
-.segment "DAT_BANK_32"
+.segment "DAT_BANK_34"
 	.incbin "music_bank7.dmc"
-.segment "DAT_BANK_33"
+.segment "DAT_BANK_35"
 	.incbin "music_bank8.dmc"
-.segment "DAT_BANK_34"
+.segment "DAT_BANK_36"
 	.incbin "music_bank9.dmc"
-.segment "DAT_BANK_35"
+.segment "DAT_BANK_37"
 	.incbin "music_bank10.dmc"
-.segment "DAT_BANK_36"
+.segment "DAT_BANK_38"
 	.incbin "music_bank11.dmc"
 
 ; PCM includes
diff --git a/MUSIC/export.py b/MUSIC/export.py
@@ -414,7 +414,7 @@ def exportMusicBank(bin_, fsCmd, modulePath, exportPath, dpcmidx, dpcmAlignerNam
     songNames = [song['Name'] for song in fsTxtData['Song']]
     
     if len(songNames) > 150:
-        lastDatBank = 0x36
+        lastDatBank = 0x38
     else:
         lastDatBank = 0x33
     
diff --git a/SAUCE/defines/space_defines.h b/SAUCE/defines/space_defines.h
@@ -45,10 +45,10 @@
 #define MOVEMENT_BANK "XCD_BANK_01"
 #define BACKGROUND_RENDER_BANK "XCD_BANK_02"
 #define DIALOG_BOX_BANK "XCD_BANK_02"
-#endif
 #define SCROLL_BANK	"XCD_BANK_04"
 #define SPRITE_RENDER_BANK "XCD_BANK_04"
 #define PLAYER_RENDER_BANK "XCD_BANK_05"
 #define RESETLEVEL_BANK "XCD_BANK_05"
+#endif
 #define GROUND_BANK "XCD_BANK_06"
 #define LVLDONE_BANK "XCD_BANK_06"
diff --git a/SAUCE/famidash.c b/SAUCE/famidash.c
@@ -48,10 +48,11 @@ void main(){
     mmc3_disable_irq();
 
     // Initialize controllers
+	#if !__THE_ALBUM
 	mouse.x = 0x78;
 	mouse.y = 0x60;
 	mouse_mask = 1;
-
+	#endif
 	// disable debug mode toggle
 	options &= ~debugtoggle;
 
diff --git a/SAUCE/gamestates/state_savefile_validate.h b/SAUCE/gamestates/state_savefile_validate.h
@@ -1,7 +1,7 @@
 #if !__THE_ALBUM
 CODE_BANK_PUSH("XCD_BANK_02")
 #else
-CODE_BANK_PUSH("XCD_BANK_03")
+CODE_BANK_PUSH("XCD_BANK_05")
 #endif
 void setdefaultoptions();
 
diff --git a/SAUCE/include.h b/SAUCE/include.h
@@ -29,8 +29,10 @@
 #pragma rodata-name (pop)
 #endif
 // grounds go here
+#if !__THE_ALBUM
 #pragma rodata-name (push, "XCD_BANK_05")
 #include "mouse.h"
+#endif
 //#include "mouse.c"
 #pragma rodata-name (pop)
 #if !__THE_ALBUM
diff --git a/SAUCE/include_menus.h b/SAUCE/include_menus.h
@@ -1,9 +1,9 @@
 
-CODE_BANK_PUSH("XCD_BANK_03")
 
 
 
 #if !__THE_ALBUM
+CODE_BANK_PUSH("XCD_BANK_03")
 #include "defines/nametable/menunametable_XCD03.c"
 #include "menustates/common_xcd_bank_03.c"
 #include "menustates/levelselection.c"
@@ -14,23 +14,29 @@ CODE_BANK_PUSH("XCD_BANK_03")
 	#include "menustates/gameover.c"
 	#endif
 #else
+CODE_BANK_PUSH("XCD_BANK_05")
 #include "defines/album_nametable/menunametable_XCD03.c"
 #include "menustates/album_titlescreen.c"
 #endif
 
-CODE_BANK("XCD_BANK_05")
 
 #if __THE_ALBUM
+CODE_BANK("XCD_BANK_06")
 #include "menustates/bgmtest_album.c"
 #else
+CODE_BANK("XCD_BANK_05")
 #include "menustates/bgmtest.c"
 #endif
 
+#if !__THE_ALBUM
 CODE_BANK("XCD_BANK_06")
 
 #include "defines/nametable/menunametable_XCD06.c"
 
+#endif
+
 #if LEVELSET != 'A' && LEVELSET != 0xA1B73
+CODE_BANK("XCD_BANK_06")
 #include "menustates/playmain.c"
 #endif
 
@@ -51,7 +57,7 @@ CODE_BANK("XCD_BANK_02")
 	#include "menustates/settings.c"
 	#endif
 #else
-CODE_BANK("XCD_BANK_03")
+CODE_BANK("XCD_BANK_05")
 #include "defines/palette/palettes_XCD02.c"
 #include "defines/album_nametable/menunametable_XCD02.c"
 #endif
diff --git a/SAUCE/menustates/album_titlescreen.c b/SAUCE/menustates/album_titlescreen.c
@@ -131,6 +131,7 @@ void state_menu() {
 	}	
 
 	if (joypad1.select) cursedmusic = 0x40;
+	else cursedmusic = 0x00;
 	oam_clear();
 	ppu_wait_nmi();
 	tmp7 = newrand() & 255;
diff --git a/SAUCE/menustates/credits.c b/SAUCE/menustates/credits.c
@@ -28,12 +28,20 @@ void credits_loop() {
 	#elif __THE_ALBUM
 		check_if_music_stopped_3();
 	#endif
+
+	#if !__THE_ALBUM
 	if (!forced_credits &&
 		(joypad1.press || ((mouse.connected)
 			? mouse.left_press || mouse.right_press
 			: joypad2.press))) {
 			gameState = STATE_MENU; return;
 	}
+	#else
+	if (!forced_credits &&
+		(joypad1.press || joypad2.press)) {
+			gameState = STATE_MENU; return;
+	}		
+	#endif
 	ppu_wait_nmi();
 	tmp1++;
 	if (kandoframecnt & 1 && mouse_timer) mouse_timer--;

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ void state_menu() {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if (joypad1.select) cursedmusic = 0x40;`
	`134`	`+ else cursedmusic = 0x00;`
`134`	`135`	`oam_clear();`
`135`	`136`	`ppu_wait_nmi();`
`136`	`137`	`tmp7 = newrand() & 255;`