diff --git a/src/c/equip.c b/src/c/equip.c
index 8f95a59..3af49f2 100644
--- a/src/c/equip.c
+++ b/src/c/equip.c
@@ -201,7 +201,7 @@ void equippablePrint(WINDOW* window) //Prints equippable items (The innermost eq
             str = m2_strlookup((int*)0x8B17EE4, (byte*)0x8B17424, 0x8C);
         else
             str = m2_strlookup((int*)0x8B17EE4, (byte*)0x8B17424, 0x8D + window->cursor_x_base);
-        printstr_buffer(window, str, savedValue, 6, false); //Prints "(X)"
+        printstr_hlight_pixels_buffer(window, str, savedValue, 6 << 4, false); //Prints "(X)"
         freeSpace[5] = 0;
         freeSpace[6] = 0xFE;
         freeSpace[7] = 0xFF;
diff --git a/src/c/equip.h b/src/c/equip.h
index 46aecdc..30e860e 100644
--- a/src/c/equip.h
+++ b/src/c/equip.h
@@ -5,6 +5,8 @@
 
 void equipPrint(WINDOW* window);
 int equipReadInput(WINDOW* window);
+void equippablePrint(WINDOW* window);
+int equippableReadInput(WINDOW* window);
 
 
 extern byte m12_other_str9;
diff --git a/src/c/vwf.c b/src/c/vwf.c
index a612466..863de54 100644
--- a/src/c/vwf.c
+++ b/src/c/vwf.c
@@ -1295,7 +1295,7 @@ int printstr_buffer(WINDOW* window, byte* str, unsigned short x, unsigned short
         window->delay = 0;
         output = print_character_with_codes(window, (int*)(OVERWORLD_BUFFER - ((*tile_offset) * 32)));
     }
-    int retValue = window->text_x + (window->pixel_x == 0 ? 0 : 1);
+    int retValue = (window->text_x << 3) + window->pixel_x;
     window->text_start = tmpTextStart;
     window->text_offset = tmpOffset;
     window->text_offset2 = tmpOffset2;