summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/animations.asm10
-rwxr-xr-xengine/battle/core.asm4
2 files changed, 1 insertions, 13 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index dc08e0e1..8791d538 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -367,15 +367,7 @@ AnimationTileset2: ; 786ee (1e:46ee)
INCBIN "gfx/attack_anim_2.2bpp"
SlotMachineTiles2: ; 78bde (1e:4bde)
-IF DEF(_RED)
- INCBIN "gfx/red/slotmachine2.2bpp"
-ENDC
-IF DEF(_BLUE)
- INCBIN "gfx/blue/slotmachine2.2bpp"
-ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine2.2bpp"
-ENDC
+ INCBIN "gfx/slotmachine2.2bpp"
MoveAnimation: ; 78d5e (1e:4d5e)
push hl
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 8775604e..1b8203b1 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2972,11 +2972,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
jp Delay3
DisabledText: ; 3d555 (f:5555)
-IF DEF(_YELLOW)
db "Disabled!@"
-ELSE
- db "disabled!@"
-ENDC
TypeText: ; 3d55f (f:555f)
db "TYPE@"