diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /engine/overworld | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip | |
Fixes.
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index e9310925..8269aefd 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -11,7 +11,6 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld a, [rOBP1] push af ld a, $e0 -<<<<<<< HEAD ld [rOBP1], a ; $ff49 call Func_3061 ld hl, wOAMBuffer + $84 @@ -33,7 +32,6 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld c, 30 call DelayFrames dec b -<<<<<<< HEAD jr nz, .partyLoop ld a, [wAudioROMBank] cp $1f diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 05be3d1d..6488eaac 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -414,7 +414,6 @@ FishingAnim: ; 70816 (1c:4816) ld a, [wRodResponse] and a ld hl, NoNibbleText -<<<<<<< HEAD jr z, .done cp $2 ld hl, NothingHereText |