a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New tool used. Also, silly variable names removed from source. ^^

Browse Source
This commit is contained in:
grinvader
2005-07-16 18:57:32 +00:00
parent db66efd2e7
commit 9bb7d64292
79 changed files with 1126 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zsnes/src/gui/gui.asm
View File

@@ -708,7 +708,7 @@ NEWSYM GUIhandler9h
xor eax,eax
; look for match
%%notfoundyet
mov bl,byte[GUIwinorder+eax]
mov bl,[GUIwinorder+eax]
cmp bl,%1
je %%nextfind
inc eax
@@ -829,7 +829,7 @@ DrawSnow:
add bl,228
test byte[SnowVelDist+edx*2],8
jz .nosnow
mov byte[esi+eax],bl
mov [esi+eax],bl
.nosnow
inc edx
dec ecx
@@ -1021,7 +1021,7 @@ SECTION .text
add dl,65-48-10
%%notover
add dl,48
mov byte[.message+%1],dl
mov [.message+%1],dl
xor edx,edx
div ebx
%endmacro
@@ -1455,7 +1455,7 @@ NEWSYM StartGUI
cmp byte[CopyRamToggle],1
jne .nocopyram
mov byte[CopyRamToggle],0
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600
; copy 128k ram
mov ebx,[wramdata]
@@ -1972,7 +1972,7 @@ CheckMenuItemHelp:
xor eax,eax
mov al,[GUIwinptr]
inc byte[GUIwinptr]
mov byte[GUIwinorder+eax],dl
mov [GUIwinorder+eax],dl
mov byte[GUIwinactiv+edx],1
cmp byte[resetposn],1
jne .nomenuitem
@@ -1985,7 +1985,7 @@ CheckMenuItemHelp:
xor eax,eax
; look for match
.notfoundyet
mov bl,byte[GUIwinorder+eax]
mov bl,[GUIwinorder+eax]
cmp bl,dl
je .nextfind
inc eax
@@ -3176,7 +3176,7 @@ SECTION .text
mov bx,%4
shr bx,1
or ax,bx
mov word[GUICPC+%1*2],ax
mov [GUICPC+%1*2],ax
%endmacro
DecPalVal:

22
zsnes/src/gui/guicheat.inc
View File

@@ -148,10 +148,10 @@ CheatCodeSearchProcess:
; Process Cheat Search
mov ecx,65536*2
xor ebx,ebx
mov bl,byte[CheatSrcByteSize]
mov bl,[CheatSrcByteSize]
sub ecx,ebx
mov edx,[SrcMask+ebx*4]
mov edi,dword[vidbuffer]
mov edi,[vidbuffer]
add edi,129600+65536*2
mov esi,[wramdata]
mov bl,0FEh
@@ -198,9 +198,9 @@ CheatCodeSearchProcess:
mov byte[CSInputDisplay],'_'
mov byte[CSInputDisplay+1],0
mov byte[CheatSearchStatus],1
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600+65536*2
mov esi,dword[vidbuffer]
mov esi,[vidbuffer]
add esi,129600
mov edi,[wramdata]
mov ecx,65536*2
@@ -236,7 +236,7 @@ CheatCodeSearchInit:
mov byte[CheatSearchStatus],0
cmp byte[CopyRamToggle],0
mov byte[FirstSearch],1
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600
; copy 128k ram
mov ebx,[wramdata]
@@ -249,7 +249,7 @@ CheatCodeSearchInit:
dec ecx
jnz .loop
; fill searched buffer with 0xFF
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600+65536*2
mov ecx,8192
.loop2
@@ -262,7 +262,7 @@ CheatCodeSearchInit:
mov byte[CheatSearchStatus],1
.nottype1
mov dword[CheatCompareValue],0
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600+65536*2
cmp byte[CheatSrcByteSize],1
je near .bytesize2
@@ -432,7 +432,7 @@ CheatCodeLoad:
cmp eax,[GUIcurrentcheatcursloc]
ja .noconf
dec eax
mov dword[GUIcurrentcheatcursloc],eax
mov [GUIcurrentcheatcursloc],eax
.noconf
cmp dword[NumCheats],0
jne .nozero
@@ -581,7 +581,7 @@ EnableCheatCode:
push edx
call dword near [memtabler8+ebx*4]
pop edx
mov byte[esi+5],al
mov [esi+5],al
pop ebx
pop eax
pop ecx
@@ -1161,7 +1161,7 @@ decodegg:
push edx
call dword near [memtabler8+ebx*4]
pop edx
mov byte[cheatdata+edx+5],al
mov [cheatdata+edx+5],al
pop ebx
pop eax
pop ecx
@@ -1257,7 +1257,7 @@ decodepar:
push edx
call dword near [memtabler8+ebx*4]
pop edx
mov byte[cheatdata+edx+5],al
mov [cheatdata+edx+5],al
pop ebx
pop eax
pop ecx

58
zsnes/src/gui/guikeys.inc
View File

