diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index 0b3b34fe..84295242 100644 --- a/src/BossFrog.cpp +++ b/src/BossFrog.cpp @@ -71,32 +71,32 @@ static void ActBossChar02_01(void) { case BALFROG_SPRT_NOTHING: boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; - boss->hit.front = TILES_TO_UNITS(1); - boss->hit.top = TILES_TO_UNITS(1); - boss->hit.back = TILES_TO_UNITS(1); - boss->hit.bottom = TILES_TO_UNITS(1); + boss->hit.front = PIXELS_TO_UNITS(16); + boss->hit.top = PIXELS_TO_UNITS(16); + boss->hit.back = PIXELS_TO_UNITS(16); + boss->hit.bottom = PIXELS_TO_UNITS(16); boss->size = 3; boss->bits = NPC_INVULNERABLE; break; case BALFROG_SPRT_STANDING_STILL: - boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; - boss->y = gBoss[0].y - TILES_TO_UNITS(1.5); + boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus; + boss->y = gBoss[0].y - PIXELS_TO_UNITS(24); break; case BALFROG_SPRT_MOUTH_BARELY_OPEN_CROUCHING: - boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; - boss->y = gBoss[0].y - TILES_TO_UNITS(1.25); + boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus; + boss->y = gBoss[0].y - PIXELS_TO_UNITS(20); break; case BALFROG_SPRT_MOUTH_OPEN_CROUCHING: case BALFROG_SPRT_MOUTH_OPEN_CROUCHING_FLASHING: - boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; - boss->y = gBoss[0].y - TILES_TO_UNITS(2); + boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus; + boss->y = gBoss[0].y - PIXELS_TO_UNITS(32); break; case BALFROG_SPRT_JUMPING: - boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; + boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus; boss->y = gBoss[0].y - PIXELS_TO_UNITS(43); // 2.6873 tiles break; } @@ -110,10 +110,10 @@ static void ActBossChar02_02(void) { case BALFROG_SPRT_NOTHING: boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; - boss->hit.front = TILES_TO_UNITS(1.5); - boss->hit.top = TILES_TO_UNITS(1); - boss->hit.back = TILES_TO_UNITS(1.5); - boss->hit.bottom = TILES_TO_UNITS(1); + boss->hit.front = PIXELS_TO_UNITS(24); + boss->hit.top = PIXELS_TO_UNITS(16); + boss->hit.back = PIXELS_TO_UNITS(24); + boss->hit.bottom = PIXELS_TO_UNITS(16); boss->size = 3; boss->bits = NPC_INVULNERABLE; break; @@ -176,10 +176,10 @@ void ActBossChar_Frog(void) boss->view.back = TILES_TO_UNITS(2); boss->view.bottom = TILES_TO_UNITS(1); boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; - boss->hit.front = TILES_TO_UNITS(1.5); - boss->hit.top = TILES_TO_UNITS(1); - boss->hit.back = TILES_TO_UNITS(1.5); - boss->hit.bottom = TILES_TO_UNITS(1); + boss->hit.front = PIXELS_TO_UNITS(24); + boss->hit.top = PIXELS_TO_UNITS(16); + boss->hit.back = PIXELS_TO_UNITS(24); + boss->hit.bottom = PIXELS_TO_UNITS(16); boss->size = 3; boss->exp = 1; boss->code_event = 1000;