Flesh out Boss1 music a bit

mdsteele · Sep 17, 2024 · e63a46e · e63a46e
1 parent 11bc2af
commit e63a46e
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 34 deletions.
diff --git a/src/music.asm b/src/music.asm
@@ -20,7 +20,7 @@
 .INCLUDE "macros.inc"
 .INCLUDE "music.inc"
 
-.IMPORT DataC_Boss_BossPlaceholder_sMusic
+.IMPORT DataC_Boss_Boss1_sMusic
 .IMPORT DataC_Core_Boss2_sMusic
 .IMPORT DataC_Crypt_Crypt_sMusic
 .IMPORT DataC_Garden_Garden_sMusic
@@ -48,7 +48,7 @@
     D_TABLE .enum, eMusic
     d_entry table, Silence, Data_Silence_sMusic
     d_entry table, Attack,  DataC_Town_Attack_sMusic
-    d_entry table, Boss1,   DataC_Boss_BossPlaceholder_sMusic
+    d_entry table, Boss1,   DataC_Boss_Boss1_sMusic
     d_entry table, Boss2,   DataC_Core_Boss2_sMusic
     d_entry table, Calm,    Data_Calm_sMusic
     d_entry table, Credits, DataC_Title_Credits_sMusic

diff --git a/src/music/attack.sng b/src/music/attack.sng
@@ -7,22 +7,22 @@
 =tempo q28
 =key 3#  % F# minor
 
-!INST 1A PulseBasic   $0c d3/4
-!INST 1E PulseBasic   $0a d1/8  % echo 1
-!INST 1F PulseBasic   $07 d1/8  % echo 2
-!INST 1G PulseBasic   $04 d1/8  % echo 3
-!INST 2A PulseBasic   $0c d1/8
+!INST 1A PulseVibrato $0a d3/4
+!INST 1E PulseVibrato $08 d1/8  % echo 1
+!INST 1F PulseVibrato $06 d1/8  % echo 2
+!INST 1G PulseVibrato $04 d1/8  % echo 3
+!INST 2A PulseVibrato $0a d1/8
 !INST 2B Constant     $0a d1/8
 !INST TK TriangleDrum $20       % kick drum
