diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:14 -0700 |
| commit | 2b2c6fefd311101c87845c8c498746dc74bd725f (patch) | |
| tree | 3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/slot_machine.asm | |
| parent | Remove the last address comments (diff) | |
| parent | more syncing with pokeyellow (diff) | |
| download | pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.gz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.xz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.zip | |
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
Diffstat (limited to 'engine/slot_machine.asm')
| -rwxr-xr-x | engine/slot_machine.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 733cc29c..fb845c45 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -864,7 +864,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 @@ -878,6 +878,7 @@ LoadSlotMachineTiles: SlotMachineMap: INCBIN "gfx/tilemaps/slotmachine.map" +SlotMachineMapEnd: INCLUDE "data/slot_machine_wheels.asm" |