@@ -712,7 +712,7 @@ GUIgetcurrentinput:
jne .notop
.top
mov al,[ebx]
mov byte[GUIcrowpos],al
mov [GUIcrowpos],al
jmp .nokey
.notop
dec eax
@@ -1303,7 +1303,7 @@ GUIVideoKeys:
dec ebx
cmp dword[GUIcurrentvideocursloc],ebx
jb .poscd
mov dword[GUIcurrentvideocursloc],ebx
mov [GUIcurrentvideocursloc],ebx
.poscd
sub ebx,4
cmp dword[GUIcurrentvideoviewloc],ebx
@@ -1312,7 +1312,7 @@ GUIVideoKeys:
jz .noneg
mov ebx,0
.noneg
mov dword[GUIcurrentvideoviewloc],ebx
mov [GUIcurrentvideoviewloc],ebx
.posvd
.nopagedown
ret
@@ -1510,7 +1510,7 @@ GUIPathKeys:
jne .stillroom
ret
.stillroom
mov byte[eax],dh
mov [eax],dh
.nokeypressed
ret
@@ -1577,7 +1577,7 @@ GUIComboKeys:
xor eax,eax
mov byte[GUICCFlash],0
mov al,[GUIComboPos]
mov byte[GUIComboTextH+eax],dh
mov [GUIComboTextH+eax],dh
.nochar
ret
@@ -1653,9 +1653,9 @@ GUICheatKeys:
%endif
mov eax,[NumCheats]
dec eax
mov dword[GUIcurrentcheatcursloc],eax
mov [GUIcurrentcheatcursloc],eax
sub eax,11
mov dword[GUIcurrentcheatviewloc],eax
mov [GUIcurrentcheatviewloc],eax
test dword[GUIcurrentcheatviewloc],8000000h
jz .posve
mov dword[GUIcurrentcheatviewloc],0
@@ -1747,7 +1747,7 @@ GUICheatKeys:
dec ebx
cmp dword[GUIcurrentcheatcursloc],ebx
jb .poscd
mov dword[GUIcurrentcheatcursloc],ebx
mov [GUIcurrentcheatcursloc],ebx
.poscd
sub ebx,11
cmp dword[GUIcurrentcheatviewloc],ebx
@@ -1756,7 +1756,7 @@ GUICheatKeys:
jz .noneg
mov ebx,0
.noneg
mov dword[GUIcurrentcheatviewloc],ebx
mov [GUIcurrentcheatviewloc],ebx
.posvd
.nopagedown
ret
@@ -1843,7 +1843,7 @@ GUICheatKeys:
mov byte[GUICCFlash],0
xor eax,eax
mov al,[GUICheatPosA]
mov byte[GUICheatTextZ1+eax],dh
mov [GUICheatTextZ1+eax],dh
mov byte[GUICheatTextZ1+eax+1],'_'
mov byte[GUICheatTextZ1+eax+2],0
inc byte[GUICheatPosA]
@@ -1880,7 +1880,7 @@ GUICheatKeys:
xor eax,eax
mov byte[GUICCFlash],0
mov al,[GUICheatPosB]
mov byte[GUICheatTextZ2+eax],dh
mov [GUICheatTextZ2+eax],dh
mov byte[GUICheatTextZ2+eax+1],'_'
mov byte[GUICheatTextZ2+eax+2],0
inc byte[GUICheatPosB]
@@ -1930,7 +1930,7 @@ InsertSearchCharacter:
cmp dh,'A'
jb near .done
.okay
mov byte[ecx],dh
mov [ecx],dh
inc ecx
; Process cursor if over the window
.placecursor
@@ -2012,7 +2012,7 @@ InsertSearchDescription:
je .nocharb
cmp dl,18
je .nocharb
mov byte[eax],dh
mov [eax],dh
mov byte[eax+1],0
.nocharb
ret
@@ -2179,9 +2179,9 @@ GUICheatSearchKeys:
%endif
mov eax,[NumCheatSrc]
dec eax
mov dword[GUIcurrentchtsrccursloc],eax
mov [GUIcurrentchtsrccursloc],eax
sub eax,11
mov dword[GUIcurrentchtsrcviewloc],eax
mov [GUIcurrentchtsrcviewloc],eax
test dword[GUIcurrentchtsrcviewloc],8000000h
jz .posve
mov dword[GUIcurrentchtsrcviewloc],0
@@ -2274,7 +2274,7 @@ GUICheatSearchKeys:
dec ebx
cmp dword[GUIcurrentchtsrccursloc],ebx
jb .poscd
mov dword[GUIcurrentchtsrccursloc],ebx
mov [GUIcurrentchtsrccursloc],ebx
.poscd
sub ebx,11
cmp dword[GUIcurrentchtsrcviewloc],ebx
@@ -2283,7 +2283,7 @@ GUICheatSearchKeys:
jz .noneg
mov ebx,0
.noneg
mov dword[GUIcurrentchtsrcviewloc],ebx
mov [GUIcurrentchtsrcviewloc],ebx
.posvd
.nopagedown
@@ -2687,9 +2687,9 @@ GUILoadKeys:
mov byte[GUILoadPos],0
mov eax,[GUIfileentries]
dec eax
mov dword[GUIcurrentcursloc],eax
mov [GUIcurrentcursloc],eax
sub eax,14
mov dword[GUIcurrentviewloc],eax
mov [GUIcurrentviewloc],eax
test dword[GUIcurrentviewloc],8000000h
jz .posve
mov dword[GUIcurrentviewloc],0
@@ -2785,7 +2785,7 @@ GUILoadKeys:
dec ebx
cmp dword[GUIcurrentcursloc],ebx
jb .poscd
mov dword[GUIcurrentcursloc],ebx
mov [GUIcurrentcursloc],ebx
.poscd
sub ebx,14
cmp dword[GUIcurrentviewloc],ebx
@@ -2794,7 +2794,7 @@ GUILoadKeys:
jz .noneg
mov ebx,0
.noneg
mov dword[GUIcurrentviewloc],ebx
mov [GUIcurrentviewloc],ebx
.posvd
.nopagedown
@@ -2822,7 +2822,7 @@ GUILoadKeys:
mov byte[GUILDFlash],0
xor eax,eax
mov al,[GUILoadPos]
mov byte[GUILoadTextA+eax],dh
mov [GUILoadTextA+eax],dh
inc byte[GUILoadPos]
; Go to closest matching filename if there are no :, /, or \ in the filename
mov ebx,[ManualCPtr]
@@ -2850,7 +2850,7 @@ GUILoadKeys:
add ebx,[GUIdirentries]
.notdir
mov ecx,esi
mov dword[.foundval],esi
mov [.foundval],esi
mov dword[.maxfound],0
.loop2
mov dword[.numfound],0
@@ -2930,7 +2930,7 @@ GUILoadKeys:
sub ebx,15
cmp dword[GUIcurrentdirviewloc],ebx
jb .posvl2
mov dword[GUIcurrentdirviewloc],ebx
mov [GUIcurrentdirviewloc],ebx
jmp .posvl2
.notdir2
mov [GUIcurrentcursloc],esi
@@ -2939,7 +2939,7 @@ GUILoadKeys:
sub ebx,15
cmp dword[GUIcurrentviewloc],ebx
jb .posvl2
mov dword[GUIcurrentviewloc],ebx
mov [GUIcurrentviewloc],ebx
.posvl2
cmp byte[ManualStatus],3
jne .notdirectload
@@ -2985,9 +2985,9 @@ SECTION .text
mov byte[GUILoadPos],0
mov eax,[GUIdirentries]
dec eax
mov dword[GUIcurrentdircursloc],eax
mov [GUIcurrentdircursloc],eax
sub eax,14
mov dword[GUIcurrentdirviewloc],eax
mov [GUIcurrentdirviewloc],eax
test dword[GUIcurrentdirviewloc],8000000h
jz .posve2
mov dword[GUIcurrentdirviewloc],0
@@ -3083,7 +3083,7 @@ SECTION .text
dec ebx
cmp dword[GUIcurrentdircursloc],ebx
jb .poscd2
mov dword[GUIcurrentdircursloc],ebx
mov [GUIcurrentdircursloc],ebx
.poscd2
sub ebx,14
cmp dword[GUIcurrentdirviewloc],ebx
@@ -3092,7 +3092,7 @@ SECTION .text
jz .noneg2
mov ebx,0
.noneg2
mov dword[GUIcurrentdirviewloc],ebx
mov [GUIcurrentdirviewloc],ebx
.posvd2
.nopagedown2
jmp .textboxa

