From 2b7961759b3786725b95ee8f4a0b6e556091db7a Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 30 Aug 2015 18:56:44 -0400 Subject: Fixes. --- engine/overworld/healing_machine.asm | 2 -- engine/overworld/player_animations.asm | 1 - 2 files changed, 3 deletions(-) (limited to 'engine/overworld') 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 -- cgit v1.3.1-sl0p