diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-09 19:28:43 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-09 19:28:43 -0400 |
| commit | 9c61b495da446c2216bcd8c56aaa55fffdbf3d61 (patch) | |
| tree | 7f8706e0e174bffa26dad81fb08af5c6a98f99a1 /engine/overworld | |
| parent | b2002fdf4abee435a879522980425913c51dc9e5 (diff) | |
Fix bank1c errors and a few missed bank0 errors.
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index eb23c80c..23e24b23 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -18,9 +18,10 @@ AnimateHealingMachine: ; 7048b (1c:448b) call Func_7055a ld a, $4 ld [wMusicHeaderPointer], a - ld a, $ff - ld [wc0ee], a - call PlaySound + call StopAllMusic + ;ld a, $ff + ;ld [wc0ee], a + ;call PlaySound .asm_704ba ld a, [wMusicHeaderPointer] and a @@ -40,7 +41,6 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld [wc0f0], a jr nz, .asm_704e6 call StopAllMusic - call PlaySound ld a, $2 ; BANK(Music_PkmnHealed) ld [wc0ef], a .asm_704e6 diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 43d3ec9c..fc0a3a6c 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -38,8 +38,8 @@ EnterMapAnim: ; 70567 (1c:4567) ld [wd431], a .restoreDefaultMusic call PlayDefaultMusic - call Func_151d .done + call Func_151d jp RestoreFacingDirectionAndYScreenPos .dungeonWarpAnimation ld c, 50 @@ -393,8 +393,8 @@ Func_70816: ; 70816 (1c:4816) call DelayFrames ld hl, wd736 set 6, [hl] - ld de, RedSprite ; $4180 ld hl, vNPCSprites + ld de, RedSprite ; $4180 ld b, BANK(RedSprite) ld c, $c call CopyVideoData |