More audio4 documentation.

Todo: figure out how to disassemble music/sfx.

3 files changed, 649 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)
diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm
new file mode 100644
index 00000000..76678dcb
--- /dev/null
+++ b/audio/headers/musicheaders4.asm
@@ -0,0 +1,22 @@
+	db $80
+	dw $6ce8
+	db $1
+	dw $6d9d
+	db $2
+	dw $6e45
+	db $80
+	dw $716d
+	db $1
+	dw $71c8
+	db $2
+	dw $722a
+	db $c0
+	dw $6fbe
+	db $1
+	dw $7010
+	db $2
+	dw $7068
+	db $3
+	dw $7092
+	db $2
+	dw $4d1a
\ No newline at end of file
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
new file mode 100644
index 00000000..6968bcf0
--- /dev/null
+++ b/audio/headers/sfxheaders4.asm
@@ -0,0 +1,610 @@
+SFX_Headers_4:: ; 80000 (20:4000)
+	db $ff, $ff, $ff
+
+SFX_80003_4:: ; 80003 (20:4003)
+	db CH7
+	dw SFX_841ec_4_Ch7
+
+SFX_80006_4:: ; 80006 (20:4006)
+	db CH7
+	dw SFX_841f0_4_Ch7
+
+SFX_80009_4:: ; 80009 (20:4009)
+	db CH7
+	dw SFX_841f4_4_Ch7
+
+SFX_8000c_4:: ; 8000c (20:400c)
+	db CH7
+	dw SFX_841f8_4_Ch7
+
+SFX_8000f_4:: ; 8000f (20:400f)
+	db CH7
+	dw SFX_841fc_4_Ch7
+
+SFX_80012_4:: ; 80012 (20:4012)
+	db CH7
+	dw SFX_8420f_4_Ch7
+
+SFX_80015_4:: ; 80015 (20:4015)
+	db CH7
+	dw SFX_84213_4_Ch7
+
+SFX_80018_4:: ; 80018 (20:4018)
+	db CH7
+	dw SFX_8421a_4_Ch7
+
+SFX_8001b_4:: ; 8001b (20:401b)
+	db CH7
+	dw SFX_8421e_4_Ch7
+
+SFX_8001e_4:: ; 8001e (20:401e)
+	db CH7
+	dw SFX_84222_4_Ch7
+
+SFX_80021_4:: ; 80021 (20:4021)
+	db CH7
+	dw SFX_84226_4_Ch7
+
+SFX_80024_4:: ; 80024 (20:4024)
+	db CH7
+	dw SFX_8422a_4_Ch7
+
+SFX_80027_4:: ; 80027 (20:4027)
+	db CH7
+	dw SFX_8422e_4_Ch7
+
+SFX_8002a_4:: ; 8002a (20:402a)
+	db CH7
+	dw SFX_84232_4_Ch7
+
+SFX_8002d_4:: ; 8002d (20:402d)
+	db CH7
+	dw SFX_84236_4_Ch7
+
+SFX_80030_4:: ; 80030 (20:4030)
+	db CH7
+	dw SFX_8423d_4_Ch7
+
+SFX_80033_4:: ; 80033 (20:4033)
+	db CH7
+	dw SFX_84244_4_Ch7
+
+SFX_80036_4:: ; 80036 (20:4036)
+	db CH7
+	dw SFX_84248_4_Ch7
+
+SFX_80039_4:: ; 80039 (20:4039)
+	db CH7
+	dw SFX_8424c_4_Ch7
+
+SFX_8003c_4:: ; 8003c (20:403c)
+	db ( $80 | CH4 )
+	dw SFX_845db_4_Ch4
+
+SFX_8003f_4:: ; 8003f (20:403f)
+	db CH5
+	dw SFX_845ea_4_Ch5
+
+SFX_80042_4:: ; 80042 (20:4042)
+	db CH7
+	dw SFX_845f9_4_Ch7
+
+SFX_80045_4:: ; 80045 (20:4045)
+	db ( $80 | CH4 )
+	dw SFX_847eb_4_Ch4
+
+SFX_80048_4:: ; 80048 (20:4048)
+	db CH5
+	dw SFX_847fe_4_Ch5
+
+SFX_8004b_4:: ; 8004b (20:404b)
+	db CH7
+	dw SFX_84811_4_Ch7
+
+SFX_8004e_4:: ; 8004e (20:404e)
+	db ( $80 | CH4 )
+	dw SFX_84760_4_Ch4
+
+SFX_80051_4:: ; 80051 (20:4051)
+	db CH5
+	dw SFX_8476f_4_Ch5
+
+SFX_80054_4:: ; 80054 (20:4054)
+	db CH7
+	dw SFX_8477d_4_Ch7
+
+SFX_80057_4:: ; 80057 (20:4057)
+	db ( $80 | CH4 )
+	dw SFX_844fa_4_Ch4
+
+SFX_8005a_4:: ; 8005a (20:405a)
+	db CH5
+	dw SFX_84519_4_Ch5
+
+SFX_8005d_4:: ; 8005d (20:405d)
+	db CH7
+	dw SFX_84538_4_Ch7
+
+SFX_80060_4:: ; 80060 (20:4060)
+	db ( $80 | CH4 )
+	dw SFX_848a9_4_Ch4
+
+SFX_80063_4:: ; 80063 (20:4063)
+	db CH5
+	dw SFX_848c8_4_Ch5
+
+SFX_80066_4:: ; 80066 (20:4066)
+	db CH7
+	dw SFX_848e7_4_Ch7
+
+SFX_80069_4:: ; 80069 (20:4069)
+	db ( $80 | CH4 )
+	dw SFX_84689_4_Ch4
+
+SFX_8006c_4:: ; 8006c (20:406c)
+	db CH5
+	dw SFX_8469c_4_Ch5
+
+SFX_8006f_4:: ; 8006f (20:406f)
+	db CH7
+	dw SFX_846ae_4_Ch7
+
+SFX_80072_4:: ; 80072 (20:4072)
+	db ( $80 | CH4 )
+	dw SFX_84633_4_Ch4
+
+SFX_80075_4:: ; 80075 (20:4075)
+	db CH5
+	dw SFX_8464d_4_Ch5
+
+SFX_80078_4:: ; 80078 (20:4078)
+	db CH7
+	dw SFX_8464e_4_Ch7
+
+SFX_8007b_4:: ; 8007b (20:407b)
+	db ( $80 | CH4 )
+	dw SFX_84661_4_Ch4
+
+SFX_8007e_4:: ; 8007e (20:407e)
+	db CH5
+	dw SFX_84670_4_Ch5
+
+SFX_80081_4:: ; 80081 (20:4081)
+	db CH7
+	dw SFX_8467f_4_Ch7
+
+SFX_80084_4:: ; 80084 (20:4084)
+	db ( $80 | CH4 )
+	dw SFX_84879_4_Ch4
+
+SFX_80087_4:: ; 80087 (20:4087)
+	db CH5
+	dw SFX_8488c_4_Ch5
+
+SFX_8008a_4:: ; 8008a (20:408a)
+	db CH7
+	dw SFX_8489f_4_Ch7
+
+SFX_8008d_4:: ; 8008d (20:408d)
+	db ( $80 | CH4 )
+	dw SFX_84383_4_Ch4
+
+SFX_80090_4:: ; 80090 (20:4090)
+	db CH5
+	dw SFX_843a0_4_Ch5
+
+SFX_80093_4:: ; 80093 (20:4093)
+	db CH7
+	dw SFX_843c1_4_Ch7
+
+SFX_80096_4:: ; 80096 (20:4096)
+	db ( $80 | CH4 )
+	dw SFX_8481e_4_Ch4
+
+SFX_80099_4:: ; 80099 (20:4099)
+	db CH5
+	dw SFX_8483d_4_Ch5
+
+SFX_8009c_4:: ; 8009c (20:409c)
+	db CH7
+	dw SFX_84860_4_Ch7
+
+SFX_8009f_4:: ; 8009f (20:409f)
+	db ( $80 | CH4 )
+	dw SFX_846af_4_Ch4
+
+SFX_800a2_4:: ; 800a2 (20:40a2)
+	db CH5
+	dw SFX_846da_4_Ch5
+
+SFX_800a5_4:: ; 800a5 (20:40a5)
+	db CH7
+	dw SFX_846f9_4_Ch7
+
+SFX_800a8_4:: ; 800a8 (20:40a8)
+	db ( $80 | CH4 )
+	dw SFX_84712_4_Ch4
+
+SFX_800ab_4:: ; 800ab (20:40ab)
+	db CH5
+	dw SFX_84739_4_Ch5
+
+SFX_800ae_4:: ; 800ae (20:40ae)
+	db CH7
+	dw SFX_8475f_4_Ch7
+
+SFX_800b1_4:: ; 800b1 (20:40b1)
+	db ( $80 | CH4 )
+	dw SFX_8477e_4_Ch4
+
+SFX_800b4_4:: ; 800b4 (20:40b4)
+	db CH5
+	dw SFX_8479d_4_Ch5
+
+SFX_800b7_4:: ; 800b7 (20:40b7)
+	db CH7
+	dw SFX_847cc_4_Ch7
+
+SFX_800ba_4:: ; 800ba (20:40ba)
+	db ( $80 | CH4 )
+	dw SFX_84603_4_Ch4
+
+SFX_800bd_4:: ; 800bd (20:40bd)
+	db CH5
+	dw SFX_84616_4_Ch5
+
+SFX_800c0_4:: ; 800c0 (20:40c0)
+	db CH7
+	dw SFX_84629_4_Ch7
+
+SFX_800c3_4:: ; 800c3 (20:40c3)
+	db ( $80 | CH4 )
+	dw SFX_84545_4_Ch4
+
+SFX_800c6_4:: ; 800c6 (20:40c6)
+	db CH5
+	dw SFX_84560_4_Ch5
+
+SFX_800c9_4:: ; 800c9 (20:40c9)
+	db CH7
+	dw SFX_8457b_4_Ch7
+
+SFX_800cc_4:: ; 800cc (20:40cc)
+	db ( $80 | CH4 )
+	dw SFX_8458b_4_Ch4
+
+SFX_800cf_4:: ; 800cf (20:40cf)
+	db CH5
+	dw SFX_845ae_4_Ch5
+
+SFX_800d2_4:: ; 800d2 (20:40d2)
+	db CH7
+	dw SFX_845d1_4_Ch7
+
+SFX_800d5_4:: ; 800d5 (20:40d5)
+	db ( $80 | CH4 )
+	dw SFX_84467_4_Ch4
+
+SFX_800d8_4:: ; 800d8 (20:40d8)
+	db CH5
+	dw SFX_84486_4_Ch5
+
+SFX_800db_4:: ; 800db (20:40db)
+	db CH7
+	dw SFX_844a9_4_Ch7
+
+SFX_800de_4:: ; 800de (20:40de)
+	db ( $80 | CH4 )
+	dw SFX_8497f_4_Ch4
+
+SFX_800e1_4:: ; 800e1 (20:40e1)
+	db CH5
+	dw SFX_84992_4_Ch5
+
+SFX_800e4_4:: ; 800e4 (20:40e4)
+	db CH7
+	dw SFX_849a5_4_Ch7
+
+SFX_800e7_4:: ; 800e7 (20:40e7)
+	db ( $80 | CH4 )
+	dw SFX_849b2_4_Ch4
+
+SFX_800ea_4:: ; 800ea (20:40ea)
+	db CH5
+	dw SFX_849cd_4_Ch5
+
+SFX_800ed_4:: ; 800ed (20:40ed)
+	db CH7
+	dw SFX_849e8_4_Ch7
+
+SFX_800f0_4:: ; 800f0 (20:40f0)
+	db ( $80 | CH4 )
+	dw SFX_849fb_4_Ch4
+
+SFX_800f3_4:: ; 800f3 (20:40f3)
+	db CH5
+	dw SFX_84a0a_4_Ch5
+
+SFX_800f6_4:: ; 800f6 (20:40f6)
+	db CH7
+	dw SFX_84a19_4_Ch7
+
+SFX_800f9_4:: ; 800f9 (20:40f9)
+	db ( $80 | CH4 )
+	dw SFX_84a89_4_Ch4
+
+SFX_800fc_4:: ; 800fc (20:40fc)
+	db CH5
+	dw SFX_84aa4_4_Ch5
+
+SFX_800ff_4:: ; 800ff (20:40ff)
+	db CH7
+	dw SFX_84abf_4_Ch7
+
+SFX_80102_4:: ; 80102 (20:4102)
+	db ( $80 | CH4 )
+	dw SFX_8491c_4_Ch4
+
+SFX_80105_4:: ; 80105 (20:4105)
+	db CH5
+	dw SFX_8492b_4_Ch5
+
+SFX_80108_4:: ; 80108 (20:4108)
+	db CH7
+	dw SFX_8493a_4_Ch7
+
+SFX_8010b_4:: ; 8010b (20:410b)
+	db ( $80 | CH4 )
+	dw SFX_84ad2_4_Ch4
+
+SFX_8010e_4:: ; 8010e (20:410e)
+	db CH5
+	dw SFX_84ae5_4_Ch5
+
+SFX_80111_4:: ; 80111 (20:4111)
+	db CH7
+	dw SFX_84af8_4_Ch7
+
+SFX_80114_4:: ; 80114 (20:4114)
+	db ( $80 | CH4 )
+	dw SFX_84be2_4_Ch4
+
+SFX_80117_4:: ; 80117 (20:4117)
+	db CH5
+	dw SFX_84c05_4_Ch5
+
+SFX_8011a_4:: ; 8011a (20:411a)
+	db CH7
+	dw SFX_84c28_4_Ch7
+
+SFX_8011d_4:: ; 8011d (20:411d)
+	db ( $80 | CH4 )
+	dw SFX_848fa_4_Ch4
+
+SFX_80120_4:: ; 80120 (20:4120)
+	db CH5
+	dw SFX_84909_4_Ch5
+
+SFX_80123_4:: ; 80123 (20:4123)
+	db CH7
+	dw SFX_8491b_4_Ch7
+
+SFX_80126_4:: ; 80126 (20:4126)
+	db ( $80 | CH4 )
+	dw SFX_84b53_4_Ch4
+
+SFX_80129_4:: ; 80129 (20:4129)
+	db CH5
+	dw SFX_84b6e_4_Ch5
+
+SFX_8012c_4:: ; 8012c (20:412c)
+	db CH7
+	dw SFX_84b89_4_Ch7
+
+SFX_8012f_4:: ; 8012f (20:412f)
+	db ( $80 | CH4 )
+	dw SFX_84944_4_Ch4
+
+SFX_80132_4:: ; 80132 (20:4132)
+	db CH5
+	dw SFX_8495b_4_Ch5
+
+SFX_80135_4:: ; 80135 (20:4135)
+	db CH7
+	dw SFX_84972_4_Ch7
+
+SFX_80138_4:: ; 80138 (20:4138)
+	db ( $80 | CH4 )
+	dw SFX_84b05_4_Ch4
+
+SFX_8013b_4:: ; 8013b (20:413b)
+	db CH5
+	dw SFX_84b28_4_Ch5
+
+SFX_8013e_4:: ; 8013e (20:413e)
+	db CH7
+	dw SFX_84b43_4_Ch7
+
+SFX_80141_4:: ; 80141 (20:4141)
+	db ( $80 | CH4 )
+	dw SFX_84b9c_4_Ch4
+
+SFX_80144_4:: ; 80144 (20:4144)
+	db CH5
+	dw SFX_84bb7_4_Ch5
+
+SFX_80147_4:: ; 80147 (20:4147)
+	db CH7
+	dw SFX_84bd2_4_Ch7
+
+SFX_8014a_4:: ; 8014a (20:414a)
+	db ( $80 | CH4 )
+	dw SFX_84a23_4_Ch4
+
+SFX_8014d_4:: ; 8014d (20:414d)
+	db CH5
+	dw SFX_84a46_4_Ch5
+
+SFX_80150_4:: ; 80150 (20:4150)
+	db CH7
+	dw SFX_84a6d_4_Ch7
+
+SFX_80153_4:: ; 80153 (20:4153)
+	db ( $80 | CH4 )
+	dw SFX_84c3b_4_Ch4
+
+SFX_80156_4:: ; 80156 (20:4156)
+	db CH5
+	dw SFX_84c4e_4_Ch5
+
+SFX_80159_4:: ; 80159 (20:4159)
+	db CH7
+	dw SFX_84c61_4_Ch7
+
+SFX_8015c_4:: ; 8015c (20:415c)
+	db ( $80 | CH4 )
+	dw SFX_84c6e_4_Ch4
+
+SFX_8015f_4:: ; 8015f (20:415f)
+	db CH5
+	dw SFX_84c81_4_Ch5
+
+SFX_80162_4:: ; 80162 (20:4162)
+	db CH7
+	dw SFX_84c94_4_Ch7
+
+SFX_80165_4:: ; 80165 (20:4165)
+	db ( $80 | CH4 )
+	dw SFX_84ca1_4_Ch4
+
+SFX_80168_4:: ; 80168 (20:4168)
+	db CH5
+	dw SFX_84cc4_4_Ch5
+
+SFX_8016b_4:: ; 8016b (20:416b)
+	db CH7
+	dw SFX_84ce6_4_Ch7
+
+SFX_8016e_4:: ; 8016e (20:416e)
+	db ( $80 | CH4 )
+	dw SFX_84ce7_4_Ch4
+
+SFX_80171_4:: ; 80171 (20:4171)
+	db CH5
+	dw SFX_84cfa_4_Ch5
+
+SFX_80174_4:: ; 80174 (20:4174)
+	db CH7
+	dw SFX_84d0d_4_Ch7
+
+SFX_80177_4:: ; 80177 (20:4177)
+	db ( $80 | CH4 )
+	dw SFX_843da_4_Ch4
+
+SFX_8017a_4:: ; 8017a (20:417a)
+	db CH5
+	dw SFX_843f1_4_Ch5
+
+SFX_8017d_4:: ; 8017d (20:417d)
+	db CH7
+	dw SFX_84404_4_Ch7
+
+SFX_80180_4:: ; 80180 (20:4180)
+	db ( $80 | CH4 )
+	dw SFX_84411_4_Ch4
+
+SFX_80183_4:: ; 80183 (20:4183)
+	db CH5
+	dw SFX_84434_4_Ch5
+
+SFX_80186_4:: ; 80186 (20:4186)
+	db CH7
+	dw SFX_84457_4_Ch7
+
+SFX_80189_4:: ; 80189 (20:4189)
+	db ( $80 | CH4 )
+	dw SFX_844bf_4_Ch4
+
+SFX_8018c_4:: ; 8018c (20:418c)
+	db CH5
+	dw SFX_844d6_4_Ch5
+
+SFX_8018f_4:: ; 8018f (20:418f)
+	db CH7
+	dw SFX_844ed_4_Ch7
+
+SFX_80192_4:: ; 80192 (20:4192)
+	db ( $80 | CH4 )
+	dw SFX_84e5a_4_Ch4
+
+SFX_80195_4:: ; 80195 (20:4195)
+	db CH5
+	dw SFX_84e71_4_Ch5
+
+SFX_80198_4:: ; 80198 (20:4198)
+	db CH6
+	dw SFX_84e81_4_Ch6
+
+SFX_8019b_4:: ; 8019b (20:419b)
+	db ( $80 | CH4 )
+	dw SFX_84ec8_4_Ch4
+
+SFX_8019e_4:: ; 8019e (20:419e)
+	db CH5
+	dw SFX_84ee7_4_Ch5
+
+SFX_801a1_4:: ; 801a1 (20:41a1)
+	db CH6
+	dw SFX_84eff_4_Ch6
+
+SFX_801a4_4:: ; 801a4 (20:41a4)
+	db CH4
+	dw SFX_8428e_4_Ch4
+
+SFX_801a7_4:: ; 801a7 (20:41a7)
+	db CH4
+	dw SFX_8427f_4_Ch4
+
+SFX_801aa_4:: ; 801aa (20:41aa)
+	db CH4
+	dw SFX_8426a_4_Ch4
+
+SFX_801ad_4:: ; 801ad (20:41ad)
+	db CH7
+	dw SFX_84263_4_Ch7
+
+SFX_801b0_4:: ; 801b0 (20:41b0)
+	db CH4
+	dw SFX_84250_4_Ch4
+
+SFX_801b3_4:: ; 801b3 (20:41b3)
+	db CH7
+	dw SFX_8429f_4_Ch7
+
+SFX_801b6_4:: ; 801b6 (20:41b6)
+	db CH4
+	dw SFX_842b5_4_Ch4
+
+SFX_801b9_4:: ; 801b9 (20:41b9)
+	db CH7
+	dw SFX_842e1_4_Ch7
+
+SFX_801bc_4:: ; 801bc (20:41bc)
+	db CH4
+	dw SFX_842cc_4_Ch4
+
+SFX_801bf_4:: ; 801bf (20:41bf)
+	db CH7
+	dw SFX_842d7_4_Ch7
+
+SFX_801c2_4:: ; 801c2 (20:41c2)
+	db ( $80 | CH4 )
+	dw SFX_842eb_4_Ch4
+
+SFX_801c5_4:: ; 801c5 (20:41c5)
+	db CH5
+	dw SFX_8430a_4_Ch5
+
+SFX_801c8_4:: ; 801c8 (20:41c8)
+	db CH6
+	dw SFX_84322_4_Ch6