From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 engine/overworld/elevator.asm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engine/overworld/elevator.asm')

diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 47ec78f9..b873ffad 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -1,11 +1,11 @@
-ShakeElevator:
+ShakeElevator::
 	ld de, -$20
 	call ShakeElevatorRedrawRow
 	ld de, SCREEN_HEIGHT * $20
 	call ShakeElevatorRedrawRow
 	call Delay3
 	call StopAllMusic
-	ld a, [hSCY]
+	ldh a, [hSCY]
 	ld d, a
 	ld e, $1
 	ld b, 100
@@ -14,7 +14,7 @@ ShakeElevator:
 	xor $fe
 	ld e, a
 	add d
-	ld [hSCY], a
+	ldh [hSCY], a
 	push bc
 	ld c, BANK(SFX_Collision_1)
 	ld a, SFX_COLLISION
@@ -25,7 +25,7 @@ ShakeElevator:
 	dec b
 	jr nz, .shakeLoop
 	ld a, d
-	ld [hSCY], a
+	ldh [hSCY], a
 	call StopAllMusic
 	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
@@ -54,7 +54,7 @@ ShakeElevatorRedrawRow:
 	add hl, de
 	ld a, h
 	and $3
-	or vBGMap0 / $100
+	or HIGH(vBGMap0)
 	ld d, a
 	ld a, l
 	pop hl
-- 
cgit v1.3.1-sl0p