diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-04 20:11:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:11:52 -0500 |
| commit | ed03fc4f4a3287a01647e528abba27aac1937de0 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /audio.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Start reorganizing pokeyellow (diff) | |
| download | pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.gz pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.xz pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.zip | |
Merge pull request #59 from Rangi42/master
Start reorganizing pokeyellow
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -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" |