From 58a112c5c4e39680ad9f0b5ae9508b43c6a1541f Mon Sep 17 00:00:00 2001
From: jeffman <jefferbrecht@gmail.com>
Date: Mon, 5 Aug 2019 21:51:57 -0400
Subject: [PATCH] Widen main file select window

---
 src/c/vwf.c                         |   2 +-
 src/data/m2-fileselect-template.bin | Bin 82 -> 84 bytes
 src/m2-hack.asm                     |  17 +++++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/c/vwf.c b/src/c/vwf.c
index 69ec54b..ff209e1 100644
--- a/src/c/vwf.c
+++ b/src/c/vwf.c
@@ -149,7 +149,7 @@ void format_file_string(FILE_SELECT *file)
 
     // Re-position
     format_file_cc(file, &index, CUSTOMCC_SET_X);
-    file->formatted_str[index++] = 80;
+    file->formatted_str[index++] = 76;
 
     // Level
     char levelStr[] = "Level: ";
diff --git a/src/data/m2-fileselect-template.bin b/src/data/m2-fileselect-template.bin
index 34a77abc63d319c687a155689fc4332ec7f649b1..00b5ea1a4e16aa182537adba258a81faa00f8660 100644
GIT binary patch
literal 84
zcmWeQz{tQi*=L%^2gVPK8yF|EdrWna2Qon%=BW--UF^Y}{~H(u%s==7#q)s>DD)3P
RK}duA$ucg}9H2%x004v&BZL3|

literal 82
zcmWewz{tQi*=L%^2gVPK1&ou~J*K+I1DPNW^HhhaF7{x~{{lt<;}4!d@pO>fhx9)X
T3Pc8^Pj<1G<^W;>4R8Pe`Botp

diff --git a/src/m2-hack.asm b/src/m2-hack.asm
index 5efe967..f31fa43 100644
--- a/src/m2-hack.asm
+++ b/src/m2-hack.asm
@@ -969,18 +969,27 @@ nop
 // File select hacks
 //==============================================================================
 
-.org 0x86DB070
-.incbin "data/m2-fileselect-template.bin"
+// Main file select window resize
+.org 0x82B79BC :: dw 0x1C       // new window width
+.org 0x8003998 :: mov r0,1      // new window x
+.org 0x8003A04 :: mov r1,1
+.org 0x8003B40 :: mov r0,0x10   // new cursor x
+.org 0x86DB070 :: .incbin "data/m2-fileselect-template.bin"
 
 .org 0x86D9808
 .incbin "data/m2-fileselect-tileset.bin"
 
+// Formatting
+.org 0x80021E8 :: bl format_file_string
+.org 0x8002284 :: bl format_file_string
+
+// Printing
 .org 0x80038CC :: mov r2,0x40 :: bl print_file_string
 .org 0x80038DE :: mov r2,0x40 :: bl print_file_string
 .org 0x80038F2 :: mov r2,0x40 :: bl print_file_string
 
-.org 0x80021E8 :: bl format_file_string
-.org 0x8002284 :: bl format_file_string
+// Bump file select cursor up by 3 pixels
+.org 0x8003844 :: add r0,r5,1
 
 //==============================================================================
 // Data files