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/vermiliondock.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/vermiliondock.asm')
| -rwxr-xr-x | scripts/vermiliondock.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 2e07e408..164abe7c 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -46,9 +46,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic - ld b, BANK(LoadSmokeTileFourTimes) - ld hl, LoadSmokeTileFourTimes - call Bankswitch + callba LoadSmokeTileFourTimes xor a ld [$c102], a ld c, $78 |