summaryrefslogtreecommitdiff
path: root/scripts/VermilionDock.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /scripts/VermilionDock.asm
parentc85050497c1bd062e9cd40bf5b32fa3beca366cc (diff)
parent36f8cd1477b8ebe0537e99abd3ba53471a2e16c4 (diff)
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'scripts/VermilionDock.asm')
-rwxr-xr-xscripts/VermilionDock.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index 65b66c52..90fef6b2 100755
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -38,7 +38,7 @@ VermilionDock_Script:
VermilionDock_1db9b:
SetEventForceReuseHL EVENT_SS_ANNE_LEFT
- ld a, $ff
+ ld a, SFX_STOP_ALL_MUSIC
ld [wJoyIgnore], a
ld [wNewSoundID], a
call PlaySound
@@ -57,10 +57,10 @@ VermilionDock_1db9b:
ld a, $14 ; water tile
call FillMemory
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [wSSAnneSmokeDriftAmount], a
ld [rOBP1], a
ld a, 88
@@ -78,7 +78,7 @@ VermilionDock_1db9b:
ld d, $0
ld e, $8
.asm_1dbfa
- ld hl, $0002
+ ld hl, $2
add hl, bc
ld a, l
ld [wMapViewVRAMPointer], a