12
zsnes/src/gui/guiload.inc
View File

@@ -973,7 +973,7 @@ GetLoadDirNormal:
; Copy every 14 bytes of spcRamcmp into every 32 bytes of spcBuffer
mov ecx,[GUIdirentries]
mov esi,[GUIdirStartLoc]
mov edi,dword[GUIfileentries]
mov edi,[GUIfileentries]
shl edi,5
add edi,[spcBuffera]
cmp ecx,0
@@ -999,7 +999,7 @@ GetLoadDirNormallfn:
call GetNormalDirEntries
push edi
; Copy every 14 bytes of spcRamcmp into every 32 bytes of spcBuffer
mov edi,dword[GUIfileentries]
mov edi,[GUIfileentries]
shl edi,5
add edi,[spcBuffera]
inc edi
@@ -1079,8 +1079,8 @@ GetLoadData:
mov byte[GUIloadfntype],0
jmp GetLoadData
.notfailed
mov eax,dword[GUInumentries]
mov dword[GUIfileentries],eax
mov eax,[GUInumentries]
mov [GUIfileentries],eax
cmp dword[GUIfileentries],0
jne .nonoentry
mov dword[GUIcurrentfilewin],1
@@ -1203,7 +1203,7 @@ GUIGetDirs:
; compares string at esi to edi and returns 1 to al if esi is >, else 0
.sortagain
mov byte[BubbleSorted],0
mov esi,dword[GUIfileentries]
mov esi,[GUIfileentries]
shl esi,5
add esi,[spcBuffera]
mov edi,[GUIdirStartLoc]
@@ -1256,7 +1256,7 @@ GUIGetDirs:
pop edi
jmp .nodirs
.sort2
mov esi,dword[GUIfileentries]
mov esi,[GUIfileentries]
shl esi,2
add esi,spcRamcmp
.nextentryb

