From aae999f72bd81a3156c7e00da4ebf499f52da5a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 4 Nov 2020 15:16:20 -0500 Subject: Start reorganizing pokeyellow --- audio.asm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 737e9f70..bd5b390d 100644 --- a/audio.asm +++ b/audio.asm @@ -433,8 +433,6 @@ INCLUDE "audio/sfx/get_item2_4.asm" SECTION "Audio Engine 1", ROMX -AudioEngine1:: - INCLUDE "audio/play_battle_music.asm" INCLUDE "audio/engine_1.asm" INCLUDE "audio/alternate_tempo.asm" @@ -447,25 +445,18 @@ INCLUDE "audio/low_health_alarm.asm" SECTION "Audio Engine 2", ROMX -AudioEngine2:: - INCLUDE "audio/engine_2.asm" SECTION "Audio Engine 3", ROMX -AudioEngine3:: - INCLUDE "audio/pokedex_rating_sfx.asm" INCLUDE "audio/engine_3.asm" SECTION "Audio Engine 4", ROMX -SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu_1a.2bpp" -SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu_1b.2bpp" -SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu_1c.2bpp" - +INCLUDE "gfx/surfing_pikachu.asm" INCLUDE "audio/engine_4.asm" @@ -550,5 +541,6 @@ INCLUDE "audio/music/meetjessiejames.asm" INCBIN "audio/unknown_832b9.bin" -; cries are in different banks + +; Pikachu cries are in different banks INCLUDE "audio/pikachu_cries.asm" -- cgit v1.3.1-sl0p