From 54f8bd23c0b759eab952726748a08981d4a46e5d Mon Sep 17 00:00:00 2001 From: Idain Date: Mon, 1 Jan 2024 23:00:57 -0400 Subject: [PATCH 1/2] Fix magic numbers in Celebi event code --- engine/events/celebi.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index 63d973e6e95..e3442f80ef6 100644 --- 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 TILE_WIDTH * 10 + 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 TILE_WIDTH * 11 + 4 jr nc, .ShiftY - cp 8 * 8 + 4 + cp TILE_WIDTH * 8 + 4 jr nc, .ReinitSpriteAnimFrame .ShiftY: pop af @@ -171,7 +171,7 @@ UpdateCelebiPosition: ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc add [hl] - cp 8 * 10 + cp TILE_WIDTH * 10 jr c, .float_up jr .float_down @@ -179,7 +179,7 @@ UpdateCelebiPosition: ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc add [hl] - cp 8 * 10 + cp TILE_WIDTH * 10 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 TILE_WIDTH * 10 jr c, .left - cp -(8 * 3 + 2) + cp -(TILE_WIDTH * 3 + 2) jr nc, .left ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc From 02a9111eb340a2373b8378bd704b2493d429d492 Mon Sep 17 00:00:00 2001 From: Idain Date: Mon, 1 Jan 2024 23:08:51 -0400 Subject: [PATCH 2/2] (TILE_ WIDTH * Num) > (Num * TILE_WIDTH) --- engine/events/celebi.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index e3442f80ef6..6e4f8983e3b 100644 --- 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 TILE_WIDTH * 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 TILE_WIDTH * 11 + 4 + cp 11 * TILE_WIDTH + 4 jr nc, .ShiftY - cp TILE_WIDTH * 8 + 4 + cp 8 * TILE_WIDTH + 4 jr nc, .ReinitSpriteAnimFrame .ShiftY: pop af @@ -171,7 +171,7 @@ UpdateCelebiPosition: ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc add [hl] - cp TILE_WIDTH * 10 + cp 10 * TILE_WIDTH jr c, .float_up jr .float_down @@ -179,7 +179,7 @@ UpdateCelebiPosition: ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc add [hl] - cp TILE_WIDTH * 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 TILE_WIDTH * 10 + cp 10 * TILE_WIDTH jr c, .left - cp -(TILE_WIDTH * 3 + 2) + cp -(3 * TILE_WIDTH + 2) jr nc, .left ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc