Fixed main/cash window redrawing

m2-hack.asm

@@ -56,9 +56,13 @@ org $80BF054; bl m2_vwf.goods_dirty4
 org $80BFF34; bl m2_vwf.goods_dirty1
 org $80BFF12; bl m2_vwf.goods_dirty2
 org $80C00D4; bl m2_vwf.goods_dirty5
-org $80BA688; bl m2_vwf.goods_redraw // pressing B from Give window
 org $80C0260; bl m2_vwf.goods_dirty6
 
+// Goods -- redrawing
+org $80BA688; bl m2_vwf.goods_redraw // pressing B from Give window; redraw old Goods window
+org $80B9CF8; bl m2_vwf.main_redraw // selecting the Use option; need to redraw the main menu
+
+
 // Menu select entry
 org $80B7FC6; bl m2_vwf.print_string_relative
 

m2-vwf.asm

@@ -1384,6 +1384,52 @@ pop     {r0-r2}
 pop     {pc}
 
 
+//==============================================================================
+// void main_redraw(WINDOW* window)
+// In:
+//    r0: window
+//==============================================================================
+
+.main_redraw:
+print   "m2vwf.main_redraw:            $",pc
+push    {r0-r5,lr}
+
+//--------------------------------
+// Get the address of the main menu window
+ldr     r5,=#0x3005230
+ldr     r0,[r5,#0]
+mov     r4,r0
+
+// Get its text address
+ldr     r1,[r0,#4]
+
+// Draw it
+mov     r2,#0
+bl      $80BE458
+mov     r0,r4
+bl      $80C8FFC
+
+//--------------------------------
+// Get the address of the cash window
+ldr     r0,[r5,#4]
+mov     r4,r0
+
+// Get its text address
+ldr     r1,[r0,#4]
+
+// Draw it
+mov     r2,#0
+bl      $80BE458
+mov     r0,r4
+bl      $80C8FFC
+
+//--------------------------------
+// Clobbered code
+pop     {r0-r5}
+bl      $80BD7AC
+pop     {pc}
+
+
 //==============================================================================
 // void status(WINDOW* window, char* chr, TILEDATA* tileData)
 // In: