diff options
| author | Colton G. Rushton <colton51919@gmail.com> | 2022-07-09 18:18:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-09 17:18:20 -0400 |
| commit | c0085ea1b21a171ef9f4c73ad28a5306558f2cc3 (patch) | |
| tree | 311a4a64f13395e2f711b46f8b13bbc1b5ff849e /engine/items | |
| parent | Fix typo: HeatButt -> HeadButt (diff) | |
| download | pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.tar.gz pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.tar.xz pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.zip | |
wOAMBuffer -> wShadowOAM (#95)
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 2 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 66f7832b..d98ec7d3 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1295,7 +1295,7 @@ ItemUseMedicine: xor a ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data .calculateHPBarCoords - ld hl, wOAMBuffer + $90 + ld hl, wShadowOAMSprite36 ld bc, 2 * SCREEN_WIDTH inc d .calculateHPBarCoordsLoop diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index ebd1d4b9..1ed146f2 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -16,7 +16,7 @@ DisplayTownMap: hlcoord 1, 0 ld de, wcd6d call PlaceString - ld hl, wOAMBuffer + ld hl, wShadowOAM ld de, wTileMapBackup ld bc, $10 call CopyData @@ -47,7 +47,7 @@ DisplayTownMap: call TownMapCoordsToOAMCoords ld a, $4 ld [wOAMBaseTile], a - ld hl, wOAMBuffer + $10 + ld hl, wShadowOAMSprite04 call WriteTownMapSpriteOAM ; town map cursor sprite pop hl ld de, wcd6d @@ -60,7 +60,7 @@ DisplayTownMap: hlcoord 1, 0 ld de, wcd6d call PlaceString - ld hl, wOAMBuffer + $10 + ld hl, wShadowOAMSprite04 ld de, wTileMapBackup + 16 ld bc, $10 call CopyData @@ -372,7 +372,7 @@ DrawPlayerOrBirdSprite: inc de cp "@" jr nz, .loop - ld hl, wOAMBuffer + ld hl, wShadowOAM ld de, wTileMapBackup ld bc, $a0 jp CopyData @@ -380,7 +380,7 @@ DrawPlayerOrBirdSprite: DisplayWildLocations: farcall FindWildLocationsOfMon call ZeroOutDuplicatesInList - ld hl, wOAMBuffer + ld hl, wShadowOAM ld de, wTownMapCoords .loop ld a, [de] @@ -419,7 +419,7 @@ DisplayWildLocations: ld b, $0 call DrawPlayerOrBirdSprite .done - ld hl, wOAMBuffer + ld hl, wShadowOAM ld de, wTileMapBackup ld bc, $a0 jp CopyData @@ -448,9 +448,9 @@ TownMapCoordsToOAMCoords: WritePlayerOrBirdSpriteOAM: ld a, [wOAMBaseTile] and a - ld hl, wOAMBuffer + $90 ; for player sprite + ld hl, wShadowOAMSprite36 ; for player sprite jr z, WriteTownMapSpriteOAM - ld hl, wOAMBuffer + $80 ; for bird sprite + ld hl, wShadowOAMSprite32 ; for bird sprite WriteTownMapSpriteOAM: push hl @@ -609,13 +609,13 @@ TownMapSpriteBlinkingAnimation:: jr nz, .done ; show sprites when the counter reaches 50 ld hl, wTileMapBackup - ld de, wOAMBuffer + ld de, wShadowOAM ld bc, $90 call CopyData xor a jr .done .hideSprites - ld hl, wOAMBuffer + ld hl, wShadowOAM ld b, $24 ld de, $4 .hideSpritesLoop |