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

2
constants/gfx_constants.asm
View File

@@ -40,7 +40,7 @@ DEF SPRITEOAMSTRUCT_XCOORD rb ; 1
DEF SPRITEOAMSTRUCT_TILE_ID rb ; 2
DEF SPRITEOAMSTRUCT_ATTRIBUTES rb ; 3
DEF SPRITEOAMSTRUCT_LENGTH EQU _RS
DEF NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
DEF NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wShadowOAM
DEF SPRITE_GFX_LIST_CAPACITY EQU 32 ; see wUsedSprites

2
engine/battle/core.asm
View File

@@ -9025,7 +9025,7 @@ CopyBackpic:
ret
.LoadTrainerBackpicAsOAM:
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
xor a
ldh [hMapObjectIndex], a
ld b, 6

2
engine/battle/sliding_intro.asm
View File

@@ -57,7 +57,7 @@ BattleIntroSlidingPics:
ret
.subfunction3
ld hl, wVirtualOAMSprite00XCoord
ld hl, wShadowOAMSprite00XCoord
ld c, $12 ; 18
ld de, SPRITEOAMSTRUCT_LENGTH
.loop3

8
engine/battle/trainer_huds.asm
View File

@@ -26,7 +26,7 @@ ShowPlayerMonsRemaining:
ld [hl], a
ld a, 8
ld [wPlaceBallsDirection], a
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
jp LoadTrainerHudOAM
ShowOTTrainerMonsRemaining:
@@ -41,7 +41,7 @@ ShowOTTrainerMonsRemaining:
ld [hl], 4 * 8
ld a, -8
ld [wPlaceBallsDirection], a
ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
jp LoadTrainerHudOAM
StageBallTilesData:
@@ -187,7 +187,7 @@ LinkBattle_TrainerHuds:
ld [hl], 8 * 8
ld a, 8
ld [wPlaceBallsDirection], a
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
call LoadTrainerHudOAM
ld hl, wOTPartyMon1HP
@@ -197,7 +197,7 @@ LinkBattle_TrainerHuds:
ld a, 10 * 8
ld [hli], a
ld [hl], 13 * 8
ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
jp LoadTrainerHudOAM
LoadTrainerHudOAM:

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

2
engine/debug/color_picker.asm
View File

@@ -1026,7 +1026,7 @@ DebugColor_PlaceCursor:
ld b, $70 ; initial tile id
ld c, 5 ; initial palette
ld hl, wVirtualOAM
ld hl, wShadowOAM
ld de, wDebugRedChannel
call .placesprite
ld de, wDebugGreenChannel

6
engine/events/celebi.asm
View File

@@ -55,7 +55,7 @@ CelebiShrineEvent:
ret
.RestorePlayerSprite_DespawnLeaves:
ld hl, wVirtualOAMSprite00TileID
ld hl, wShadowOAMSprite00TileID
xor a
ld c, 4
.OAMloop:
@@ -66,8 +66,8 @@ endr
inc a
dec c
jr nz, .OAMloop
ld hl, wVirtualOAMSprite04
ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
ld hl, wShadowOAMSprite04
ld bc, wShadowOAMEnd - wShadowOAMSprite04
xor a
call ByteFill
ret

10
engine/events/field_moves.asm
View File

@@ -64,8 +64,8 @@ ShakeHeadbuttTree:
xor a
ldh [hBGMapMode], a
farcall ClearSpriteAnims
ld hl, wVirtualOAMSprite36
ld bc, wVirtualOAMEnd - wVirtualOAMSprite36
ld hl, wShadowOAMSprite36
ld bc, wShadowOAMEnd - wShadowOAMSprite36
xor a
call ByteFill
ld de, Font
@@ -369,7 +369,7 @@ FlyToAnim:
ret
.RestorePlayerSprite_DespawnLeaves:
ld hl, wVirtualOAMSprite00TileID
ld hl, wShadowOAMSprite00TileID
xor a
ld c, 4
.OAMloop
@@ -380,8 +380,8 @@ endr
inc a
dec c
jr nz, .OAMloop
ld hl, wVirtualOAMSprite04
ld bc, wVirtualOAMEnd - wVirtualOAMSprite04
ld hl, wShadowOAMSprite04
ld bc, wShadowOAMEnd - wShadowOAMSprite04
xor a
call ByteFill
ret

