From f2ae74079fc917cbf7e1f640eb8beda0d4740887 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Tue, 23 Jan 2018 16:45:34 -0500 Subject: Prefix wram labels with w, part 1. Handle edge cases first. --- engine/battle_anims/anim_commands.asm | 6 +++--- engine/battle_anims/core.asm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/battle_anims') 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 -- cgit v1.2.3