wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)

This commit is contained in:
Colton G. Rushton
2022-07-09 18:18:22 -03:00
committed by GitHub
parent ef9b9bb437
commit 145d8dd5c2
37 changed files with 113 additions and 113 deletions

View File

@@ -533,7 +533,7 @@ Function8942b:
Function89448:
; Clears the sprite array
push af
ld hl, wVirtualOAM
ld hl, wShadowOAM
ld d, 24 * SPRITEOAMSTRUCT_LENGTH
xor a
.loop
@@ -1813,7 +1813,7 @@ Function89b97:
ld a, [hli]
ld h, [hl]
ld l, a
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
.asm_89bb4
ld a, [hli]
cp $ff
@@ -1900,7 +1900,7 @@ Function89c44:
pop de
ret
.asm_89c4f
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
push de
ld a, b
ld [hli], a ; y
@@ -2008,7 +2008,7 @@ Function89cdf:
ld c, a
ld e, $2
ld a, $2
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
.asm_89cee
push af
push bc
@@ -2427,7 +2427,7 @@ Function89f77:
Function89f9a:
dec a
ld hl, wVirtualOAM
ld hl, wShadowOAM
and a
ret z
.asm_89fa0
@@ -3132,7 +3132,7 @@ asm_8a529:
ld [hli], a
ld a, $ff
ld [hli], a
ld hl, wVirtualOAM
ld hl, wShadowOAM
xor a
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill

View File

@@ -6738,7 +6738,7 @@ Function10306e:
ld a, $01
ldh [hOAMUpdate], a
call ClearSprites
ld de, wVirtualOAM
ld de, wShadowOAM
call Function1030cd
xor a
ldh [hOAMUpdate], a

View File

@@ -20,7 +20,7 @@ Function115dc3:
xor a
ld [wc305], a
ld a, $a0
ld hl, wVirtualOAMSprite31
ld hl, wShadowOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ret
@@ -30,7 +30,7 @@ Function115dd3:
and a
ret z
ld a, $a0
ld hl, wVirtualOAMSprite31
ld hl, wShadowOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call Function115e22
@@ -46,7 +46,7 @@ Function115dd3:
ld d, a
push de
pop hl
ld de, wVirtualOAMSprite31
ld de, wShadowOAMSprite31
ld a, [wc307]
ld c, a
ld a, [wc308]
@@ -345,7 +345,7 @@ Function11619d:
cp $2
jr c, .asm_1161b4
ld a, $a0
ld hl, wVirtualOAM
ld hl, wShadowOAM
ld bc, 25 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
@@ -549,7 +549,7 @@ Function1162f2:
ld e, a
ld a, [hli]
sub e
ld de, wVirtualOAMSprite09
ld de, wShadowOAMSprite09
.asm_116321
push af
ld a, [hli]
@@ -590,7 +590,7 @@ Function1162f2:
ld e, a
ld a, [hli]
sub e
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
.asm_11635a
push af
ld a, [hli]
@@ -629,7 +629,7 @@ Function11636e:
ld a, $1
ldh [rSVBK], a
ld a, $a0
ld hl, wVirtualOAM
ld hl, wShadowOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ld a, $90
@@ -655,7 +655,7 @@ Function1163c0:
ld a, $1
ldh [rSVBK], a
ld a, $a0
ld hl, wVirtualOAM
ld hl, wShadowOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call DelayFrame

View File

@@ -6663,7 +6663,7 @@ Function11b31b:
db $39 ; 13
Function11b397:
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
.loop
ld a, [hl]
cp $ff
@@ -6719,7 +6719,7 @@ Function11b3b6: ; unreferenced
jr .loop
Function11b3d9:
ld de, wVirtualOAMSprite28
ld de, wShadowOAMSprite28
push de
ld a, [wc7d2]
dec a

View File

@@ -535,7 +535,7 @@ Function16cb2e:
ret z
call Function16cb40
ld hl, Unknown_16cb86
ld de, wVirtualOAM
ld de, wShadowOAM
call Function16cb5d
ret

View File

@@ -529,7 +529,7 @@ String_17a9b2:
db "@"
Function17a9cb:
ld de, wVirtualOAM
ld de, wShadowOAM
ld hl, $d088
bit 6, [hl]
jr nz, .bit_6_set