diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-09 14:20:28 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-09 14:22:38 -0400 |
| commit | 683a62cc1cb7d07b4c88eeec9333c415da8f0bdc (patch) | |
| tree | e57b549e0c368ac4d97713ddca7a3177381baf08 /audio/wave_instruments.asm | |
| parent | Improve music command names (diff) | |
| download | pokeyellow-683a62cc1cb7d07b4c88eeec9333c415da8f0bdc.tar.gz pokeyellow-683a62cc1cb7d07b4c88eeec9333c415da8f0bdc.tar.xz pokeyellow-683a62cc1cb7d07b4c88eeec9333c415da8f0bdc.zip | |
Combine wave files
Diffstat (limited to '')
| -rw-r--r-- | audio/wave_instruments.asm (renamed from audio/duty_1.asm) | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/audio/duty_1.asm b/audio/wave_instruments.asm index 2c650ac1..fede06af 100644 --- a/audio/duty_1.asm +++ b/audio/wave_instruments.asm @@ -1,33 +1,32 @@ -Music2_Channel3DutyPointers: ; 0x8361 - dw Music2_Channel3Duty0 - dw Music2_Channel3Duty1 - dw Music2_Channel3Duty2 - dw Music2_Channel3Duty3 - dw Music2_Channel3Duty4 - dw Music2_Channel3Duty5 ; used in the Lavender Town theme - dw Music2_Channel3Duty5 ; unused - dw Music2_Channel3Duty5 ; unused - dw Music2_Channel3Duty5 ; unused + dw .wave0 + dw .wave1 + dw .wave2 + dw .wave3 + dw .wave4 + dw .wave5 ; used in the Lavender Town and Pokemon Tower themes + dw .wave5 ; unused + dw .wave5 ; unused + dw .wave5 ; unused ; these are the definitions for the channel 3 instruments ; each instrument definition is made up of 32 points (nibbles) that form ; the graph of the wave ; the current instrument is copied to $FF30 -Music2_Channel3Duty0: ; 0x8373 +.wave0 db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 -Music2_Channel3Duty1: ; 0x8383 +.wave1 db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 -Music2_Channel3Duty2: ; 0x8393 +.wave2 db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 -Music2_Channel3Duty3: ; 0x83a3 +.wave3 db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 -Music2_Channel3Duty4: ; 0x83b3 +.wave4 db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 ; duty 5 reads from sfx data -Music2_Channel3Duty5: ; 0x83c3 +.wave5 |