4
engine/events/heal_machine_anim.asm
View File

@@ -91,14 +91,14 @@ ENDM
ret
.PC_LoadBallsOntoMachine:
ld hl, wVirtualOAMSprite32
ld hl, wShadowOAMSprite32
ld de, .PC_ElmsLab_OAM
call .PlaceHealingMachineTile
call .PlaceHealingMachineTile
jr .LoadBallsOntoMachine
.HOF_LoadBallsOntoMachine:
ld hl, wVirtualOAMSprite32
ld hl, wShadowOAMSprite32
ld de, .HOF_OAM
.LoadBallsOntoMachine:

2
engine/games/card_flip.asm
View File

@@ -557,7 +557,7 @@ CardFlip_CopyToBox:
ret
CardFlip_CopyOAM:
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
ld a, [hli]
.loop
push af

8
engine/games/slot_machine.asm
View File

@@ -258,7 +258,7 @@ AnimateSlotReelIcons: ; unreferenced
inc [hl]
and $7
ret nz
ld hl, wVirtualOAMSprite16TileID
ld hl, wShadowOAMSprite16TileID
ld c, NUM_SPRITE_OAM_STRUCTS - 16
.loop
ld a, [hl]
@@ -667,7 +667,7 @@ Slots_InitReelTiles:
ld bc, wReel1
ld hl, REEL_OAM_ADDR
add hl, bc
ld de, wVirtualOAMSprite16
ld de, wShadowOAMSprite16
ld [hl], e
inc hl
ld [hl], d
@@ -685,7 +685,7 @@ Slots_InitReelTiles:
ld bc, wReel2
ld hl, REEL_OAM_ADDR
add hl, bc
ld de, wVirtualOAMSprite24
ld de, wShadowOAMSprite24
ld [hl], e
inc hl
ld [hl], d
@@ -703,7 +703,7 @@ Slots_InitReelTiles:
ld bc, wReel3
ld hl, REEL_OAM_ADDR
add hl, bc
ld de, wVirtualOAMSprite32
ld de, wShadowOAMSprite32
ld [hl], e
inc hl
ld [hl], d

2
engine/games/unown_puzzle.asm
View File

@@ -520,7 +520,7 @@ RedrawUnownPuzzlePieces:
ld hl, .OAM_NotHoldingPiece
.load
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
.loop
ld a, [hli]
cp -1

6
engine/gfx/load_push_oam.asm
View File

@@ -1,5 +1,5 @@
WriteOAMDMACodeToHRAM::
ld c, LOW(hTransferVirtualOAM)
ld c, LOW(hTransferShadowOAM)
ld b, OAMDMACodeEnd - OAMDMACode
ld hl, OAMDMACode
.copy
@@ -14,9 +14,9 @@ OAMDMACode:
; This code is defined in ROM, but
; copied to and called from HRAM.
LOAD "OAM DMA", HRAM
hTransferVirtualOAM::
hTransferShadowOAM::
; initiate DMA
ld a, HIGH(wVirtualOAM)
ld a, HIGH(wShadowOAM)
ldh [rDMA], a
; wait for DMA to finish
ld a, NUM_SPRITE_OAM_STRUCTS

20
engine/gfx/sprites.asm
View File

