Replace magic numbers with TILE_WIDTH (#1056)

* Replace magic numbers with TILE_WIDTH

* Address more instances
This commit is contained in:
Idain
2023-07-26 20:50:16 -04:00
committed by GitHub
parent 1d64befdb7
commit 94df3c5aa3
17 changed files with 62 additions and 62 deletions

View File

@@ -2623,12 +2623,12 @@ AnimateEZChatCursor:
ret
.nine
ld d, -13 * 8
ld d, -13 * TILE_WIDTH
ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_7
jr .eight_nine_load
.eight
ld d, 2 * 8
ld d, 2 * TILE_WIDTH
ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_6
.eight_nine_load
push de
@@ -2640,7 +2640,7 @@ AnimateEZChatCursor:
ld e, a
sla a
add e
add 8 * 8
add 8 * TILE_WIDTH
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
ld [hld], a

View File

@@ -1516,9 +1516,9 @@ MobileTradeAnim_AnimateSentPulse:
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
cp -1 * 8 - 6
cp -1 * TILE_WIDTH - 6
jr z, .delete
sub 1 * 8
sub 1 * TILE_WIDTH
ld [hl], a
ret
@@ -1530,9 +1530,9 @@ MobileTradeAnim_AnimateOTPulse:
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
cp 9 * 8 + 2
cp 9 * TILE_WIDTH + 2
ret z
add 1 * 8
add 1 * TILE_WIDTH
ld [hl], a
ret

View File

@@ -6758,10 +6758,10 @@ Function11b3d9:
jr .loop1
.skip
ld b, 14 * 8
ld b, 14 * TILE_WIDTH
.load_sprites
ld a, 2 * 8 + 5
ld a, 2 * TILE_WIDTH + 5
add b
pop hl
ld [hli], a
@@ -6778,7 +6778,7 @@ Function11b3d9:
jr z, .version2
.version1
ld a, 19 * 8 + 3
ld a, 19 * TILE_WIDTH + 3
ld [hli], a
ld a, [wcd4c]
add $3c
@@ -6789,7 +6789,7 @@ Function11b3d9:
ret
.version2
ld a, 19 * 8 + 3
ld a, 19 * TILE_WIDTH + 3
ld [hli], a
ld a, $39
ld [hli], a