diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /audio.asm | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| parent | Commented/labelled misc functions (diff) | |
| download | pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.gz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.xz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.zip | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -563,7 +563,7 @@ Func_7d13b:: ; 7d13b (1f:513b) ld a, [hli] ld c, [hl] call PlayMusic - jp Func_2307 + jp PlayDefaultMusic PokedexRatingSfxPointers: ; 7d162 (1f:5162) db (SFX_1f_51 - SFX_Headers_1f) / 3, BANK(SFX_1f_51) |