4
zsnes/src/gui/guimisc.inc
View File

@@ -131,13 +131,13 @@ SetAllKeys:
;Check if controller is set
push eax
mov eax,dword[keycontrolval]
mov eax,[keycontrolval]
cmp dword[eax],0
pop eax
jne .noLockInputChange
ret
.noLockInputChange
mov dword[guicpressptr],edi
mov [guicpressptr],edi
xor ebx,ebx
mov ecx,12
mov dword[guipressptr],guipresstext4b

34
zsnes/src/gui/guimouse.inc
View File

@@ -104,7 +104,7 @@ ProcessMouse:
je .zero3
mov byte[MouseMoveOkay],1
.zero3
mov word[GUImouseposx],cx
mov [GUImouseposx],cx
test word[GUImouseposx],8000h
jz .nowrapleft
mov word[GUImouseposx],0
@@ -113,7 +113,7 @@ ProcessMouse:
jbe .nowrapright
mov word[GUImouseposx],255
.nowrapright
mov word[GUImouseposy],dx
mov [GUImouseposy],dx
test word[GUImouseposy],8000h
jz .nowrapup
mov word[GUImouseposy],0
@@ -186,7 +186,7 @@ ProcessMouseButtons:
mov byte[GUIOnMenuItm],2
cmp byte[eax+ebx+1],0
je .zero
mov byte[GUIcrowpos],al
mov [GUIcrowpos],al
mov byte[GUIOnMenuItm],1
.zero
; Check if mouse is clicked on menu
@@ -465,7 +465,7 @@ ProcessMouseButtons:
.nomwrap
mov word[GUImouseposy],16
.noover
mov cx,word[GUImouseposy]
mov cx,[GUImouseposy]
sub cx,[GUIHoldy]
add cx,[GUIHoldym]
movsx ecx,cx
@@ -475,7 +475,7 @@ ProcessMouseButtons:
xor ebx,ebx
mov bl,[GUIwinorder+eax]
mov [GUIwinposy+ebx*4],ecx
mov cx,word[GUImouseposx]
mov cx,[GUImouseposx]
sub cx,[GUIHoldx]
add cx,[GUIHoldxm]
movsx ecx,cx
@@ -1590,9 +1590,9 @@ SECTION .text
mov [GUIHoldXlimR],eax
mov eax,[%5]
mov [GUIlastdispval],eax
mov eax,dword[%8]
mov eax,[%8]
mov [GUIlastcpos],eax
mov eax,dword[%7]
mov eax,[%7]
mov [GUIlastvpos],eax
mov byte[GUIHold],3
ret
@@ -2186,7 +2186,7 @@ DisplayGUIMovieClick:
DisplayGUIInputClick2:
push eax
mov eax,[NumInputDevices]
mov dword[GUINumValue],eax
mov [GUINumValue],eax
pop eax
GUISlidebarPostImpl 109,42,116,69,.scrollup,.scrolldown,9,5,GUIcurrentinputviewloc,GUIcurrentinputcursloc,GUINumValue,GUIBlankVar,1
GUIPostWinBoxMove 5,35,107,35+5*8,GUIcurrentinputviewloc,GUIcurrentinputcursloc,GUINumValue,.scrollup,.scrolldown,DisplayGUIInputClick.skipscrol,5
@@ -2194,7 +2194,7 @@ DisplayGUIInputClick:
; SlideBar Implementation
push eax
mov eax,[NumInputDevices]
mov dword[GUINumValue],eax
mov [GUINumValue],eax
pop eax
GUISlidebarImpl 109,42,116,69,GUIIStA,5,GUIcurrentinputviewloc,GUIcurrentinputcursloc,GUINumValue,3
.skipscrol
@@ -2232,7 +2232,7 @@ DisplayGUIInputClick:
;Check if controller is set
push eax
mov eax,dword[keycontrolval]
mov eax,[keycontrolval]
cmp dword[eax],0
pop eax
je near .lockInputChange
@@ -2358,7 +2358,7 @@ DisplayGUIOptionClick:
DisplayGUIVideoClick2:
push eax
mov eax,[NumVideoModes]
mov dword[GUINumValue],eax
mov [GUINumValue],eax
pop eax
GUISlidebarPostImpl 117,33,124,62,.scrollup,.scrolldown,5,5,GUIcurrentvideoviewloc,GUIcurrentvideocursloc,GUINumValue,GUIBlankVar,1
GUIPostWinBoxMove 5,27,115,27+5*8,GUIcurrentvideoviewloc,GUIcurrentvideocursloc,GUINumValue,.scrollup,.scrolldown,DisplayGUIVideoClick.skipscrol,5
@@ -2366,7 +2366,7 @@ DisplayGUIVideoClick:
; SlideBar Implementation
push eax
mov eax,[NumVideoModes]
mov dword[GUINumValue],eax
mov [GUINumValue],eax
pop eax
GUISlidebarImpl 117,33,124,62,GUIVStA,5,GUIcurrentvideoviewloc,GUIcurrentvideocursloc,GUINumValue,5
.skipscrol
@@ -2473,7 +2473,7 @@ DisplayGUIVideoClick:
.nocheckboxi2
GUIPHoldbutton 128,60,164,71,4
mov al,[vsyncon]
mov byte[cfgvsync],al
mov [cfgvsync],al
xor al,al
ret
@@ -2874,7 +2874,7 @@ DisplayGUIOptnsClick:
jg .nomovebar1
cmp byte[TRVal2],al
je .nomovebar1b
mov byte[TRVal2],al
mov [TRVal2],al
mov byte[TRVal2+1],1
.nomovebar1b
mov byte[GUIHold],2
@@ -2889,7 +2889,7 @@ DisplayGUIOptnsClick:
jg .nomovebar2
cmp byte[TGVal2],al
je .nomovebar2b
mov byte[TGVal2],al
mov [TGVal2],al
mov byte[TRVal2+1],1
.nomovebar2b
mov byte[GUIHold],2
@@ -2904,7 +2904,7 @@ DisplayGUIOptnsClick:
jg .nomovebar3
cmp byte[TBVal2],al
je .nomovebar3b
mov byte[TBVal2],al
mov [TBVal2],al
mov byte[TRVal2+1],1
.nomovebar3b
mov byte[GUIHold],2
@@ -3365,7 +3365,7 @@ DrawMouse:
; jnz .nomidshad
shr bl,1
add bl,189
mov byte[edi+288*7+5],bl
mov [edi+288*7+5],bl
jmp .finishadow
.nomidshad