@@ -21,7 +21,7 @@ PlaySpriteAnimations:
push bc
push af
ld a, LOW(wVirtualOAM)
ld a, LOW(wShadowOAM)
ld [wCurSpriteOAMAddr], a
call DoNextFrameForAllSprites
@@ -57,11 +57,11 @@ DoNextFrameForAllSprites:
ld a, [wCurSpriteOAMAddr]
ld l, a
ld h, HIGH(wVirtualOAM)
ld h, HIGH(wShadowOAM)
.loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> wVirtualOAMEnd)
.loop2 ; Clear (wShadowOAM + [wCurSpriteOAMAddr] --> wShadowOAMEnd)
ld a, l
cp LOW(wVirtualOAMEnd)
cp LOW(wShadowOAMEnd)
jr nc, .done
xor a
ld [hli], a
@@ -96,11 +96,11 @@ DoNextFrameForFirst16Sprites:
ld a, [wCurSpriteOAMAddr]
ld l, a
ld h, HIGH(wVirtualOAMSprite16)
ld h, HIGH(wShadowOAMSprite16)
.loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> Sprites + $40)
.loop2 ; Clear (wShadowOAM + [wCurSpriteOAMAddr] --> Sprites + $40)
ld a, l
cp LOW(wVirtualOAMSprite16)
cp LOW(wShadowOAMSprite16)
jr nc, .done
xor a
ld [hli], a
@@ -246,7 +246,7 @@ UpdateAnimFrame:
push bc
ld a, [wCurSpriteOAMAddr]
ld e, a
ld d, HIGH(wVirtualOAM)
ld d, HIGH(wShadowOAM)
ld a, [hli]
ld c, a ; number of objects
.loop
@@ -295,7 +295,7 @@ UpdateAnimFrame:
inc de
ld a, e
ld [wCurSpriteOAMAddr], a
cp LOW(wVirtualOAMEnd)
cp LOW(wShadowOAMEnd)
jr nc, .reached_the_end
dec c
jr nz, .loop
@@ -570,7 +570,7 @@ AnimateEndOfExpBar:
ret
.AnimateFrame:
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
ld c, 8 ; number of animated circles
.anim_loop
ld a, c

6
engine/link/mystery_gift.asm
View File

@@ -1642,7 +1642,7 @@ DoNameCardSwap:
.SlideNameCardUpOffScreen:
ld c, 16
.loop
ld hl, wVirtualOAMSprite00YCoord
ld hl, wShadowOAMSprite00YCoord
ld b, 8
.dec_y_loop
dec [hl]
@@ -1651,7 +1651,7 @@ rept SPRITEOAMSTRUCT_LENGTH
endr
dec b
jr nz, .dec_y_loop
ld hl, wVirtualOAMSprite08YCoord
ld hl, wShadowOAMSprite08YCoord
ld b, 8
.inc_y_loop
inc [hl]
@@ -1836,7 +1836,7 @@ InitNameCardLayout:
ld [hl], $3c
hlcoord 17, 15
ld [hl], $3e
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
ld hl, .NameCardOAMData
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call CopyBytes

6
engine/menus/intro_menu.asm
View File

@@ -101,8 +101,8 @@ ResetWRAM:
ret
_ResetWRAM:
ld hl, wVirtualOAM
ld bc, wOptions - wVirtualOAM
ld hl, wShadowOAM
ld bc, wOptions - wShadowOAM
xor a
call ByteFill
@@ -922,7 +922,7 @@ Intro_PlacePlayerSprite:
ld hl, vTiles0
call Request2bpp
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
ld de, .sprites
ld a, [de]
inc de

2
engine/menus/trainer_card.asm
View File

@@ -478,7 +478,7 @@ TrainerCard_Page2_3_OAMUpdate:
ld d, a
ld a, [de]
ld c, a
ld de, wVirtualOAMSprite00
ld de, wShadowOAMSprite00
ld b, NUM_JOHTO_BADGES
.loop
srl c

2
engine/movie/evolution_animation.asm
View File

@@ -340,7 +340,7 @@ EvolutionAnimation:
inc a
and $7
ld b, a
ld hl, wVirtualOAMSprite00Attributes
ld hl, wShadowOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS
.loop6
ld a, [hl]

4
engine/movie/title.asm
View File

@@ -302,7 +302,7 @@ DrawTitleGraphic:
ret
InitializeBackground:
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
ld d, -$22
ld e, $0
ld c, 5
@@ -342,7 +342,7 @@ AnimateTitleCrystal:
; Stop at y=6
; y is really from the bottom of the sprite, which is two tiles high
ld hl, wVirtualOAMSprite00YCoord
ld hl, wShadowOAMSprite00YCoord
ld a, [hl]
cp 6 + 2 * TILE_WIDTH
ret z

Some files were not shown because too many files have changed in this diff Show More