aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/oam.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-26 14:04:56 -0700
committeryenatch <yenatch@gmail.com>2014-05-26 22:04:39 -0700
commit40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch)
tree6de26c959808d5a792b692f2300c33557c1dbfab /engine/overworld/oam.asm
parentDon't hardcode wram sections (except for alignment). (diff)
downloadpokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.gz
pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.xz
pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.zip
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
Diffstat (limited to 'engine/overworld/oam.asm')
-rw-r--r--engine/overworld/oam.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm
index 040513b1..63495d22 100644
--- a/engine/overworld/oam.asm
+++ b/engine/overworld/oam.asm
@@ -2,13 +2,13 @@ PrepareOAMData:
; Determine OAM data for currently visible
; sprites and write it to wOAMBuffer.
- ld a, [$cfcb]
+ ld a, [wcfcb]
dec a
jr z, .asm_4b1e
cp 0 - 1
ret nz
- ld [$cfcb], a
+ ld [wcfcb], a
jp HideSprites
.asm_4b1e
@@ -27,7 +27,7 @@ PrepareOAMData:
inc e
inc e
ld a, [de] ; c1x2 (facing/anim)
- ld [$d5cd], a
+ ld [wd5cd], a
cp $ff ; off-screen (don't draw)
jr nz, .visible
@@ -92,7 +92,7 @@ PrepareOAMData:
push bc
ld b, a
- ld a, [$d5cd] ; temp copy of c1x2
+ ld a, [wd5cd] ; temp copy of c1x2
swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs)
and $f
@@ -143,7 +143,7 @@ PrepareOAMData:
ld h, wOAMBuffer / $100
ld de, $4
ld b, $a0
- ld a, [$d736]
+ ld a, [wd736]
bit 6, a
ld a, $a0
jr z, .clear