aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-12 01:49:22 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-12 01:49:22 -0500
commit9a5b7f5d19e84eb1caab7ecddaa0f157ebae5594 (patch)
treeb629f95bf769d6485ac39592a805c29af074b941 /engine/battle
parentMerge remote-tracking branch 'pokered/master' into merge-pokered (diff)
parentRemove some leftover address comments (diff)
downloadpokeyellow-9a5b7f5d19e84eb1caab7ecddaa0f157ebae5594.tar.gz
pokeyellow-9a5b7f5d19e84eb1caab7ecddaa0f157ebae5594.tar.xz
pokeyellow-9a5b7f5d19e84eb1caab7ecddaa0f157ebae5594.zip
Merge branch 'master' of https://github.com/pret/pokered into merge-pokered
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/animations.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 31148392..0d93b295 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2040,7 +2040,7 @@ _AnimationSlideMonOff:
; functions below catch it by checking if the tile number is within the valid
; range and if not, replacing it with a blank tile.
-.PlayerNextTile ; 79702 (1e:5702)
+.PlayerNextTile
ld a, [hl]
add 7
; bugfix: compares against the max tile + 1 as opposed to the max tile
@@ -2049,7 +2049,7 @@ _AnimationSlideMonOff:
ld a, " "
ret
-.EnemyNextTile ; 7970b (1e:570b)
+.EnemyNextTile
ld a, [hl]
sub 7
; This has the same problem as above, but it has no visible effect because