diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 0791c4fa..e63e50b0 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -575,7 +575,7 @@ NEWSYM GUIWRAdd, db 8 NEWSYM GUIWGAdd, db 8 NEWSYM GUIWBAdd, db 25 -NEWSYM BlackAndWhite, db 0 +NEWSYM GrayscaleMode, db 0 NEWSYM MouseWheel, db 1 NEWSYM AlternateTimer, db 0 NEWSYM AllowMultipleInst, db 0 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index fda312ba..e0b50a5b 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2164,7 +2164,7 @@ DisplayGUIVideoClick: GUIClickCButton5 11,163,byte[Triplebufen],1 .nocheckboxttb %ifndef __MSDOS__ - GUIClickCButton 11,183,byte[BlackAndWhite] + GUIClickCButton 11,183,byte[GrayscaleMode] %endif xor ebx,ebx mov bl,[cvidmode] diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index c67f6853..5a5460ce 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1929,7 +1929,7 @@ DisplayGUIVideo: .nocheckboxm72 %ifndef __MSDOS__ mov dword[GUITemp],GUIIconDataCheckBoxUC - cmp byte[BlackAndWhite],0 + cmp byte[GrayscaleMode],0 je .nocheckboxm73 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckboxm73 @@ -2093,7 +2093,7 @@ GUIVideoText5 db 'FULL SCREEN',0 ; -c GUIVideoText6 db 'SMALL SCREEN',0 ; -c GUIVideoText7 db 'TRIPLE BUFFERING',0 ; -c GUIVideoText8b db 'HI-RESOLUTION MODE7',0 ; -c -GUIVideoText8c db 'BLACK AND WHITE MODE',0 ; -c +GUIVideoText8c db 'GRAYSCALE MODE',0 ; -c GUIVideoText8 db 'SET',0 ; set button GUIVideoTextH db 'MODE : ',0 GUIVideoTextw0 db 'LEGEND:',0 diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c index 303bb8ad..ec7d63a9 100644 --- a/zsnes/src/linux/sdllink.c +++ b/zsnes/src/linux/sdllink.c @@ -687,7 +687,7 @@ void Stop36HZ(void) DWORD FirstVid = 1; DWORD FirstFull = 1; extern BYTE GUIWFVID[]; -extern BYTE BlackAndWhite; +extern BYTE GrayscaleMode; extern BYTE V8Mode; void clearwin(); @@ -695,7 +695,7 @@ void initwinvideo(void) { DWORD newmode = 0; - V8Mode = (BlackAndWhite == 1); + V8Mode = (GrayscaleMode == 1); if (CurMode != cvidmode) { diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index 335e8097..cf1c8838 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -1459,7 +1459,7 @@ void Stop36HZ(void) char WinMessage[256]; extern unsigned char cvidmode; -extern BYTE BlackAndWhite; +extern BYTE GrayscaleMode; extern BYTE V8Mode; DWORD FirstVid=1; DWORD FirstFull=1; @@ -1475,7 +1475,7 @@ void initwinvideo(void) RECT rc1, swrect; DWORD newmode=0; - V8Mode = (BlackAndWhite == 1); + V8Mode = (GrayscaleMode == 1); if (CurMode!=cvidmode) {