aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/animations.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
commit31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch)
tree6941b2b38a2615223b30e8cceb7aab636768dabd /engine/battle/animations.asm
parentSplit default names strings into separate lines to make it less unpleasant to... (diff)
parentFix typo: ninetails.asm -> ninetales.asm (diff)
downloadpokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/animations.asm')
-rwxr-xr-xengine/battle/animations.asm3
1 files changed, 0 insertions, 3 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 31b490f3..be8d2b18 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -373,9 +373,6 @@ ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine2.2bpp"
-ENDC
MoveAnimation: ; 78d5e (1e:4d5e)
push hl