From 3a10cfa8122b89160476236cec41793e1072f0ae Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Mon, 7 May 2001 00:55:32 +0000
Subject: [PATCH] Fix bad cvs merge

---
 zsnes/src/video/procvid.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm
index 33331a1b..529e0c93 100644
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -3006,12 +3006,12 @@ NEWSYM hextestoutput
     EXTSYM Op14Zr,Op14Xr,Op14Yr,Op14U,Op14F,Op14L
     EXTSYM Op02CX,Op02CY,bg1scrolx,bg1scroly
     EXTSYM TValDebug,TValDebug2,curhdma
-    mov al,[curhdma]
+    mov al,[winbg1en]
     call outputhex
     mov esi,216*288+32+16
     add esi,[vidbuffer]
     xor eax,eax
-    mov al,[TValDebug]
+    mov al,[winenabs]
     call outputhex
     mov esi,216*288+70
     add esi,[vidbuffer]