diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/routines/loadpushoam.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/routines/loadpushoam.asm')
| -rw-r--r-- | engine/routines/loadpushoam.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/routines/loadpushoam.asm b/engine/routines/loadpushoam.asm index c07c06d0f..95f67ff73 100644 --- a/engine/routines/loadpushoam.asm +++ b/engine/routines/loadpushoam.asm @@ -1,5 +1,5 @@ -LoadPushOAM:: ; 4031 - ld c, hPushOAM - $ff00 +WriteOAMDMACodeToHRAM:: ; 4031 + ld c, hTransferVirtualOAM - $ff00 ld b, .PushOAMEnd - .PushOAM ld hl, .PushOAM .loop @@ -11,7 +11,7 @@ LoadPushOAM:: ; 4031 ret .PushOAM: ; 403f - ld a, HIGH(Sprites) + ld a, HIGH(wVirtualOAM) ld [rDMA], a ld a, NUM_SPRITE_OAM_STRUCTS .pushoam_loop |