aboutsummaryrefslogtreecommitdiffstats
path: root/engine/slot_machine.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /engine/slot_machine.asm
parentClean up text commands (diff)
parentUse pattern variables in the makefile. (diff)
downloadpokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.gz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.xz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/slot_machine.asm')
-rwxr-xr-xengine/slot_machine.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 0a8b5cb9..2dfcffde 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -865,7 +865,7 @@ LoadSlotMachineTiles:
call FarCopyData2
ld hl, SlotMachineMap
coord de, 0, 0
- ld bc, $00f0
+ ld bc, SlotMachineMapEnd - SlotMachineMap
call CopyData
call EnableLCD
ld hl, wSlotMachineWheel1Offset
@@ -879,6 +879,7 @@ LoadSlotMachineTiles:
SlotMachineMap:
INCBIN "gfx/tilemaps/slotmachine.map"
+SlotMachineMapEnd:
INCLUDE "data/slot_machine_wheels.asm"