From b42c3d534cb1b58bb26de3d8cca885e66440dc53 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Thu, 3 Apr 2003 21:23:49 +0000
Subject: [PATCH] Renamed swap players key with more meaningful name and
 message

---
 zsnes/src/gui/gui.asm      |  2 +-
 zsnes/src/gui/guimouse.inc |  2 +-
 zsnes/src/gui/guiwindp.inc |  4 ++--
 zsnes/src/vcache.asm       | 20 ++++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 62108e6d..cabf7826 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -599,7 +599,7 @@ NEWSYM SoundInterpType, db 1
 NEWSYM KeyDisplayFPS, dd 0
 NEWSYM KeyIncStateSlot, dd 0
 NEWSYM KeyDecStateSlot, dd 0
-NEWSYM KeySwapPlayer1234, dd 0
+NEWSYM KeyUsePlayer1234, dd 0
 
 GUIsave equ $-GUIRAdd
 
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 84f77efb..8a53a7a5 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2771,7 +2771,7 @@ DisplayGameOptnsClick:
     DGOptnsProcBox 27+45*2,24,[KeyBGDisble2]
     DGOptnsProcBox 27+45*3,24,[KeyBGDisble3]
     DGOptnsProcBox 27+45*4,24,[KeySprDisble]
-    DGOptnsProcBox 78,44,[KeySwapPlayer1234]
+    DGOptnsProcBox 78,44,[KeyUsePlayer1234]
     DGOptnsProcBox 78,52,[KeyResetAll]
     DGOptnsProcBox 78,60,[KeyExtraEnab]
     DGOptnsProcBox 78,68,[KeyNewGfxSwt]
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 939cddd1..a37fe49a 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -4727,7 +4727,7 @@ DisplayGameOptns:
     DGOptnsDrawBox 27+45*2,24,[KeyBGDisble2]
     DGOptnsDrawBox 27+45*3,24,[KeyBGDisble3]
     DGOptnsDrawBox 27+45*4,24,[KeySprDisble]
-    DGOptnsDrawBox 78,44,[KeySwapPlayer1234]
+    DGOptnsDrawBox 78,44,[KeyUsePlayer1234]
     DGOptnsDrawBox 78,52,[KeyResetAll]
     DGOptnsDrawBox 78,60,[KeyExtraEnab]
     DGOptnsDrawBox 78,68,[KeyNewGfxSwt]
@@ -4818,7 +4818,7 @@ GUIGameOptnsTextV db 'SAVE SPC',0
 GUIGameOptnsTextX db 'DISPLAY FPS',0
 GUIGameOptnsTextY db 'ST+',0
 GUIGameOptnsTextZ db 'ST-',0
-GUIGameOptnsText1A db 'SW PL 12/34',0
+GUIGameOptnsText1A db 'USE PL 12/34',0
 SECTION .text
 
 DisplayGUIOptns:
diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm
index 004a1497..070c955e 100644
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -33,7 +33,7 @@ EXTSYM KeyBGDisble0,KeyBGDisble1,KeyBGDisble2,KeyBGDisble3,KeySprDisble
 EXTSYM KeyResetAll,KeyExtraEnab,KeyWinDisble,KeyNewGfxSwt,KeyOffsetMSw
 EXTSYM KeyStateSlc0,KeyStateSlc1,KeyStateSlc2,KeyStateSlc3,KeyStateSlc4
 EXTSYM KeyStateSlc5,KeyStateSlc6,KeyStateSlc7,KeyStateSlc8,KeyStateSlc9
-EXTSYM KeyIncStateSlot,KeyDecStateSlot,KeySwapPlayer1234
+EXTSYM KeyIncStateSlot,KeyDecStateSlot,KeyUsePlayer1234
 EXTSYM maxskip,DSPMem,SprValAdd,dsp1ptr,dsp1array,FastFwdToggle,SaveSramData
 EXTSYM ngextbg,Mode7HiRes,Check60hz,Get_MouseData,Get_MousePositionDisplacement
 EXTSYM WindowDisables,scanlines,romispal
@@ -792,19 +792,19 @@ NEWSYM cachevideo
     mov [MessageOn],eax
     xor dh,dh
 .nodecstateslot
-    mov eax,[KeySwapPlayer1234]
+    mov eax,[KeyUsePlayer1234]
     test byte[pressed+eax],1
-    je .noswpl1234
+    je .nousepl1234
     mov byte[pressed+eax],2
     xor byte[pl12s34],1
-    mov dword[Msgptr],plsw1234en
+    mov dword[Msgptr],pluse1234en
     cmp byte[pl12s34],1
-    je .swpl1234
-    mov dword[Msgptr],plsw1234dis
-.swpl1234
+    je .usepl1234
+    mov dword[Msgptr],pluse1234dis
+.usepl1234
     mov eax,[MsgCount]
     mov [MessageOn],eax
-.noswpl1234
+.nousepl1234
 
     ; do sound disables
     soundselcomp KeyDisableSC0,Voice0Disable,Voice0Status,'1'
@@ -994,8 +994,8 @@ NEWSYM sselm, db 'STATE SLOT 0 SELECTED',0
 NEWSYM vollv, db 'VOLUME LEVEL :    ',0
 NEWSYM frlev, db 'FRAME SKIP SET TO  ',0
 NEWSYM frlv0, db 'AUTO FRAMERATE ENABLED',0
-NEWSYM plsw1234en, db 'SWAPPED PLAYER 1/2 with 3/4',0
-NEWSYM plsw1234dis, db 'SWAPPED PLAYER 3/4 with 1/2',0
+NEWSYM pluse1234en, db 'USE PLAYER 1/2 with 3/4 ON',0
+NEWSYM pluse1234dis, db 'USE PLAYER 1/2 with 3/4 OFF',0
 sndchena db 'SOUND CH   ENABLED',0
 sndchdis db 'SOUND CH   DISABLED',0
 bg1layena db 'BG1 LAYER ENABLED',0