26
zsnes/src/gui/guitools.inc
View File

@@ -126,7 +126,7 @@ GUIoutputchar:
sub al,cl
sub al,ch
inc al
mov byte[esi],al
mov [esi],al
.nowrite
shl ah,1
inc esi
@@ -309,7 +309,7 @@ GUIDrawShadow:
sub al,189
shr al,1
add al,189
mov byte[edi-288*3-3],al
mov [edi-288*3-3],al
jmp .noshadow
.nomidshad
mov al,[edi]
@@ -384,7 +384,7 @@ GUIoutputcharwin:
test ah,80h
jz .nowrite
mov al,[GUItextcolor]
mov byte[esi],al
mov [esi],al
.nowrite
shl ah,1
inc esi
@@ -535,8 +535,8 @@ OutputUnder:
%endmacro
%macro GUIOuttextwin2 4
mov edx,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov edx,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add edx,%2
add ebx,%3
@@ -552,8 +552,8 @@ OutputUnder:
%endmacro
%macro GUIOuttextwin2l 4
mov edx,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov edx,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add edx,%2
add ebx,%3
@@ -569,8 +569,8 @@ OutputUnder:
%endmacro
%macro GUIOuttextwin2u 5
mov edx,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov edx,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add edx,%2
add ebx,%3
@@ -648,8 +648,8 @@ GUIoutputiconwin:
%endmacro
%macro GUIDisplayIconWin 4
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,%2
add ebx,%3
mov edi,%4
@@ -826,8 +826,8 @@ GUIDrawSlideBar:
mov [%8],esi
mov [%8+4],edx
mov [%8+8],ecx
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,%2
add ebx,%3
mov esi,%7

126
zsnes/src/gui/guiwindp.inc
View File

