Fix magic numbers in Celebi event code

pret · Jan 3, 2024 · bbfb4ab · bbfb4ab
1 parent 804fa84
commit bbfb4ab
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
@@ -132,7 +132,7 @@ UpdateCelebiPosition:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
-	cp 8 * 10 + 2
+	cp 10 * TILE_WIDTH + 2
 	jp nc, .FreezeCelebiPosition
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
@@ -159,9 +159,9 @@ UpdateCelebiPosition:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
-	cp 8 * 11 + 4
+	cp 11 * TILE_WIDTH + 4
 	jr nc, .ShiftY
-	cp 8 *  8 + 4
+	cp 8 * TILE_WIDTH + 4
 	jr nc, .ReinitSpriteAnimFrame
 .ShiftY:
 	pop af
@@ -171,15 +171,15 @@ UpdateCelebiPosition:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
-	cp 8 * 10
+	cp 10 * TILE_WIDTH
 	jr c, .float_up
 	jr .float_down
 
 .moving_left
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
-	cp 8 * 10
+	cp 10 * TILE_WIDTH
 	jr nc, .float_up
 .float_down
 	ld hl, SPRITEANIMSTRUCT_YCOORD
@@ -200,9 +200,9 @@ UpdateCelebiPosition:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
-	cp 8 * 10
+	cp 10 * TILE_WIDTH
 	jr c, .left
-	cp -(8 * 3 + 2)
+	cp -(3 * TILE_WIDTH + 2)
 	jr nc, .left
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc