wSpritesEnd -> wVirtualOAMEnd.

pret · Jan 30, 2018 · 4a3384a · 4a3384a
1 parent 0b45e2e
commit 4a3384a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
@@ -272,7 +272,7 @@ endr
 
 .delete
 	ld hl, wVirtualOAM
-	ld c, wSpritesEnd - wVirtualOAM
+	ld c, wVirtualOAMEnd - wVirtualOAM
 	xor a
 .loop2
 	ld [hli], a
@@ -1502,7 +1502,7 @@ BattleAnim_UpdateOAM_All: ; cc96e
 	ld h, HIGH(wVirtualOAM)
 .loop2
 	ld a, l
-	cp LOW(wSpritesEnd)
+	cp LOW(wVirtualOAMEnd)
 	jr nc, .done
 	xor a
 	ld [hli], a

diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
@@ -64,7 +64,7 @@ endr
 	dec c
 	jr nz, .OAMloop
 	ld hl, wVirtualOAMSprite04
-	ld bc, wSpritesEnd - wVirtualOAMSprite04
+	ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret

diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
@@ -63,7 +63,7 @@ ShakeHeadbuttTree: ; 8c80a
 	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 @@ endr
 	dec c
 	jr nz, .OAMloop
 	ld hl, wVirtualOAMSprite04
-	ld bc, wSpritesEnd - wVirtualOAMSprite04
+	ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret

diff --git a/engine/map_objects.asm b/engine/map_objects.asm
@@ -2821,7 +2821,7 @@ _UpdateSprites:: ; 5920
 .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 @@ InitSprites: ; 5991
 	ld a, [hli]
 	ld [hUsedSpriteTile], a
 	add c
-	cp LOW(wSpritesEnd)
+	cp LOW(wVirtualOAMEnd)
 	jr nc, .full
 .addsprite
 	ld a, [hFFC0]

diff --git a/engine/pokegear.asm b/engine/pokegear.asm
@@ -2589,7 +2589,7 @@ Pokedex_GetArea: ; 91d11
 .copy_sprites
 	hlcoord 0, 0
 	ld de, wVirtualOAM
-	ld bc, wSpritesEnd - wVirtualOAM
+	ld bc, wVirtualOAMEnd - wVirtualOAM
 	call CopyBytes
 	ret
 
@@ -2656,7 +2656,7 @@ Pokedex_GetArea: ; 91d11
 .done_nest
 	ld hl, wVirtualOAM
 	decoord 0, 0
-	ld bc, wSpritesEnd - wVirtualOAM
+	ld bc, wVirtualOAMEnd - wVirtualOAM
 	call CopyBytes
 	ret
 
@@ -2701,7 +2701,7 @@ Pokedex_GetArea: ; 91d11
 
 .clear_oam
 	ld hl, wVirtualOAMSprite04
-	ld bc, wSpritesEnd - wVirtualOAMSprite04
+	ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret
@@ -2742,7 +2742,7 @@ Pokedex_GetArea: ; 91d11
 
 .clear
 	ld hl, wVirtualOAM
-	ld bc, wSpritesEnd - wVirtualOAM
+	ld bc, wVirtualOAMEnd - wVirtualOAM
 	xor a
 	call ByteFill
 	scf

diff --git a/engine/sprites.asm b/engine/sprites.asm
@@ -62,9 +62,9 @@ DoNextFrameForAllSprites: ; 8cf7a
 	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 @@ UpdateAnimFrame: ; 8d04c
 	inc de
 	ld a, e
 	ld [wCurrSpriteOAMAddr], a
-	cp LOW(wSpritesEnd)
+	cp LOW(wVirtualOAMEnd)
 	jr nc, .reached_the_end
 	dec c
 	jr nz, .loop

diff --git a/home.asm b/home.asm
@@ -170,7 +170,7 @@ INCLUDE "home/double_speed.asm"
 ClearSprites:: ; 300b
 ; Erase OAM data
 	ld hl, wVirtualOAM
-	ld b, wSpritesEnd - wVirtualOAM
+	ld b, wVirtualOAMEnd - wVirtualOAM
 	xor a
 .loop
 	ld [hli], a

diff --git a/wram.asm b/wram.asm
@@ -343,7 +343,7 @@ wVirtualOAMSprite36:: sprite_oam_struct wVirtualOAMSprite36
 wVirtualOAMSprite37:: sprite_oam_struct wVirtualOAMSprite37
 wVirtualOAMSprite38:: sprite_oam_struct wVirtualOAMSprite38
 wVirtualOAMSprite39:: sprite_oam_struct wVirtualOAMSprite39
-wSpritesEnd::
+wVirtualOAMEnd::
 
 
 SECTION "Tilemap", WRAM0