summaryrefslogtreecommitdiff
path: root/scripts/vermiliondock.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
commitf4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch)
treec5eb931244f739bd3a88d488586923b2a0762b74 /scripts/vermiliondock.asm
parentcd649184f556db777d592671a7274bfa4a8423d7 (diff)
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/vermiliondock.asm')
-rwxr-xr-xscripts/vermiliondock.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm
index 7b23c41e..f070d377 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -2,7 +2,7 @@ VermilionDockScript: ; 1db52 (7:5b52)
call EnableAutoTextBoxDrawing
ld hl, wd803
bit 4, [hl]
- jr nz, .asm_1db8d ; 0x1db5a $31
+ jr nz, .asm_1db8d
bit 0, [hl]
ret z
ld a, [wDestinationWarpID]
@@ -49,7 +49,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
callba LoadSmokeTileFourTimes
xor a
ld [wSpriteStateData1 + 2], a
- ld c, $78
+ ld c, 120
call DelayFrames
ld b, $9c
call CopyScreenTileBufferToVRAM
@@ -97,13 +97,13 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
.asm_1dc16
call VermilionDock_1dc7c
dec c
- jr nz, .asm_1dc16 ; 0x1dc1a $fa
+ jr nz, .asm_1dc16
inc d
dec b
- jr nz, .asm_1dc11 ; 0x1dc1e $f1
+ jr nz, .asm_1dc11
pop bc
dec e
- jr nz, .asm_1dbfa ; 0x1dc22 $d6
+ jr nz, .asm_1dbfa
xor a
ld [$ff4a], a
ld [hWY], a
@@ -135,7 +135,7 @@ VermilionDock_1dc42: ; 1dc42 (7:5c42)
inc [hl]
add hl, de
dec c
- jr nz, .asm_1dc50 ; 0x1dc54 $fa
+ jr nz, .asm_1dc50
pop de
pop bc
ret
@@ -169,13 +169,13 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c)
.asm_1dc86
ld a, [$ff44]
cp l
- jr nz, .asm_1dc86 ; 0x1dc89 $fb
+ jr nz, .asm_1dc86
ld a, h
ld [$ff43], a
.asm_1dc8e
ld a, [$ff44]
cp h
- jr z, .asm_1dc8e ; 0x1dc91 $fb
+ jr z, .asm_1dc8e
ret
VermilionDock_1dc94: ; 1dc94 (7:5c94)
@@ -195,7 +195,7 @@ VermilionDock_1dc94: ; 1dc94 (7:5c94)
ld [hl], a
ld a, (SFX_02_54 - SFX_Headers_02) / 3
call PlaySound
- ld c, $78
+ ld c, 120
call DelayFrames
ret