diff options
| author | KuroiIeWa5Da <tyuki@adu.me> | 2012-01-21 05:02:39 -0600 |
|---|---|---|
| committer | KuroiIeWa5Da <tyuki@adu.me> | 2012-01-21 05:02:39 -0600 |
| commit | 7f658208655641a0de89ceb70ead90f2b3c95326 (patch) | |
| tree | 0d0de9f6dfebc6c4e383edb6bcca21e9e299ef69 | |
| parent | 76a9b1ce580acd97cc9e64a31915c85898a32b6a (diff) | |
Disassembled Music Data for PokeHealed Chnl2, cleaned up music data a bit
hg-commit-id: 2967569eba4d
| -rw-r--r-- | constants.asm | 6 | ||||
| -rw-r--r-- | music/music.asm | 42 |
2 files changed, 38 insertions, 10 deletions
diff --git a/constants.asm b/constants.asm index e161c7ac..7b34b766 100644 --- a/constants.asm +++ b/constants.asm @@ -2625,6 +2625,12 @@ oct5 EQU $E2 oct6 EQU $E1 oct7 EQU $E0 +;duty +duty12_5 EQU $0 +duty25 EQU $1 +duty50 EQU $2 +duty75 EQU $3 + ;Write a music note ;format: mus_note pitch delay mus_note: MACRO diff --git a/music/music.asm b/music/music.asm index 81ee5836..5b004ba7 100644 --- a/music/music.asm +++ b/music/music.asm @@ -6,16 +6,16 @@ INCBIN "baserom.gbc",$82FD,$9ba3 - $82FD ;Pokemon Healed Music
PkmnHealed_md_1: ;9BA3 - 9BC3
-;INCBIN "baserom.gbc",$9ba3,$9bc4 - $9ba3
;Setup
- mus_tempo $0, $90
- mus_volume $77
- mus_duty $2
- db $E8
- mus_vel $8, $1
-
-;Song
+ mus_tempo 0, 144
+ mus_volume 119
+ mus_duty duty50
+ db $E8 ;??
+ mus_vel 8, 1
+
+;Music
+ ;Piece 1
mus_note noteRst, note8
db $EB, $00
mus_note noteE, note2_4
@@ -33,10 +33,32 @@ PkmnHealed_md_1: ;9BA3 - 9BC3 db $EB, $00
mus_note noteE, note2_4
mus_note noteB, note4
- mus_end
+ mus_end ;End
PkmnHealed_md_2: ;9BC4 - 9BD1
-INCBIN "baserom.gbc",$9bc4,$9bd2 - $9bc4
+;Setup
+ mus_duty duty50
+
+;Music
+ ;Octave Switch
+ db dNormSpd
+ mus_note noteRst, note4
+ db oct3
+
+ ;Piece 1
+ mus_note noteB, note4
+ mus_note noteB, note4
+ mus_note noteB, note8
+ mus_note noteG#, note8
+
+ ;Octave Switch
+ db dNormSpd
+ mus_note noteRst, note4_16
+ db oct4
+
+ ;Piece 2
+ mus_note noteE, note2
+ mus_end ;End
PkmnHealed_md_3: ;9BD2 - 9BDD
INCBIN "baserom.gbc",$9bd2,$9bde - $9bd2
|