aboutsummaryrefslogtreecommitdiffstats
path: root/engine/items/town_map.asm
diff options
context:
space:
mode:
authorEngezerstorung <154867622+Engezerstorung@users.noreply.github.com>2025-01-28 18:08:12 +0100
committerGitHub <noreply@github.com>2025-01-28 12:08:12 -0500
commit96fc617c69bca4fe717bd590e03bdd1fae1349e4 (patch)
tree3f93427841648bc5ae1dd35f523548409abdf46f /engine/items/town_map.asm
parentUse `EFFECT_1E` (diff)
downloadpokeyellow-96fc617c69bca4fe717bd590e03bdd1fae1349e4.tar.gz
pokeyellow-96fc617c69bca4fe717bd590e03bdd1fae1349e4.tar.xz
pokeyellow-96fc617c69bca4fe717bd590e03bdd1fae1349e4.zip
Correct wTileMapBackup declared space (#487)
Diffstat (limited to 'engine/items/town_map.asm')
-rw-r--r--engine/items/town_map.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 9c8aea39..cac6f2dd 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -18,9 +18,9 @@ DisplayTownMap:
hlcoord 1, 0
ld de, wNameBuffer
call PlaceString
- ld hl, wShadowOAM
- ld de, wTileMapBackup
- ld bc, $10
+ ld hl, wShadowOAMSprite00
+ ld de, wShadowOAMBackupSprite00
+ ld bc, 4 * 4
call CopyData
ld hl, vSprites tile BIRD_BASE_TILE
ld de, TownMapCursor
@@ -63,8 +63,8 @@ DisplayTownMap:
ld de, wNameBuffer
call PlaceString
ld hl, wShadowOAMSprite04
- ld de, wTileMapBackup + 16
- ld bc, $10
+ ld de, wShadowOAMBackupSprite04
+ ld bc, 4 * 4
call CopyData
.inputLoop
call TownMapSpriteBlinkingAnimation
@@ -366,8 +366,8 @@ DrawPlayerOrBirdSprite:
cp "@"
jr nz, .loop
ld hl, wShadowOAM
- ld de, wTileMapBackup
- ld bc, $a0
+ ld de, wShadowOAMBackup
+ ld bc, NUM_SPRITE_OAM_STRUCTS * 4
jp CopyData
DisplayWildLocations:
@@ -414,8 +414,8 @@ DisplayWildLocations:
call DrawPlayerOrBirdSprite
.done
ld hl, wShadowOAM
- ld de, wTileMapBackup
- ld bc, $a0
+ ld de, wShadowOAMBackup
+ ld bc, NUM_SPRITE_OAM_STRUCTS * 4
jp CopyData
AreaUnknownText:
@@ -602,15 +602,15 @@ TownMapSpriteBlinkingAnimation::
cp 50
jr nz, .done
; show sprites when the counter reaches 50
- ld hl, wTileMapBackup
+ ld hl, wShadowOAMBackup
ld de, wShadowOAM
- ld bc, $90
+ ld bc, (NUM_SPRITE_OAM_STRUCTS - 4) * 4
call CopyData
xor a
jr .done
.hideSprites
ld hl, wShadowOAM
- ld b, $24
+ ld b, NUM_SPRITE_OAM_STRUCTS - 4
ld de, $4
.hideSpritesLoop
ld [hl], $a0