summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm120
1 files changed, 109 insertions, 11 deletions
diff --git a/audio.asm b/audio.asm
index 7b8ceab7..15d50c26 100644
--- a/audio.asm
+++ b/audio.asm
@@ -10,6 +10,9 @@ INCLUDE "audio/headers/sfxheaders2.asm"
SECTION "Sound Effect Headers 3", ROMX
INCLUDE "audio/headers/sfxheaders3.asm"
+SECTION "Sound Effect Headers 4", ROMX
+INCLUDE "audio/headers/sfxheaders4.asm"
+
SECTION "Music Headers 1", ROMX
INCLUDE "audio/headers/musicheaders1.asm"
@@ -20,6 +23,9 @@ INCLUDE "audio/headers/musicheaders2.asm"
SECTION "Music Headers 3", ROMX
INCLUDE "audio/headers/musicheaders3.asm"
+SECTION "Music Headers 4", ROMX
+INCLUDE "audio/headers/musicheaders4.asm"
+
SECTION "Sound Effects 1", ROMX
@@ -43,9 +49,6 @@ INCLUDE "audio/sfx/noise_instrument17_1.asm"
INCLUDE "audio/sfx/noise_instrument18_1.asm"
INCLUDE "audio/sfx/noise_instrument19_1.asm"
-Audio1_WavePointers:
-INCLUDE "audio/wave_instruments.asm"
-
INCLUDE "audio/sfx/start_menu_1.asm"
INCLUDE "audio/sfx/pokeflute.asm"
INCLUDE "audio/sfx/cut_1.asm"
@@ -143,9 +146,6 @@ INCLUDE "audio/sfx/noise_instrument17_2.asm"
INCLUDE "audio/sfx/noise_instrument18_2.asm"
INCLUDE "audio/sfx/noise_instrument19_2.asm"
-Audio2_WavePointers:
-INCLUDE "audio/wave_instruments.asm"
-
INCLUDE "audio/sfx/press_ab_2.asm"
INCLUDE "audio/sfx/start_menu_2.asm"
INCLUDE "audio/sfx/tink_2.asm"
@@ -157,6 +157,7 @@ INCLUDE "audio/sfx/ball_poof.asm"
INCLUDE "audio/sfx/faint_thud.asm"
INCLUDE "audio/sfx/run.asm"
INCLUDE "audio/sfx/dex_page_added.asm"
+INCLUDE "audio/sfx/swap_2.asm" ; added in yellow
INCLUDE "audio/sfx/pokeflute_ch7.asm"
INCLUDE "audio/sfx/peck.asm"
INCLUDE "audio/sfx/faint_fall.asm"
@@ -269,9 +270,6 @@ INCLUDE "audio/sfx/noise_instrument17_3.asm"
INCLUDE "audio/sfx/noise_instrument18_3.asm"
INCLUDE "audio/sfx/noise_instrument19_3.asm"
-Audio3_WavePointers:
-INCLUDE "audio/wave_instruments.asm"
-
INCLUDE "audio/sfx/start_menu_3.asm"
INCLUDE "audio/sfx/cut_3.asm"
INCLUDE "audio/sfx/go_inside_3.asm"
@@ -355,6 +353,84 @@ INCLUDE "audio/sfx/cry21_3.asm"
INCLUDE "audio/sfx/cry22_3.asm"
+SECTION "Sound Effects 4", ROMX
+
+INCLUDE "audio/sfx/noise_instrument01_4.asm"
+INCLUDE "audio/sfx/noise_instrument02_4.asm"
+INCLUDE "audio/sfx/noise_instrument03_4.asm"
+INCLUDE "audio/sfx/noise_instrument04_4.asm"
+INCLUDE "audio/sfx/noise_instrument05_4.asm"
+INCLUDE "audio/sfx/noise_instrument06_4.asm"
+INCLUDE "audio/sfx/noise_instrument07_4.asm"
+INCLUDE "audio/sfx/noise_instrument08_4.asm"
+INCLUDE "audio/sfx/noise_instrument09_4.asm"
+INCLUDE "audio/sfx/noise_instrument10_4.asm"
+INCLUDE "audio/sfx/noise_instrument11_4.asm"
+INCLUDE "audio/sfx/noise_instrument12_4.asm"
+INCLUDE "audio/sfx/noise_instrument13_4.asm"
+INCLUDE "audio/sfx/noise_instrument14_4.asm"
+INCLUDE "audio/sfx/noise_instrument15_4.asm"
+INCLUDE "audio/sfx/noise_instrument16_4.asm"
+INCLUDE "audio/sfx/noise_instrument17_4.asm"
+INCLUDE "audio/sfx/noise_instrument18_4.asm"
+INCLUDE "audio/sfx/noise_instrument19_4.asm"
+
+INCLUDE "audio/sfx/press_ab_4.asm"
+INCLUDE "audio/sfx/start_menu_4.asm"
+INCLUDE "audio/sfx/heal_ailment_4.asm"
+INCLUDE "audio/sfx/heal_hp_4.asm"
+INCLUDE "audio/sfx/tink_4.asm"
+INCLUDE "audio/sfx/surfing_jump.asm"
+INCLUDE "audio/sfx/surfing_flip.asm"
+INCLUDE "audio/sfx/unknown_802cc.asm"
+INCLUDE "audio/sfx/surfing_land.asm"
+INCLUDE "audio/sfx/surfing_crash.asm"
+INCLUDE "audio/sfx/get_item2_4_2.asm"
+INCLUDE "audio/sfx/unused_4.asm"
+INCLUDE "audio/sfx/cry09_4.asm"
+INCLUDE "audio/sfx/cry23_4.asm"
+INCLUDE "audio/sfx/cry24_4.asm"
+INCLUDE "audio/sfx/cry11_4.asm"
+INCLUDE "audio/sfx/cry25_4.asm"
+INCLUDE "audio/sfx/cry03_4.asm"
+INCLUDE "audio/sfx/cry0f_4.asm"
+INCLUDE "audio/sfx/cry10_4.asm"
+INCLUDE "audio/sfx/cry00_4.asm"
+INCLUDE "audio/sfx/cry0e_4.asm"
+INCLUDE "audio/sfx/cry06_4.asm"
+INCLUDE "audio/sfx/cry07_4.asm"
+INCLUDE "audio/sfx/cry05_4.asm"
+INCLUDE "audio/sfx/cry0b_4.asm"
+INCLUDE "audio/sfx/cry0c_4.asm"
+INCLUDE "audio/sfx/cry02_4.asm"
+INCLUDE "audio/sfx/cry0d_4.asm"
+INCLUDE "audio/sfx/cry01_4.asm"
+INCLUDE "audio/sfx/cry0a_4.asm"
+INCLUDE "audio/sfx/cry08_4.asm"
+INCLUDE "audio/sfx/cry04_4.asm"
+INCLUDE "audio/sfx/cry19_4.asm"
+INCLUDE "audio/sfx/cry16_4.asm"
+INCLUDE "audio/sfx/cry1b_4.asm"
+INCLUDE "audio/sfx/cry12_4.asm"
+INCLUDE "audio/sfx/cry13_4.asm"
+INCLUDE "audio/sfx/cry14_4.asm"
+INCLUDE "audio/sfx/cry1e_4.asm"
+INCLUDE "audio/sfx/cry15_4.asm"
+INCLUDE "audio/sfx/cry17_4.asm"
+INCLUDE "audio/sfx/cry1c_4.asm"
+INCLUDE "audio/sfx/cry1a_4.asm"
+INCLUDE "audio/sfx/cry1d_4.asm"
+INCLUDE "audio/sfx/cry18_4.asm"
+INCLUDE "audio/sfx/cry1f_4.asm"
+INCLUDE "audio/sfx/cry20_4.asm"
+INCLUDE "audio/sfx/cry21_4.asm"
+INCLUDE "audio/sfx/cry22_4.asm"
+INCLUDE "audio/music/printer.asm"
+INCLUDE "audio/sfx/get_item1_4.asm"
+INCLUDE "audio/sfx/get_item1_4_2.asm"
+INCLUDE "audio/sfx/get_item2_4.asm"
+
+
SECTION "Audio Engine 1", ROMX
INCLUDE "audio/play_battle_music.asm"
@@ -370,7 +446,6 @@ INCLUDE "audio/low_health_alarm.asm"
SECTION "Audio Engine 2", ROMX
INCLUDE "audio/engine_2.asm"
-INCLUDE "audio/poke_flute.asm"
SECTION "Audio Engine 3", ROMX
@@ -379,8 +454,16 @@ INCLUDE "audio/pokedex_rating_sfx.asm"
INCLUDE "audio/engine_3.asm"
+SECTION "Audio Engine 4", ROMX
+
+INCLUDE "gfx/surfing_pikachu.asm"
+INCLUDE "audio/engine_4.asm"
+
+
SECTION "Music 1", ROMX
+Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
+
INCLUDE "audio/music/pkmnhealed.asm"
INCLUDE "audio/music/routes1.asm"
INCLUDE "audio/music/routes2.asm"
@@ -410,7 +493,6 @@ INCLUDE "audio/music/pokecenter.asm"
SECTION "Music 2", ROMX
-INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm"
INCLUDE "audio/sfx/unused2_2.asm"
INCLUDE "audio/music/gymleaderbattle.asm"
INCLUDE "audio/music/trainerbattle.asm"
@@ -448,3 +530,19 @@ INCLUDE "audio/music/surfing.asm"
INCLUDE "audio/music/jigglypuffsong.asm"
INCLUDE "audio/music/halloffame.asm"
INCLUDE "audio/music/credits.asm"
+INCLUDE "audio/music/yellowintro.asm"
+
+
+SECTION "Music 4", ROMX
+
+INCLUDE "audio/music/surfingpikachu.asm"
+INCLUDE "audio/music/yellowunusedsong.asm"
+INCLUDE "audio/music/meetjessiejames.asm"
+
+IF !DEF(_DEBUG)
+ INCBIN "garbage/bank20.bin"
+ENDC
+
+
+; Pikachu cries are in different banks
+INCLUDE "audio/pikachu_cries.asm"