aboutsummaryrefslogtreecommitdiffstats
path: root/audio.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-03-19 19:56:33 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-03-19 19:56:33 -0400
commit48426f71c39c4b89ff5fc4d1cab9f271bdfe8230 (patch)
treee22cface09f49311c5c13234f00b333ba8527664 /audio.asm
parentStart working on bank20 audio (diff)
downloadpokeyellow-48426f71c39c4b89ff5fc4d1cab9f271bdfe8230.tar.gz
pokeyellow-48426f71c39c4b89ff5fc4d1cab9f271bdfe8230.tar.xz
pokeyellow-48426f71c39c4b89ff5fc4d1cab9f271bdfe8230.zip
More audio4 documentation.
Todo: figure out how to disassemble music/sfx.
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm26
1 files changed, 17 insertions, 9 deletions
diff --git a/audio.asm b/audio.asm
index 4cc10b34..d5150f0d 100644
--- a/audio.asm
+++ b/audio.asm
@@ -30,7 +30,10 @@ INCLUDE "audio/headers/sfxheaders2.asm"
SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
INCLUDE "audio/headers/sfxheaders3.asm"
-
+SECTION "Sound Effect Headers 4", ROMX, BANK[AUDIO_4]
+SFX_Headers_4:: ; 80000 (20:4000)
+ dr $80000,$801cb
+; INCLUDE "audio/headers/sfxheaders4.asm"
SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
INCLUDE "audio/headers/musicheaders1.asm"
@@ -41,7 +44,9 @@ INCLUDE "audio/headers/musicheaders2.asm"
SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
INCLUDE "audio/headers/musicheaders3.asm"
-
+SECTION "Music Headers 4", ROMX, BANK[AUDIO_4]
+ dr $801cb,$801ec
+;INCLUDE "audio/headers/musicheaders4.asm"
SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
@@ -367,6 +372,9 @@ INCLUDE "audio/sfx/cry20_3.asm"
INCLUDE "audio/sfx/cry21_3.asm"
INCLUDE "audio/sfx/cry22_3.asm"
+SECTION "Sound Effects 4", ROMX, BANK[AUDIO_4]
+ dr $801ec, $80f14
+
SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
PlayBattleMusic:: ; 9064 (2:5064)
@@ -580,7 +588,11 @@ OwnedMonValues: ; 7d106 (1f:5106)
INCLUDE "audio/engine_3.asm"
+SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4]
+
+SurfingPikachu1Graphics: INCBIN "gfx/surfing_pikachu_1.t4.2bpp"
+INCLUDE "audio/engine_4.asm"
SECTION "Music 1", ROMX, BANK[AUDIO_1]
@@ -655,14 +667,10 @@ INCLUDE "audio/music/credits.asm"
INCLUDE "audio/music/yellowintro.asm"
SECTION "Music 4", ROMX, BANK[AUDIO_4]
-SFX_Headers_4: ; 80000 (20:4000)
- dr $80000,$80f14
-
-SurfingPikachu1Graphics: INCBIN "gfx/surfing_pikachu_1.t4.2bpp"
-
-INCLUDE "audio/engine_4.asm"
+INCLUDE "audio/music/surfingpikachu.asm"
+INCLUDE "audio/music/yellowunusedsong.asm"
- dr $82ce8,$84000
+ dr $8316d,$84000
SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1]
PikachuCry1:: ; 84000 (21:4000)