diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 20:44:18 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 20:44:18 -0400 |
| commit | e676e031a57371010742f779639024e371d5dc9f (patch) | |
| tree | 99f751b218c28f1df3181c927142eab5e19ba6a8 /engine/overworld/elevator.asm | |
| parent | 84a3ff0d1ff71f94be27a8e1a0aa63481eea88f3 (diff) | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/elevator.asm')
| -rwxr-xr-x | engine/overworld/elevator.asm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 05a9cc4e..b355102f 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -1,11 +1,10 @@ -ShakeElevator: ; 7bf15 (1e:7f15) +ShakeElevator: ; 75f07 (1d:5f07) ld de, -$20 call ShakeElevatorRedrawRow ld de, SCREEN_HEIGHT * $20 call ShakeElevatorRedrawRow call Delay3 - ld a, $ff - call PlaySound + call StopAllMusic ld a, [hSCY] ld d, a ld e, $1 @@ -27,19 +26,18 @@ ShakeElevator: ; 7bf15 (1e:7f15) jr nz, .shakeLoop ld a, d ld [hSCY], a - ld a, $ff - call PlaySound + call StopAllMusic ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop ld a, [wChannelSoundIDs + CH4] - cp $b9 + cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites jp PlayDefaultMusic -ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64) +ShakeElevatorRedrawRow: ; 75f52 (1d:5f52) ; This function is used to redraw certain portions of the screen, but it does ; not appear to ever result in any visible effect, so this function seems to ; be pointless. @@ -56,7 +54,7 @@ ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64) add hl, de ld a, h and $3 - or $98 + or vBGMap0 / $100 ld d, a ld a, l pop hl |