This commit is contained in:
dannye 2021-03-23 00:53:43 -05:00
commit e8dd755e18
3702 changed files with 163333 additions and 159040 deletions

16
engine/overworld/elevator.asm Executable file → Normal file
View file

@ -1,12 +1,12 @@
ShakeElevator:
ShakeElevator::
ld de, -$20
call ShakeElevatorRedrawRow
ld de, SCREEN_HEIGHT * $20
call ShakeElevatorRedrawRow
call Delay3
ld a, $ff
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld a, [hSCY]
ldh a, [hSCY]
ld d, a
ld e, $1
ld b, 100
@ -15,7 +15,7 @@ ShakeElevator:
xor $fe
ld e, a
add d
ld [hSCY], a
ldh [hSCY], a
push bc
ld c, 0 ; BANK(SFX_Collision_1)
ld a, SFX_COLLISION
@ -26,14 +26,14 @@ ShakeElevator:
dec b
jr nz, .shakeLoop
ld a, d
ld [hSCY], a
ld a, $ff
ldh [hSCY], a
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld c, 0 ; BANK(SFX_Safari_Zone_PA)
ld a, SFX_SAFARI_ZONE_PA
call PlaySound
.musicLoop
ld a, [wChannelSoundIDs + Ch4]
ld a, [wChannelSoundIDs + Ch5]
cp SFX_SAFARI_ZONE_PA
jr z, .musicLoop
call UpdateSprites
@ -56,7 +56,7 @@ ShakeElevatorRedrawRow:
add hl, de
ld a, h
and $3
or vBGMap0 / $100
or HIGH(vBGMap0)
ld d, a
ld a, l
pop hl