ref: 4a3384ab09c735f1a8cac54dddf0e5741f1875a7
parent: 0b45e2e846c8b2feb7d2c4c4ebb854db07cf06fd
author: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
date: Tue Jan 30 09:55:20 EST 2018
wSpritesEnd -> wVirtualOAMEnd.
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -272,7 +272,7 @@
.delete
ld hl, wVirtualOAM
- ld c, wSpritesEnd - wVirtualOAM
+ ld c, wVirtualOAMEnd - wVirtualOAM
xor a
.loop2
ld [hli], a
@@ -1502,7 +1502,7 @@
ld h, HIGH(wVirtualOAM)
.loop2
ld a, l
- cp LOW(wSpritesEnd)
+ cp LOW(wVirtualOAMEnd)
jr nc, .done
xor a
ld [hli], a
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -64,7 +64,7 @@
dec c
jr nz, .OAMloop
ld hl, wVirtualOAMSprite04
- ld bc, wSpritesEnd - wVirtualOAMSprite04
+ ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
xor a
call ByteFill
ret
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -63,7 +63,7 @@
ld [hBGMapMode], a
farcall ClearSpriteAnims
ld hl, wVirtualOAMSprite36
- ld bc, wSpritesEnd - wVirtualOAMSprite36
+ ld bc, wVirtualOAMEnd - wVirtualOAMSprite36
xor a
call ByteFill
ld de, Font
@@ -405,7 +405,7 @@
dec c
jr nz, .OAMloop
ld hl, wVirtualOAMSprite04
- ld bc, wSpritesEnd - wVirtualOAMSprite04
+ ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
xor a
call ByteFill
ret
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2821,7 +2821,7 @@
.fill
ld a, [wVramState]
bit 1, a
- ld b, LOW(wSpritesEnd)
+ ld b, LOW(wVirtualOAMEnd)
jr z, .ok
ld b, 28 * SPRITEOAMSTRUCT_LENGTH
.ok
@@ -3047,7 +3047,7 @@
ld a, [hli]
ld [hUsedSpriteTile], a
add c
- cp LOW(wSpritesEnd)
+ cp LOW(wVirtualOAMEnd)
jr nc, .full
.addsprite
ld a, [hFFC0]
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2589,7 +2589,7 @@
.copy_sprites
hlcoord 0, 0
ld de, wVirtualOAM
- ld bc, wSpritesEnd - wVirtualOAM
+ ld bc, wVirtualOAMEnd - wVirtualOAM
call CopyBytes
ret
@@ -2656,7 +2656,7 @@
.done_nest
ld hl, wVirtualOAM
decoord 0, 0
- ld bc, wSpritesEnd - wVirtualOAM
+ ld bc, wVirtualOAMEnd - wVirtualOAM
call CopyBytes
ret
@@ -2701,7 +2701,7 @@
.clear_oam
ld hl, wVirtualOAMSprite04
- ld bc, wSpritesEnd - wVirtualOAMSprite04
+ ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
xor a
call ByteFill
ret
@@ -2742,7 +2742,7 @@
.clear
ld hl, wVirtualOAM
- ld bc, wSpritesEnd - wVirtualOAM
+ ld bc, wVirtualOAMEnd - wVirtualOAM
xor a
call ByteFill
scf
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -62,9 +62,9 @@
ld l, a
ld h, HIGH(wVirtualOAM)
-.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> wSpritesEnd)
+.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> wVirtualOAMEnd)
ld a, l
- cp LOW(wSpritesEnd)
+ cp LOW(wVirtualOAMEnd)
jr nc, .done
xor a
ld [hli], a
@@ -302,7 +302,7 @@
inc de
ld a, e
ld [wCurrSpriteOAMAddr], a
- cp LOW(wSpritesEnd)
+ cp LOW(wVirtualOAMEnd)
jr nc, .reached_the_end
dec c
jr nz, .loop
--- a/home.asm
+++ b/home.asm
@@ -170,7 +170,7 @@
ClearSprites:: ; 300b
; Erase OAM data
ld hl, wVirtualOAM
- ld b, wSpritesEnd - wVirtualOAM
+ ld b, wVirtualOAMEnd - wVirtualOAM
xor a
.loop
ld [hli], a
--- a/wram.asm
+++ b/wram.asm
@@ -343,7 +343,7 @@
wVirtualOAMSprite37:: sprite_oam_struct wVirtualOAMSprite37
wVirtualOAMSprite38:: sprite_oam_struct wVirtualOAMSprite38
wVirtualOAMSprite39:: sprite_oam_struct wVirtualOAMSprite39
-wSpritesEnd::
+wVirtualOAMEnd::
SECTION "Tilemap", WRAM0