diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:41:17 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:41:17 -0600 |
| commit | 23daa5361f2b60b166b78f8ecae3d9d34771183c (patch) | |
| tree | 43c3d530c76b5088cace620a805eab418324c505 /engine | |
| parent | 5194ca8408af8e1c6181b26e60eb942a658514ca (diff) | |
Sync home/audio.asm with pokecrystal.
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/main_menu.asm | 6 | ||||
| -rwxr-xr-x | engine/overworld/map_objects.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm index ff480e37..73debf65 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -266,8 +266,8 @@ Function5c3a: ; 5c3a (1:5c3a) ret Function5c41: ; 5c41 (1:5c41) - ld hl, wOAMBuffer - ld bc, wOptions - wOAMBuffer + ld hl, wVirtualOAM + ld bc, wOptions - wVirtualOAM xor a call ByteFill @@ -1064,7 +1064,7 @@ Intro_PlacePlayerSprite: ; 6210 (1:6210) lb bc, BANK(PlayerSpriteGFX), 12 ld hl, $8000 call Request2bpp - ld hl, wOAMBuffer + ld hl, wVirtualOAM ld de, .OAMData ld a, [de] inc de diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 1c118ed6..2bf5fda2 100755 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -1176,7 +1176,7 @@ Function58b0: ; 58b0 (1:58b0) cp b ret nc ld l, a - ld h, wOAMBuffer / $100 + ld h, wVirtualOAM / $100 ld de, $4 ld a, b ld c, $a0 |