aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/player_animations.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
commit2b7961759b3786725b95ee8f4a0b6e556091db7a (patch)
tree6287d4bb7bad7d012f804dc18856341a09fc015b /engine/overworld/player_animations.asm
parentMerge branch 'master' of https://github.com/iimarckus/pokered (diff)
downloadpokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip
Fixes.
Diffstat (limited to 'engine/overworld/player_animations.asm')
-rwxr-xr-xengine/overworld/player_animations.asm1
1 files changed, 0 insertions, 1 deletions
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