@@ -243,54 +243,54 @@ GUIStringGreater2:
mov dword[GUIWincol],148
.nozero
drawshadow2 %1,dword[GUIwinsizex+%1*4],dword[GUIwinsizey+%1*4]
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
mov ecx,eax
add ecx,dword[GUIwinsizex+%1*4]
DrawTitleBar
mov esi,dword[GUIwinsizey+%1*4]
mov esi,[GUIwinsizey+%1*4]
dec esi
mov edx,dword[GUIWincol]
mov edx,[GUIWincol]
add edx,2
.loop
DrawGUILine
dec esi
jnz .loop
mov edx,dword[GUIWincol]
mov edx,[GUIWincol]
DrawGUILine
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add ebx,10
mov ecx,eax
mov esi,dword[GUIwinsizey+%1*4]
mov edx,dword[GUIWincol]
mov esi,[GUIwinsizey+%1*4]
mov edx,[GUIWincol]
add edx,3
dec esi
.loop2
DrawGUILine
dec esi
jnz .loop2
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add ebx,10
add eax,dword[GUIwinsizex+%1*4]
mov ecx,eax
mov esi,dword[GUIwinsizey+%1*4]
mov edx,dword[GUIWincol]
mov esi,[GUIwinsizey+%1*4]
mov edx,[GUIWincol]
add edx,1
.loop3
DrawGUILine
dec esi
jnz .loop3
mov ebx,dword[GUIwinposy+%1*4]
mov ebx,[GUIwinposy+%1*4]
add ebx,3
mov edx,dword[GUIwinposx+%1*4]
mov edx,[GUIwinposx+%1*4]
add edx,3
mov byte[GUItextcolor],184
GUIOuttextwin %2
mov ebx,dword[GUIwinposy+%1*4]
mov ebx,[GUIwinposy+%1*4]
add ebx,2
mov edx,dword[GUIwinposx+%1*4]
mov edx,[GUIwinposx+%1*4]
add edx,2
mov byte[GUItextcolor],220
cmp byte[GUIWincoladd],0
@@ -298,16 +298,16 @@ GUIStringGreater2:
sub byte[GUItextcolor],6
.zero2
GUIOuttextwin %2
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,dword[GUIwinsizex+%1*4]
sub eax,10
GUIDisplayIcon GUIIconDataClose
%endmacro
%macro DrawGUIWinBox 6
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,%2
add ebx,%3
mov ecx,eax
@@ -321,7 +321,7 @@ GUIStringGreater2:
%endmacro
%macro DrawGUIWinBox2 5
mov eax,dword[GUIwinposx+%1*4]
mov eax,[GUIwinposx+%1*4]
add eax,%2
mov ecx,eax
add ecx,%3-%2+1
@@ -340,8 +340,8 @@ GUIStringGreater2:
%macro DrawGUIWinBox3 6
mov ecx,%4
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,%2
add ebx,%3
add ecx,eax
@@ -356,7 +356,7 @@ GUIStringGreater2:
%endmacro
%macro DrawGUIButton 9
mov dl,byte[GUItextcolor]
mov dl,[GUItextcolor]
sub dl,5
cmp byte[GUICBHold],%7
jne %%noa
@@ -459,7 +459,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4
%macro GUIDisplayTextY 4 ; Yellow Text&Shadow
mov al,[GUIWincol]
mov byte[GUItextcolor],al
mov [GUItextcolor],al
GUIOuttextwin2 %1,%2,%3,%4
mov byte[GUItextcolor],163
cmp byte[GUIWincoladd],0
@@ -685,11 +685,11 @@ DisplayGUILoad:
mov eax,[spcBuffera]
inc eax
mov dword[cloadnpos],eax
mov [cloadnpos],eax
mov eax,[GUIfileentries]
sub eax,[GUIcurrentviewloc]
dec eax
mov dword[cloadnleft],eax
mov [cloadnleft],eax
mov eax,[GUIcurrentviewloc]
mov [cloadnposb],eax
shl eax,5
@@ -714,11 +714,11 @@ DisplayGUILoad:
mov eax,[spcBuffera]
inc eax
mov dword[cloadnpos],eax
mov [cloadnpos],eax
mov eax,[GUIdirentries]
sub eax,[GUIcurrentdirviewloc]
dec eax
mov dword[cloadnleft],eax
mov [cloadnleft],eax
mov eax,[GUIcurrentdirviewloc]
add eax,[GUIfileentries]
mov [cloadnposb],eax
@@ -932,7 +932,7 @@ DisplayGUIChoseSave: ; Pick Save State
mov dword[GUITemp],GUIIconDataButtonHole ; Radio Buttons
mov ebx,[statefileloc]
mov al,byte[fnamest+ebx]
mov al,[fnamest+ebx]
mov [GUIChoseSaveText2],al
GUIDisplayButtonHole 2,10,28,byte[GUIChoseSaveText2],'t'
GUIDisplayButtonHole 2,30,28,byte[GUIChoseSaveText2],'1'
@@ -976,8 +976,8 @@ mov dl,[GUIWincol]
%endmacro
%macro DGOptnsDrawBox 3
mov eax,dword[GUIwinposx+9*4]
mov ebx,dword[GUIwinposy+9*4]
mov eax,[GUIwinposx+9*4]
mov ebx,[GUIwinposy+9*4]
add eax,%1
add ebx,%2
mov ecx,eax
@@ -1003,8 +1003,8 @@ mov dl,[GUIWincol]
%endmacro
%macro DDrawBox 4
mov eax,dword[GUIwinposx+%1*4]
mov ebx,dword[GUIwinposy+%1*4]
mov eax,[GUIwinposx+%1*4]
mov ebx,[GUIwinposy+%1*4]
add eax,%2+1
add ebx,%3+1
mov ecx,eax
@@ -1031,8 +1031,8 @@ mov dl,[GUIWincol]
%endmacro
%macro DGOptnsDrawBox2 3
mov eax,dword[GUIwinposx+3*4]
mov ebx,dword[GUIwinposy+3*4]
mov eax,[GUIwinposx+3*4]
mov ebx,[GUIwinposy+3*4]
add eax,%1
add ebx,%2
mov ecx,eax
@@ -1084,7 +1084,7 @@ DisplayGUIInput: ; Player Select, Joystick/keyboard Type List, Button Assignm
shl eax,4
add eax,ebx
add eax,GUIInputNames
mov dword[GUITemp],eax
mov [GUITemp],eax
GUIDisplayTextY 3,6+24,83,[GUITemp]
GUIDisplayTextY 3,6,83,GUIInputTextA3
@@ -1150,7 +1150,7 @@ DisplayGUIInput: ; Player Select, Joystick/keyboard Type List, Button Assignm
shl eax,4
add eax,[GUIcurrentinputviewloc]
add eax,GUIInputNames
mov dword[GUITemp],eax
mov [GUITemp],eax
GUIDisplayTextG 3,11,38,[GUITemp]
add dword[GUITemp],17
GUIDisplayTextG 3,11,38+8,[GUITemp]
@@ -1622,7 +1622,7 @@ DisplayGUIVideo:
add eax,ebx
add eax,ebx
add eax,GUIVideoModeNames
mov dword[GUITemp],eax
mov [GUITemp],eax
GUIDisplayTextG 5,11,30,[GUITemp]
add dword[GUITemp],18
GUIDisplayTextG 5,11,30+8,[GUITemp]
@@ -1640,7 +1640,7 @@ DisplayGUIVideo:
add eax,ebx
add eax,ebx
add eax,GUIVideoModeNames
mov dword[GUITemp],eax
mov [GUITemp],eax
GUIDisplayTextY 5,7,196,GUIVideoTextE
GUIDisplayTextY 5,49,196,[GUITemp]
ret
@@ -1746,8 +1746,8 @@ DisplayGUISound: ; Sound Related Options
add [GUITemp],eax
GUIDisplayTextG 6,23,64,[GUITemp]
mov eax,dword[GUIwinposx+6*4] ; Volume Level Slider
mov ebx,dword[GUIwinposy+6*4]
mov eax,[GUIwinposx+6*4] ; Volume Level Slider
mov ebx,[GUIwinposy+6*4]
mov ecx,eax
add eax,15
add ecx,15+100
@@ -1969,7 +1969,7 @@ DisplayGUICheat: ; Add/Browse Cheats menu
mov eax,[NumCheats]
sub eax,[GUIcurrentcheatviewloc]
dec eax
mov dword[ccheatnleft],eax
mov [ccheatnleft],eax
mov eax,[GUIcurrentcheatviewloc]
mov ebx,eax
shl eax,5
@@ -2256,7 +2256,7 @@ CheatSearchingComp: ; Comparative search
FindChtSrcRes: ; Calculate search results
inc edi
mov eax,dword[vidbuffer]
mov eax,[vidbuffer]
add eax,129600+65536*2
mov ecx,16384
xor esi,esi
@@ -2319,7 +2319,7 @@ Cheatmodeview: ; View ResultsWindow
mov edi,[GUIcurrentchtsrcviewloc]
call FindChtSrcRes
mov [NumCheatSrc],eax
mov dword[ccheatnpos],esi
mov [ccheatnpos],esi
; Display Window Contents
mov byte[GUItextcolor],223
mov eax,[NumCheatSrc]
@@ -2328,8 +2328,8 @@ Cheatmodeview: ; View ResultsWindow
jbe .notof
mov eax,12
.notof
mov dword[ccheatnleft],eax
mov dword[ccheatnleftb],eax
mov [ccheatnleft],eax
mov [ccheatnleftb],eax
mov dword[CheatSearchYPos],24
mov dword[CheatSearchXPos],10
@@ -2386,7 +2386,7 @@ Cheatmodeview: ; View ResultsWindow
cmp byte[GUICSrcTextE+12],0
je near .noprevious
mov esi,GUICSrcTextG1
mov ebx,dword[vidbuffer]
mov ebx,[vidbuffer]
add ebx,129600
add ebx,[CSCurEntry]
mov eax,[ebx]
@@ -2431,8 +2431,8 @@ Cheatmodeview: ; View ResultsWindow
mov dword[CheatSearchXPos],11
mov eax,[CSStartEntry]
mov [CSCurEntry],eax
mov eax,dword[ccheatnleftb]
mov dword[ccheatnleft],eax
mov eax,[ccheatnleftb]
mov [ccheatnleft],eax
inc byte[CheatLooped]
cmp byte[CheatLooped],2
jne near .nextdisplay
@@ -2853,8 +2853,8 @@ DisplayGUIOptns: ; GUI Options
.nopal1b
pop eax
mov eax,dword[GUIwinposx+10*4] ; Slider Bars
mov ebx,dword[GUIwinposy+10*4]
mov eax,[GUIwinposx+10*4] ; Slider Bars
mov ebx,[GUIwinposy+10*4]
mov ecx,eax
add eax,25
add ecx,25+32*4
@@ -2868,7 +2868,7 @@ DisplayGUIOptns: ; GUI Options
add ebx,11
DrawGUILine
inc ecx
mov ebx,dword[GUIwinposy+10*4]
mov ebx,[GUIwinposy+10*4]
inc eax
add ebx,125
sub dl,13
@@ -3306,24 +3306,24 @@ SECTION .text
mov al,211
.zero3
sub al,15
mov byte[TextColorSp+2],al
mov [TextColorSp+2],al
mov al,[GUIWincol]
mov byte[TextColorSp],al
mov [TextColorSp],al
mov al,163
cmp byte[GUIWincoladd],0
je .zero
mov al,164
mov byte[GUItextcolor],164
.zero
mov byte[TextColorSp+1],al
mov [TextColorSp+1],al
%endmacro
%macro GUIOuttextwin2b 4 ; Special, yellow text
mov al,[TextColorSp]
mov byte[GUItextcolor],al
mov [GUItextcolor],al
GUIOuttextwin2 %1,%2,%3,%4
mov al,[TextColorSp+1]
mov byte[GUItextcolor],al
mov [GUItextcolor],al
GUIOuttextwin2 %1,%2-1,%3-1,%4
%endmacro
@@ -3390,7 +3390,7 @@ SECTION .text
%macro DrawSlideBar 10
DrawSlideBarWin %1,%2,%3+8,%4,%5,%6,%7-16,%8
mov al,[TextColorSp+2]
mov byte[GUItextcolor],al
mov [GUItextcolor],al
cmp byte[GUICHold],%9
jne .noholda
add byte[GUIWincoladd],3
@@ -3401,7 +3401,7 @@ SECTION .text
sub byte[GUIWincoladd],3
.noholda2
mov al,[TextColorSp+2]
mov byte[GUItextcolor],al
mov [GUItextcolor],al
cmp byte[GUICHold],%10
jne .noholdb
add byte[GUIWincoladd],3
@@ -4405,8 +4405,8 @@ DisplayGUISpeed: ;Speed Options
cmp byte[frameskip],0
jne near .noslider
mov eax,dword[GUIwinposx+21*4] ;Slider
mov ebx,dword[GUIwinposy+21*4]
mov eax,[GUIwinposx+21*4] ;Slider
mov ebx,[GUIwinposy+21*4]
add eax,15
add ebx,175
mov ecx,eax

