summaryrefslogtreecommitdiff
path: root/engine/battle_anims
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 16:45:34 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 16:45:34 -0500
commitf2ae74079fc917cbf7e1f640eb8beda0d4740887 (patch)
treed1982b2f1c0c23e1b274ed84db330351d4f4806b /engine/battle_anims
parentc60f1331fef22b886adf3472d2b4f348832cfaf7 (diff)
Prefix wram labels with w, part 1.
Handle edge cases first.
Diffstat (limited to 'engine/battle_anims')
-rw-r--r--engine/battle_anims/anim_commands.asm6
-rwxr-xr-xengine/battle_anims/core.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 0bbedf909..a25e4a98e 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -271,8 +271,8 @@ endr
ret
.delete
- ld hl, Sprites
- ld c, SpritesEnd - Sprites
+ ld hl, wVirtualOAM
+ ld c, SpritesEnd - wVirtualOAM
xor a
.loop2
ld [hli], a
@@ -1499,7 +1499,7 @@ BattleAnim_UpdateOAM_All: ; cc96e
jr nz, .loop
ld a, [wBattleAnimOAMPointerLo]
ld l, a
- ld h, HIGH(Sprites)
+ ld h, HIGH(wVirtualOAM)
.loop2
ld a, l
cp LOW(SpritesEnd)
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 55adeae8c..2b0dcad34 100755
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -106,7 +106,7 @@ BattleAnimOAMUpdate: ; cca09
ld l, a
ld a, [wBattleAnimOAMPointerLo]
ld e, a
- ld d, HIGH(Sprites)
+ ld d, HIGH(wVirtualOAM)
.loop
ld a, [wBattleAnimTempYCoord]
ld b, a