-!INST ND Staccato     $0c
+!INST ND Staccato     $0b
 !INST DK Constant     $4e       % kick drum
 
 !PART A
 
 1| p(iA c5e c  ' ds de ds)1A ' c5e c  ' dq |
 2| p(iA c4e c  ' ds de ds)2A ' c4e c  ' dq |
 T| iK c4e re ' e4e re :2 |
-N| iD x1e x6 ' x3s x3e x3s :2 |
+N| iD x3e x9 ' x5s x5e x5s :2 |
 D| p(iK sK13h)DK :2 |
 
 !PART B

diff --git a/src/music/boss1.sng b/src/music/boss1.sng
@@ -1,64 +1,79 @@
 @PRGC_Boss
 
-!SONG BossPlaceholder "A|BCCADDEEFFEEMMAB"
+!DPCM K Data_SampleKickDrum_arr657 657
+
+!SONG Boss1 "A|BCCADDEEFFEEGGAB"
 
 =tempo q28
 =key 3#  % F# minor
 
-!INST 1D PulseBasic $0c d3/4
-!INST 2D PulseBasic $0c d1/8
-!INST TB TriangleVibrato
-!INST ND Staccato   $0c
+!INST 1A PulseVibrato $0a d3/4
+!INST 1B PulseVibrato $08 d3/4
+!INST 2A PulseVibrato $0a d1/8
+!INST 2B PulseVibrato $08 d1/8
+!INST TB Constant     $ff       % bass
+!INST TK TriangleDrum $20       % kick drum
+!INST ND Staccato     $0b       % drum
+!INST DK Constant     $4e       % kick drum
 
 !PART A
 
-1| iD c5e c  ' ds de ds :4 |
-2| iD c4e c  ' ds de ds :4 |
-T| iB f4q    ' c        :4 |
-N| p(iD x1e x6 ' x3s x3e x3s)NA :4 |
+1| iA c5e c  ' ds de ds :4 |
+2| iA c4e c  ' ds de ds :4 |
+T| p(iK d4s d d d ' fNe re)TA :4 |
+N| p(iD x3e x9 ' x5s x5e x5s)NA :4 |
+D| p(iK sK13q)DA :8 |
 
 !PART B
 
-T| p(iB f3e c)3B ' p3B ' p3B ' p3B | p3B ' p3B ' p3B ' p3B |
+T| p(iK d4e iB f3e ' iK d4e iB c3e)TB :4 |
 N=:AN
+D=:AD
 
 !PART C
 
-2| iD re f3 ' g a ' b as g ' ae f |
+2| iB re f3 ' g a ' b as g ' ae f |
  | a3e fs e ' fe c ' g e ' fq |
 T=:BT
 N=:AN
+D=:BD
 
 !PART D
 
-2| iD re f4 ' g a ' b as g ' ae f |
+2| iB re f4 ' g a ' b as g ' ae f |
  | a4e gs f ' ge e ' g e# ' fq |
 T=:BT
 N=:AN
+D=:BD
 
 !PART E
 
-1| iD rq ' c4q ' f ' c |
+1| iB rq ' c4q ' f ' c |
 2=:C2
 T=:CT
 N=:CN
+D=:CD
 
 !PART F
 
-1| iD rq    ' rq ' f5e gs a ' ge e |
+1| iB rq    ' rq ' f5e gs a ' ge e |
  | g5s g ee ' fq '
 2=:D2
 T=:DT
 N=:DN
+D=:DD
 
-!PART M
+!PART G
 
 1| f3q r f r | f3q r g r |
  | a3q c4 a3 d4 | a3q f e# g |
-2| p(f4s f  f  f)2M  ' a4q ' p2M  ' bq |
- | p2M  ' c5e a4 ' d5 b4 ' c5 e#4 |
- | p2M  ' a4e f ' p2M  ' be f |
- | p2M  ' c5s d c b4 ' a b a g ' c5 b4 a g |
-T| f3e c ' a  c  ' f c ' b c |
- | f3e c ' c4 a3 ' f c ' f c :2 |
+2| p(f4s f  f  f)2G  ' a4q ' p2G  ' bq |
+ | p2G  ' c5e a4 ' d5 b4 ' c5 e#4 |
+ | p2G  ' a4e f ' p2G  ' be f |
+ | p2G  ' c5s d c b4 ' a b a g ' c5 b4 a g |
+T| pTA ' pTA |
+ | p(iK d4s d d d ' fNe de ' fNe de ' fNe de)TG |
+ | pTA ' pTA |
+ | pTG |
 N| pNA :8 |
+D| pDA :16 |
diff --git a/src/room.asm b/src/room.asm
@@ -463,8 +463,8 @@ _BossMusic:
     bne @bossDead
     @bossAlive:
     ldy #eMusic::Boss1
-    .assert eMusic::Boss1 > 0, error
-    bne @setMusic  ; unconditional
+    .assert eMusic::Boss1 < $80, error
+    bpl @setMusic  ; unconditional
     @bossDead:
     ldy #eMusic::Calm
     @setMusic:

diff --git a/src/rooms/boss_garden.asm b/src/rooms/boss_garden.asm
@@ -115,7 +115,7 @@ kBossInitHealthPerEye = 4
 
 ;;; How many frames the boss waits, after you first enter the room, before
 ;;; taking action.
-kBossInitCooldown = 120
+kBossInitCooldown = 160
 ;;; How many frames to wait between spikes when the boss is in Angry mode.
 kBossAngrySpikeCooldown = 15
 ;;; How many frames to wait between fireballs when the boss is in Shoot mode.

diff --git a/src/rooms/boss_temple.asm b/src/rooms/boss_temple.asm
@@ -188,7 +188,7 @@ kBossInitBottomY = kBossInitTopY + kBossBodyHeightPx
 
 ;;; How many frames the boss waits, after you first enter the room, before
 ;;; taking action.
-kBossInitCooldown = 120
+kBossInitCooldown = 160
 ;;; How many frames it takes for an eye to fully open or close.
 .DEFINE kBossEyeOpenFrames 15
 ;;; How many frames the boss pauses for between all boss projectiles expiring