From 5ca917bc97de25b736b9341757d10483a0a94c11 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Mon, 23 Sep 2019 20:16:09 +0200 Subject: [PATCH] Removed usage of TILES_TO_PIXELS/PIXELS_TO_TILES in PutCampObject Signed-off-by: Gabriel Ravier --- src/ArmsItem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ArmsItem.cpp b/src/ArmsItem.cpp index 1545cb51..71fc7935 100644 --- a/src/ArmsItem.cpp +++ b/src/ArmsItem.cpp @@ -362,10 +362,10 @@ static void PutCampObject() break; // Invalid weapon // Get icon rect for next weapon - rcArms.left = TILES_TO_PIXELS(gArmsData[i].code % 0x10); - rcArms.right = rcArms.left + TILES_TO_PIXELS(1); - rcArms.top = TILES_TO_PIXELS(PIXELS_TO_TILES(gArmsData[i].code)); - rcArms.bottom = rcArms.top + TILES_TO_PIXELS(1); + rcArms.left = (gArmsData[i].code % 16) * 16; + rcArms.right = rcArms.left + 16; + rcArms.top = ((gArmsData[i].code) / 16) * 16; + rcArms.bottom = rcArms.top + 16; // Draw the icon, slash and "Lv" PutBitmap3(&rcView, 40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 192) / 2, &rcArms, SURFACE_ID_ARMS_IMAGE);