aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/VermilionDock.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-09-06 16:54:17 -0500
committerdannye <33dannye@gmail.com>2025-09-06 16:54:17 -0500
commit377749ca4efac05b6c57dfed049899891af6c35a (patch)
tree4b429403935c4a7c2de710a6cbf7310246874539 /scripts/VermilionDock.asm
parentFix .tilemap file extension, fix some typos (#138) (diff)
parentDocument visual glitch with Pewter City Gym guy (#526) (diff)
downloadpokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.gz
pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.xz
pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/VermilionDock.asm')
-rw-r--r--scripts/VermilionDock.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index 6e8f6822..3cd26619 100644
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -49,7 +49,7 @@ VermilionDockSSAnneLeavesScript:
ld [wSpritePlayerStateData1ImageIndex], a
ld c, 120
call DelayFrames
- ld b, $9c
+ ld b, HIGH(vBGMap1)
call CopyScreenTileBufferToVRAM
hlcoord 0, 10
ld bc, SCREEN_WIDTH * 6
@@ -156,10 +156,10 @@ VermilionDock_EmitSmokePuff:
VermilionDockOAMBlock:
; tile ID, attributes
- db $fc, $10
- db $fd, $10
- db $fe, $10
- db $ff, $10
+ db $fc, OAM_PAL1
+ db $fd, OAM_PAL1
+ db $fe, OAM_PAL1
+ db $ff, OAM_PAL1
VermilionDock_SyncScrollWithLY:
ld h, d