diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /engine/oam_dma.asm | |
| parent | 3394d8320f35f524231aa13bd9cae34e22246a6d (diff) | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'engine/oam_dma.asm')
| -rw-r--r-- | engine/oam_dma.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/oam_dma.asm b/engine/oam_dma.asm index 3de4d773..7326445e 100644 --- a/engine/oam_dma.asm +++ b/engine/oam_dma.asm @@ -15,11 +15,12 @@ WriteDMACodeToHRAM: DMARoutine: ; initiate DMA ld a, wOAMBuffer / $100 - ld [$ff46], a + ld [rDMA], a ; wait for DMA to finish ld a, $28 -.wait dec a +.wait + dec a jr nz, .wait ret DMARoutineEnd: |