Replace magic numbers with TILE_WIDTH (#1056)
* Replace magic numbers with TILE_WIDTH * Address more instances
This commit is contained in:
@@ -882,7 +882,7 @@ InitCGBPals::
|
||||
ldh [rVBK], a
|
||||
ld a, 1 << rBGPI_AUTO_INCREMENT
|
||||
ldh [rBGPI], a
|
||||
ld c, 4 * 8
|
||||
ld c, 4 * TILE_WIDTH
|
||||
.bgpals_loop
|
||||
ld a, LOW(PALRGB_WHITE)
|
||||
ldh [rBGPD], a
|
||||
@@ -892,7 +892,7 @@ InitCGBPals::
|
||||
jr nz, .bgpals_loop
|
||||
ld a, 1 << rOBPI_AUTO_INCREMENT
|
||||
ldh [rOBPI], a
|
||||
ld c, 4 * 8
|
||||
ld c, 4 * TILE_WIDTH
|
||||
.obpals_loop
|
||||
ld a, LOW(PALRGB_WHITE)
|
||||
ldh [rOBPD], a
|
||||
|
@@ -88,11 +88,11 @@ Mobile_InitAnimatedMonIcon:
|
||||
ld [hl], a
|
||||
ld hl, SPRITEANIMSTRUCT_XCOORD
|
||||
add hl, bc
|
||||
ld a, 9 * 8
|
||||
ld a, 9 * TILE_WIDTH
|
||||
ld [hl], a
|
||||
ld hl, SPRITEANIMSTRUCT_YCOORD
|
||||
add hl, bc
|
||||
ld a, 9 * 8
|
||||
ld a, 9 * TILE_WIDTH
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
@@ -105,11 +105,11 @@ Mobile_InitPartyMenuBGPal71:
|
||||
ld [hl], a
|
||||
ld hl, SPRITEANIMSTRUCT_XCOORD
|
||||
add hl, bc
|
||||
ld a, 3 * 8
|
||||
ld a, 3 * TILE_WIDTH
|
||||
ld [hl], a
|
||||
ld hl, SPRITEANIMSTRUCT_YCOORD
|
||||
add hl, bc
|
||||
ld a, 12 * 8
|
||||
ld a, 12 * TILE_WIDTH
|
||||
ld [hl], a
|
||||
ld a, c
|
||||
ld [wc608], a
|
||||
@@ -234,8 +234,8 @@ MoveList_InitAnimatedMonIcon:
|
||||
ld [wCurIcon], a
|
||||
xor a
|
||||
call GetIconGFX
|
||||
ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4
|
||||
ld e, 4 * 8 + 4
|
||||
ld d, 3 * TILE_WIDTH + 2 ; depixel 3, 4, 2, 4
|
||||
ld e, 4 * TILE_WIDTH + 4
|
||||
ld a, SPRITE_ANIM_INDEX_PARTY_MON
|
||||
call _InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
|
||||
|
@@ -380,7 +380,7 @@ AnimSeq_SlotsChanseyEgg:
|
||||
ld hl, SPRITEANIMSTRUCT_XCOORD
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp 15 * 8
|
||||
cp 15 * TILE_WIDTH
|
||||
jr c, .move_right
|
||||
call DeinitializeSprite
|
||||
ld a, $4
|
||||
@@ -682,7 +682,7 @@ AnimSeq_FlyLeaf:
|
||||
ld hl, SPRITEANIMSTRUCT_XCOORD
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp -9 * 8
|
||||
cp -9 * TILE_WIDTH
|
||||
jr nc, .delete_leaf
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
@@ -711,7 +711,7 @@ AnimSeq_FlyTo:
|
||||
ld hl, SPRITEANIMSTRUCT_YCOORD
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp 10 * 8 + 4
|
||||
cp 10 * TILE_WIDTH + 4
|
||||
ret z
|
||||
|
||||
ld hl, SPRITEANIMSTRUCT_YCOORD
|
||||
|
Reference in New Issue
Block a user