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/pokemontower2.asm | |
| parent | Pull more data out of main.asm (diff) | |
| parent | Documented/Labeled Route 22 scripts. (diff) | |
| download | pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.tar.gz pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.tar.xz pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.zip | |
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/pokemontower2.asm')
| -rwxr-xr-x | scripts/pokemontower2.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 0dbb3a93..dbbc8e63 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -83,9 +83,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Music_RivalAlternateStart) - ld hl, Music_RivalAlternateStart - call Bankswitch + callba Music_RivalAlternateStart ld a, $2 ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a |