Shorter GM jingle

This commit is contained in:
Randy Thiemann 2023-11-01 21:28:07 +01:00
parent c2c7845396
commit 27e4ea70b7
8 changed files with 2307 additions and 106 deletions

Binary file not shown.

View File

@ -357,7 +357,7 @@ ROMX bank #1:
ROMX bank #2:
SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"]
SECTION: $4008-$6c16 ($2c0f bytes) ["SFX Data"]
SECTION: $4008-$6b58 ($2b51 bytes) ["SFX Data"]
$4008 = sSFXPieceI
$4325 = sSFXPieceZ
$4325 = sSFXPieceIEnd
@ -399,15 +399,15 @@ ROMX bank #2:
$5fcd = sSFXRankUpEnd
$673b = sSFXRankGM
$673b = sSFXReadyGoEnd
$6b80 = sSFXLineClear
$6b80 = sSFXRankGMEnd
$6b96 = sSFXLand
$6b96 = sSFXLineClearEnd
$6ba1 = sSFXLock
$6ba1 = sSFXLandEnd
$6c17 = sSFXLockEnd
EMPTY: $6c17-$7fff ($13e9 bytes)
TOTAL EMPTY: $13e9 bytes
$6ac2 = sSFXLineClear
$6ac2 = sSFXRankGMEnd
$6ad8 = sSFXLand
$6ad8 = sSFXLineClearEnd
$6ae3 = sSFXLock
$6ae3 = sSFXLandEnd
$6b59 = sSFXLockEnd
EMPTY: $6b59-$7fff ($14a7 bytes)
TOTAL EMPTY: $14a7 bytes
ROMX bank #3:
SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_MUSIC"]
@ -2308,7 +2308,7 @@ HRAM bank #0:
SUMMARY:
ROM0: 9162 bytes used / 7222 free
ROMX: 49929 bytes used / 48375 free in 6 banks
ROMX: 49739 bytes used / 48565 free in 6 banks
SRAM: 14 bytes used / 8178 free in 1 bank
WRAM0: 3489 bytes used / 607 free
HRAM: 121 bytes used / 6 free

Binary file not shown.

View File

@ -279,13 +279,13 @@
02:5fcd sSFXRankUpEnd
02:673b sSFXRankGM
02:673b sSFXReadyGoEnd
02:6b80 sSFXLineClear
02:6b80 sSFXRankGMEnd
02:6b96 sSFXLand
02:6b96 sSFXLineClearEnd
02:6ba1 sSFXLock
02:6ba1 sSFXLandEnd
02:6c17 sSFXLockEnd
02:6ac2 sSFXLineClear
02:6ac2 sSFXRankGMEnd
02:6ad8 sSFXLand
02:6ad8 sSFXLineClearEnd
02:6ae3 sSFXLock
02:6ae3 sSFXLandEnd
02:6b59 sSFXLockEnd
03:4008 sMusicMenu
03:681b sMusicMenuEnd
04:4008 SwitchToTitleB

View File

@ -1982,17 +1982,11 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $2D
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $0B, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
@ -2003,17 +1997,11 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $2D
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
@ -2039,15 +2027,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $42, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
@ -2058,15 +2040,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
@ -2092,15 +2068,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $5B, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
@ -2111,15 +2081,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $C4, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
@ -2145,15 +2109,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
@ -2164,15 +2122,9 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $CE, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
@ -2210,19 +2162,13 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
@ -2230,7 +2176,7 @@ sSFXRankGM::
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
@ -2238,7 +2184,7 @@ sSFXRankGM::
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
@ -2248,12 +2194,6 @@ sSFXRankGM::
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
@ -2282,22 +2222,6 @@ sSFXRankGM::
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $59, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $16
db REG_NR34_CH3_FRQHI, $04, $FE

Binary file not shown.

2277
src/res/sources/sfx.txt Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.