30
zsnes/src/gui/menu.asm
View File

@@ -1099,7 +1099,7 @@ NEWSYM dumpsound
.loop
push eax
mov eax,[spcBuffera]
mov edx,dword[eax+ecx*4]
mov edx,[eax+ecx*4]
pop eax
cmp edx,0
je .nowrite
@@ -1221,7 +1221,7 @@ NEWSYM savepcx
mov byte[edi],0C1h
inc edi
inc ecx
mov byte[edi],al
mov [edi],al
.norep
inc ecx
inc esi
@@ -1311,19 +1311,19 @@ NEWSYM savepcx
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi],al
mov [edi],al
mov ax,[esi]
mov cl,[vesa2_gpos]
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi+1],al
mov [edi+1],al
mov ax,[esi]
mov cl,[vesa2_rpos]
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi+2],al
mov [edi+2],al
pop ecx
add edi,3
add esi,2
@@ -1389,9 +1389,9 @@ NEWSYM GetFreeFile
add al,48
add dl,48
mov esi,.filename+5
mov byte[esi],cl
mov byte[esi+1],al
mov byte[esi+2],dl
mov [esi],cl
mov [esi+1],al
mov [esi+2],dl
jmp .findagain
.nofile
mov edx,.filename
@@ -1445,21 +1445,21 @@ NEWSYM GetFreeFile
mov bx,1000
div bx
add al,48
mov byte[esi+1],al
mov [esi+1],al
mov ax,dx
xor edx,edx
mov bx,100
div bx
add al,48
mov byte[esi+2],al
mov [esi+2],al
mov ax,dx
xor edx,edx
mov bx,10
div bx
add al,48
add dl,48
mov byte[esi+3],al
mov byte[esi+4],dl
mov [esi+3],al
mov [esi+4],dl
jmp .findagain
.nofile
mov edx,.imagefname
@@ -1526,19 +1526,19 @@ NEWSYM save16b2
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi],al
mov [edi],al
mov ax,[es:esi]
mov cl,[vesa2_gpos]
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi+1],al
mov [edi+1],al
mov ax,[es:esi]
mov cl,[vesa2_rpos]
shr ax,cl
and ax,1Fh
shl al,3
mov byte[edi+2],al
mov [edi+2],al
pop ecx
add edi,3
add esi,2