diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 13:07:24 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 13:07:24 -0400 |
| commit | 3f6268d11c4df1814454611b2ba6a1f2a0fa141e (patch) | |
| tree | 1567f6d468f6fbc05c09444b1e7e08264b613c04 /scripts | |
| parent | fe21110e6f2f56927f8393c54a985021305ec7a0 (diff) | |
VermilionDock
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vermiliondock.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 78ada7cf..cef1766e 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -40,8 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, $ff ld [wJoyIgnore], a - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic @@ -63,6 +62,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld [H_AUTOBGTRANSFERENABLED], a ld [wSSAnneSmokeDriftAmount], a ld [rOBP1], a + call UpdateGBCPal_OBP1 ld a, 88 ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer @@ -124,7 +124,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) push bc push de - ld hl, wOAMBuffer + $11 + ld hl, wOAMBuffer + 4 * $4 + 1 ; x coord ld a, [wSSAnneSmokeDriftAmount] swap a ld c, a |