aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/elevator.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 00:54:14 -0700
committerGitHub <noreply@github.com>2016-06-12 00:54:14 -0700
commit2b2c6fefd311101c87845c8c498746dc74bd725f (patch)
tree3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/overworld/elevator.asm
parentRemove the last address comments (diff)
parentmore syncing with pokeyellow (diff)
downloadpokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.gz
pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.xz
pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.zip
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
Diffstat (limited to 'engine/overworld/elevator.asm')
-rwxr-xr-xengine/overworld/elevator.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 4ec34922..929e4f22 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -34,7 +34,7 @@ ShakeElevator:
call PlayMusic
.musicLoop
ld a, [wChannelSoundIDs + CH4]
- cp $b9
+ cp SFX_SAFARI_ZONE_PA
jr z, .musicLoop
call UpdateSprites
jp PlayDefaultMusic
@@ -56,7 +56,7 @@ ShakeElevatorRedrawRow:
add hl, de
ld a, h
and $3
- or $98
+ or vBGMap0 / $100
ld d, a
ld a, l
pop hl