pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/battle_anims/anim_commands.asm
View File

@@ -245,7 +245,7 @@ BattleAnim_ClearOAM:
jr z, .delete
; Instead of deleting the sprites, make them all use PAL_BATTLE_OB_ENEMY
ld hl, wVirtualOAMSprite00Attributes
ld hl, wShadowOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS
.loop
ld a, [hl]
@@ -260,8 +260,8 @@ endr
ret
.delete
ld hl, wVirtualOAM
ld c, wVirtualOAMEnd - wVirtualOAM
ld hl, wShadowOAM
ld c, wShadowOAMEnd - wShadowOAM
xor a
.loop2
ld [hli], a
@@ -1477,10 +1477,10 @@ BattleAnim_UpdateOAM_All:
jr nz, .loop
ld a, [wBattleAnimOAMPointerLo]
ld l, a
ld h, HIGH(wVirtualOAM)
ld h, HIGH(wShadowOAM)
.loop2
ld a, l
cp LOW(wVirtualOAMEnd)
cp LOW(wShadowOAMEnd)
jr nc, .done
xor a
ld [hli], a

4
engine/battle_anims/core.asm
View File

@@ -106,7 +106,7 @@ BattleAnimOAMUpdate:
ld l, a
ld a, [wBattleAnimOAMPointerLo]
ld e, a
ld d, HIGH(wVirtualOAM)
ld d, HIGH(wShadowOAM)
.loop
; Y Coord
@@ -179,7 +179,7 @@ BattleAnimOAMUpdate:
inc de
ld a, e
ld [wBattleAnimOAMPointerLo], a
cp LOW(wVirtualOAMEnd)
cp LOW(wShadowOAMEnd)
jr nc, .exit_set_carry
dec c
jr nz, .loop