diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
| commit | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (patch) | |
| tree | 971ea955f5d40af7612f7b69029b49db98064690 /engine/slot_machine.asm | |
| parent | Name sound effects (diff) | |
| parent | small changes (diff) | |
| download | pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.tar.gz pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.tar.xz pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/evos_moves.asm
engine/overworld/healing_machine.asm
Diffstat (limited to 'engine/slot_machine.asm')
| -rwxr-xr-x | engine/slot_machine.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index c7968c10..990687ff 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -867,7 +867,7 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) ld bc, $00f0 call CopyData call EnableLCD - ld hl, wTrainerEngageDistance + ld hl, wSlotMachineWheel1Offset ld a, $1c ld [hli], a ld [hli], a |