diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /scripts/silphco7.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'scripts/silphco7.asm')
| -rwxr-xr-x | scripts/silphco7.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index dfd139c0..5691ad8a 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -221,9 +221,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Music_RivalAlternateStart) - ld hl, Music_RivalAlternateStart - call Bankswitch + callba Music_RivalAlternateStart ld de, MovementData_51d1d ld a, [$cf0d] cp $1 |