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

Netplay code (mostly) removed, still need some help on EXTSYMs and port-dependant stuff.

Browse Source
This commit is contained in:
grinvader
2005-04-09 08:40:31 +00:00
parent f488c07ed4
commit 991588a89a
21 changed files with 38 additions and 5480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zsnes/src/Makefile.in
View File

@@ -24,7 +24,6 @@ DOSDIR=dos
GUIDIR=gui
VIDEODIR=video
WINDIR=linux
OBJDIR=obj
NETDIR=net
ZIPDIR=zip
EFFECTSDIR=effects
@@ -101,13 +100,13 @@ ${EFFECTSDIR}/smoke.o: ${EFFECTSDIR}/smoke.c
${EFFECTSDIR}/burn.o: ${EFFECTSDIR}/burn.c
${VIDEODIR}/procvid.o: ${VIDEODIR}/procvid.asm macros.mac ${VIDEODIR}/copyvid.inc ${VIDEODIR}/2xsaimmx.inc
${VIDEODIR}/procvidc.o: ${VIDEODIR}/procvidc.c
${VIDEODIR}/sw_draw.obj: ${VIDEODIR}/sw_draw.asm macros.mac
${VIDEODIR}/hq2x16.obj: ${VIDEODIR}/hq2x16.asm macros.mac
${VIDEODIR}/hq2x32.obj: ${VIDEODIR}/hq2x32.asm macros.mac
${VIDEODIR}/hq3x16.obj: ${VIDEODIR}/hq3x16.asm macros.mac
${VIDEODIR}/hq3x32.obj: ${VIDEODIR}/hq3x32.asm macros.mac
${VIDEODIR}/hq4x16.obj: ${VIDEODIR}/hq4x16.asm macros.mac
${VIDEODIR}/hq4x32.obj: ${VIDEODIR}/hq4x32.asm macros.mac
${VIDEODIR}/sw_draw.o: ${VIDEODIR}/sw_draw.asm macros.mac
${VIDEODIR}/hq2x16.o: ${VIDEODIR}/hq2x16.asm macros.mac
${VIDEODIR}/hq2x32.o: ${VIDEODIR}/hq2x32.asm macros.mac
${VIDEODIR}/hq3x16.o: ${VIDEODIR}/hq3x16.asm macros.mac
${VIDEODIR}/hq3x32.o: ${VIDEODIR}/hq3x32.asm macros.mac
${VIDEODIR}/hq4x16.o: ${VIDEODIR}/hq4x16.asm macros.mac
${VIDEODIR}/hq4x32.o: ${VIDEODIR}/hq4x32.asm macros.mac
${CHIPDIR}/dsp1proc.o: ${CHIPDIR}/dsp1proc.asm macros.mac
${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\
${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac

2
zsnes/src/cpu/dspproc.asm
View File

@@ -21,7 +21,7 @@
%include "macros.mac"
EXTSYM spcRam, spcPCRam, spcRamDP, spcS, spcX, MovieProcessing
EXTSYM CNetType, soundon, RevStereo
EXTSYM soundon, RevStereo
EXTSYM PitchModEn,SoundNoiseDis
EXTSYM DosExit,Invalidopcode,RSPCRegF0,RSPCRegF1,RSPCRegF2,RSPCRegF3
EXTSYM RSPCRegF4,RSPCRegF5,RSPCRegF6,RSPCRegF7,RSPCRegF8,RSPCRegF9

1164
zsnes/src/cpu/execute.asm
View File

File diff suppressed because it is too large Load Diff

6
zsnes/src/dos/dosintrf.asm
View File

@@ -1614,7 +1614,7 @@ NEWSYM TCPIPStartServer
jnz .failed
mov byte[TCPIPStatus],1
; StartServer(unsigned short port)
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push ax
; call StartServer
add esp,2
@@ -1635,7 +1635,7 @@ NEWSYM TCPIPInitConnectToServer
jnz .failed
mov byte[TCPIPStatus],1
; Convert TCPIPAddress to IPAddrStr
mov ebx,TCPIPAddress
; mov ebx,TCPIPAddress
mov edx,IPAddrStr
.notend
mov al,[ebx]
@@ -1648,7 +1648,7 @@ NEWSYM TCPIPInitConnectToServer
cmp al,0
jne .notend
; int ConnectServer(char *servername, unsigned short port)
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push ax
mov eax,IPAddrStr
push eax

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

@@ -68,7 +68,7 @@
%include "macros.mac"
EXTSYM curblank,vidpastecopyscr,frameskip,newengen,vsyncon
EXTSYM cvidmode,antienab, smallscreenon, smallscreence,NetQuit
EXTSYM cvidmode,antienab, smallscreenon, smallscreence
EXTSYM soundon,StereoSound,SoundQuality,MusicRelVol
EXTSYM endprog,continueprog,spcBuffera,spcRamcmp,cbitmode,makepal
EXTSYM t1cc,LoadDir,LoadDrive,SRAMDir,SRAMChdir,SRAMDirCurDir,initsnes
@@ -104,7 +104,7 @@ EXTSYM GUIFName,GUICName
EXTSYM printnum
EXTSYM MMXCheck
EXTSYM SaveCombFile
EXTSYM NetSent,valuea
EXTSYM valuea
EXTSYM showinfogui
EXTSYM BackupCVFrame, tempedx, tempesi, tempedi, tempebp
EXTSYM Wait1SecWin,ClearUDPStuff
@@ -113,7 +113,7 @@ EXTSYM BackStateSize
EXTSYM ResetExecStuff
EXTSYM RestoreCVFrame
EXTSYM clearSPCRAM
EXTSYM CurRecv,BackState,CBackupPos,PBackupPos,PPValue,DPValue,NetQuitter
EXTSYM CurRecv,BackState,CBackupPos,PBackupPos,PPValue,DPValue
EXTSYM LatencyV
EXTSYM LatencyRecvPtr,LatencySendPtr
EXTSYM NumofBanks
@@ -199,15 +199,6 @@ EXTSYM PreparePacketIPX,SendPacketIPX,ipxgetchar,ipxsendchar
SECTION .data
; ProcessRemoteCommand
; NetLoadStuff ; Send 14 to initiate, Send 15 to cancel (either way)
; call PreparePacket
; mov al,253
; call RemoteSendChar
; call SendPacket
; NetAddChar
NEWSYM WaterOn, db 1
; Things to do :
@@ -667,20 +658,10 @@ NEWSYM ForceHiLoROM, resb 1
NEWSYM CombinDataGlob, resb 3300 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff
NEWSYM CombinDataLocl, resb 3300
section .data
NEWSYM CmdLineNetPlay, db 0
NEWSYM CmdLineTCPIPAddress, times 29 db 0
section .bss
GUIwinorder resb 18
GUIwinpos resb 18
GUIwinactiv resb 18
DialNumber resb 40
ViewBuffer resb 50*32
NEWSYM ModemInitStat, resb 1
ModemProcess resb 1 ; Shows current dial/answer process
ModemPTimer resd 1 ; Timer for modem process
ModemOKStat resb 1 ; OK is detected on modem status
SECTION .data ; Window sizes and positions
; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO CHIP PATH SAVE
@@ -747,12 +728,6 @@ NEWSYM CheatBDoor, resb 1
NEWSYM ShowTimer, resb 1
NEWSYM MousePRClick, resb 1
NEWSYM MouseDis, resb 1
NEWSYM NetPlayNoMore, resb 1
NEWSYM NetChatFirst, resb 1
NEWSYM NetServer, resb 1
NEWSYM NetQuitAfter, resb 1
NEWSYM NetNewNick, resb 16
NEWSYM NetFilename, resb 512
NEWSYM CheatOn, resd 1
NEWSYM NumCheats, resd 1
@@ -769,28 +744,7 @@ NEWSYM numdrives, dd 26
SubPalTable times 256 db 1 ; Corresponding Gray Scale Color
SECTION .bss
WhichRemote resd 1 ; Modem = 1, IPX = 2, TCP/IP = 4
Connected resd 1
IDCheckPos resd 1
NEWSYM pl1neten, resb 1
NEWSYM pl2neten, resb 1
NEWSYM pl3neten, resb 1
NEWSYM pl4neten, resb 1
NEWSYM pl5neten, resb 1
NEWSYM cnetplaybuf, resb 512
NEWSYM cnetptrhead, resd 1
NEWSYM cnetptrtail, resd 1
NEWSYM prevp1net, resd 1
NEWSYM prevp2net, resd 1
NEWSYM prevp3net, resd 1
NEWSYM prevp4net, resd 1
NEWSYM prevp5net, resd 1
NEWSYM netdelayed, resb 1
NEWSYM ChatProgress,resd 1
NEWSYM RecvProgress,resd 1
NEWSYM IPXInfoStr, resw 1
NEWSYM IPXInfoStrR, resw 1
NEWSYM GUICMessage, resd 1
NEWSYM GUICTimer, resd 1
NEWSYM GUIOn, resb 1
@@ -801,9 +755,6 @@ NEWSYM MotionBlur, resb 1
NEWSYM StartLL, resd 1
NEWSYM StartLR, resd 1
NEWSYM LatencyVal, resb 32
NEWSYM NetLoadState, resb 1
NEWSYM TRVal, resw 1
NEWSYM TGVal, resw 1
@@ -996,20 +947,6 @@ NEWSYM GUIRestoreVars
mov [smallscreenon],al
mov al,[GUIScreenScale]
mov [ScreenScale],al
cmp byte[CmdLineNetPlay],0
je .nocmdlinenetplay
mov ecx,28/4
mov esi,CmdLineTCPIPAddress
mov edi,TCPIPAddress
.netplayloop
mov eax,[esi]
add esi,byte 4
mov [edi],eax
add edi,byte 4
dec ecx
jnz .netplayloop
xor eax,eax
.nocmdlinenetplay
call CalcChecksum
cmp byte[TimeChecker],bl
jne .nottimer
@@ -1145,10 +1082,6 @@ NEWSYM GUIinit36_4hz
NEWSYM GUI36hzcall
inc dword[GUIt1cc]
inc dword[SnowMover]
cmp dword[ModemPTimer],0
je .nodec5
dec dword[ModemPTimer]
.nodec5
cmp dword[GUIEditStringLTxt],0
je .nodec
dec dword[GUIEditStringLTxt]
@@ -1177,8 +1110,6 @@ NEWSYM GUI36hzcall
and byte[GUICCFlash],0Fh
inc byte[GUILDFlash]
and byte[GUILDFlash],0Fh
inc byte[GUINetTextm2+2]
and byte[GUINetTextm2+2],0Fh
ret
%ifdef __MSDOS__
@@ -1309,21 +1240,8 @@ LoadDetermine:
mov byte[GUICheatMenuData+14],1
mov byte[GUICheatMenuData+14*2],1
mov byte[GUIMiscMenuData+14*2],1
cmp byte[CheatBDoor],1
je .nomodem
cmp byte[CNetType],21
je .modem
cmp byte[CNetType],22
je .modem
cmp byte[CNetType],20
jne .nomodem
.modem
mov byte[GUICheatMenuData],2
mov byte[GUICheatMenuData+14],2
mov byte[GUICheatMenuData+14*2],2
.nomodem
cmp byte[romloadskip],0
je .noromloaded2
je .noromloaded
mov byte[GUIGameMenuData+14],2
mov byte[GUIGameMenuData+14*2],2
mov byte[GUIGameMenuData+14*4],2
@@ -1333,7 +1251,6 @@ LoadDetermine:
mov byte[GUICheatMenuData+14],2
mov byte[GUICheatMenuData+14*2],2
mov byte[GUIMiscMenuData+14*2],2
.noromloaded2
.noromloaded
ret
@@ -1601,28 +1518,6 @@ section .text
div ebx
%endmacro
NEWSYM TestSent
mov eax,[NetSent]
xor edx,edx
mov ebx,16
div ebx
ProcessOneDigit 3
ProcessOneDigit 2
ProcessOneDigit 1
ProcessOneDigit 0
mov eax,[valuea]
xor edx,edx
mov ebx,16
div ebx
ProcessOneDigit 8
ProcessOneDigit 7
ProcessOneDigit 6
ProcessOneDigit 5
mov dword[GUICMessage],.message
mov dword[GUICTimer],100000
ret
SECTION .data
.message db 0,0,0,0,' ',0,0,0,0,0,0,0
SECTION .text
@@ -1858,84 +1753,6 @@ NEWSYM StartGUI
mov ebx,LoadDir
call Change_Dir
cmp byte[NetFilename],0
je near .nofilenamenet
cmp byte[NetChatFirst],0
je near .filenamenetb
mov ebx,NetFilename
xor ecx,ecx
.fnetloop
cmp byte[ebx],'\'
jne .fnetloopb
mov ecx,ebx
.fnetloopb
inc ebx
cmp byte[ebx],0
jne .fnetloop
or ecx,ecx
jz near .nofilenamenet
mov byte[ecx],0
push ecx
mov dl,[LoadDrive]
cmp byte[NetFilename+1],':'
jne .nodrivenetb
mov dl,[NetFilename]
sub dl,'A'
.nodrivenetb
mov ebx,NetFilename
call Change_Dir
pop ecx
mov ebx,NetFilename
inc ecx
.nextnetl
mov al,[ecx]
mov [ebx],al
inc ecx
inc ebx
or al,al
jnz .nextnetl
jmp .nofilenamenet
.filenamenetb
mov dl,[LoadDrive]
cmp byte[NetFilename+1],':'
jne .nodrivenet
mov dl,[NetFilename]
sub dl,'A'
.nodrivenet
mov ebx,NetFilename
call Change_Dir
mov byte[NetFilename],0
.nofilenamenet
cmp byte[NetServer],0
je .noserverclient
mov byte[CNetType],15
mov byte[ModemProcess],40
cmp byte[NetServer],2
jne .noclient
mov byte[ModemProcess],41
.noclient
mov byte[NetServer],0
mov byte[WhichRemote],4
mov byte[GUIcmenupos],0
mov byte[GUIcrowpos],0
call loadnetopen
.noserverclient
cmp byte[NetNewNick],0
je .nonewnick
mov ebx,NetNewNick
mov ecx,ChatNick
.nickloop
mov al,[ebx]
mov [ecx],al
inc ebx
inc ecx
or al,al
jnz .nickloop
mov byte[NetNewNick],0
.nonewnick
cmp byte[CNetType],20
je near .noautostate
cmp byte[AutoState],0
je .noautostate
cmp byte[romloadskip],0
@@ -1945,106 +1762,6 @@ NEWSYM StartGUI
GUIInitIRQs
cmp byte[CNetType],20
jne near .nostat20
test byte[NetQuit],80h
jnz near .nostat20
mov byte[GUIcmenupos],0
mov byte[GUIcrowpos],0
call loadnetopen
%ifdef __MSDOS__
cmp byte[WhichRemote],1
jne .yesdcd
call ModemCheckDCD
cmp al,1
jne near .nostat20
.yesdcd
%endif
mov byte[RestoreValues],1
mov [tempedx],edx
mov [tempesi],esi
mov [tempedi],edi
mov [tempebp],ebp
pushad
mov dword[CBackupPos],0
call BackupCVFrame
popad
call DisableSUDPPacket
call Wait1SecWin
; sync
call PreparePacket
mov al,254
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,254
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,254
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,254
call RemoteSendChar
call SendPacket
mov dword[ModemPTimer],4*32
.nochar
pushad
call JoyRead
popad
call RemoteGetChar
cmp dword[ModemPTimer],0
je near .nostat20
cmp dh,0
je .nochar
cmp dl,254
jne .nochar
call PreparePacket
mov al,253
call RemoteSendChar
call SendPacket
.nocharc
pushad
call JoyRead
popad
call RemoteGetChar
cmp dword[ModemPTimer],0
je near .nostat20
cmp dh,0
je .nocharc
cmp dl,253
jne .nocharc
call PreparePacket
mov al,1
call RemoteSendChar
call SendPacket
call ClearUDPStuff
mov byte[RemoteCommand],1
mov byte[HoldCommand],1
cmp byte[NetLoadState],1
jne .notreceive
mov byte[CNetType],22
.noreceivestate
pushad
call JoyRead
popad
call RemoteGetChar
cmp dh,0
je .noreceivestate
cmp dl,14
jne .noreceivestate
call loadstaterecvinit
.notreceive
cmp byte[NetLoadState],2
jne .notsend
call NetLoadStuff
.notsend
.nostat20
cmp byte[GUIwinptr],0
jne .nomenuopen
cmp byte[lastcursres],1
@@ -2100,13 +1817,6 @@ NEWSYM StartGUI
mov byte[GUIQuit],0
.nokey
cmp byte[CNetType],21
je .noquit
cmp byte[CNetType],22
jne .yesquit
.noquit
mov byte[GUIQuit],0
.yesquit
cmp byte[GUIQuit],2
je near .exit
cmp byte[GUIQuit],1
@@ -2121,12 +1831,6 @@ NEWSYM StartGUI
.notrouble
.mousedis2
call GUIUnBuffer
cmp byte[CNetType],20
je .nowater
cmp byte[CNetType],21
je .nowater
cmp byte[CNetType],22
je .nowater
cmp byte[GUIEffect],1
jne .nosnow
call DrawSnow
@@ -2144,99 +1848,6 @@ NEWSYM StartGUI
; call DrawSmoke
call DrawBurn
.nosmoke
; call TestSent
cmp byte[CNetType],20
jne .noreceive
cmp byte[NetChatFirst],0
je .noloadbeforechat
mov eax,NetFilename
call GUIloadfilename.nocnettype
mov byte[sramsavedis],1
call transfersram
mov byte[NetChatFirst],0
.noloadbeforechat
cmp byte[GUIcmenupos],0
jne .nomenuout2
cmp byte[GUIwinptr],0
jne .nomenuout2
cmp byte[netlastloaded],1
je .openmenu
mov byte[GUIcmenupos],2
mov byte[GUIcrowpos],0
jmp .nomenuout2
.openmenu
mov byte[netlastloaded],0
call loadnetopen
.nomenuout2
call RemoteGetChar
cmp dh,0
jne .received
mov dl,1
.received
call ProcessRemoteCommand
jmp .noreceive2
.noreceive
mov byte[HoldCommand],0
.noreceive2
cmp byte[CNetType],21
jne .noloadstatesend
call loadstatesend
.noloadstatesend
cmp byte[CNetType],22
jne .noloadstaterecv
call loadstaterecv
.noloadstaterecv
cmp byte[CNetType],15
je .modem
cmp byte[CNetType],12
je .modem
cmp byte[CNetType],11
je .modem
cmp byte[CNetType],10
jne near .nomodem
.modem
call ProcessModem
%ifdef __MSDOS__
cmp byte[Connected],1
je near .nomodem
call ModemGetChar
cmp dh,0
je .nomodem
cmp byte[ModemOKStat],0
jne .foundokay
mov byte[ModemOKStat],1
jmp .skipstat
.foundokay
cmp byte[ModemOKStat],1
jne .nostat0
cmp dl,13
jne .nostat0
inc byte[ModemOKStat]
jmp .skipstat
.nostat0
cmp byte[ModemOKStat],2
jne .nostat1
cmp dl,'O'
jne .nostat1
inc byte[ModemOKStat]
jmp .skipstat
.nostat1
cmp byte[ModemOKStat],3
jne .nostat2
cmp dl,'K'
jne .nostat2
inc byte[ModemOKStat]
jmp .skipstat
.nostat2
.skipstat
mov dh,0
call NetAddChar
%endif
.nomodem
cmp dword[GUIEditStringcWin],0
je .noblink
@@ -2281,24 +1892,7 @@ NEWSYM StartGUI
call vidpastecopyscr
call GUIgetcurrentinput
jmp .nokey
.exitgui
cmp byte[CNetType],20
jne near .nostat20b2
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
.nostat20b2
GUIDeInitIRQs
mov ax,[PrevResoln]
@@ -2321,178 +1915,6 @@ NEWSYM StartGUI
.nomakepal
mov word[t1cc],1
mov byte[chaton],0
mov dword[chatstrL],0
mov dword[chatLpos],0
mov dword[chatstrR],0
mov dword[chatRTL],0
cmp byte[CNetType],20
jne near .nostat20b
mov al,10
sub al,[Latency]
cmp byte[Latency],4
jb .nolatency
mov al,7
.nolatency
mov [BackStateSize],al
call ResetExecStuff
mov byte[MultiTap],1
cmp byte[pl3neten],0
jne .mtap
cmp byte[pl4neten],0
jne .mtap
cmp byte[pl5neten],0
jne .mtap
.nomtap
mov byte[MultiTap],0
.mtap
cmp byte[RestoreValues],1
jne .norestoreval
pushad
mov dword[PBackupPos],0
call RestoreCVFrame
popad
mov esi,[tempesi]
mov edi,[tempedi]
mov ebp,[tempebp]
.norestoreval
mov dword[nmiprevaddrl],0
mov dword[nmiprevaddrh],0
mov dword[nmirept],0
mov dword[nmiprevline],224
mov dword[nmistatus],0
mov dword[spcnumread],0
mov dword[spchalted],-1
mov byte[NextLineCache],0
mov byte[DSPMem+08h],0
mov byte[DSPMem+18h],0
mov byte[DSPMem+28h],0
mov byte[DSPMem+38h],0
mov byte[DSPMem+48h],0
mov byte[DSPMem+58h],0
mov byte[DSPMem+68h],0
mov byte[DSPMem+78h],0
mov byte[netdelayed],0
mov dword[cnetptrhead],0
mov dword[cnetptrtail],0
mov dword[prevp1net],0
mov dword[prevp2net],0
mov dword[prevp3net],0
mov dword[prevp4net],0
mov dword[prevp5net],0
mov byte[BackState],1
mov dword[CBackupPos],0
mov dword[PBackupPos],0
mov dword[PPValue],0
mov dword[DPValue],0
mov byte[CurRecv],0
mov dword[NetQuitter],0
mov dword[LatencyV],0
mov dword[LatencyV+4],0
mov dword[LatencyV+8],0
mov dword[LatencyV+12],0
mov dword[LatencyRecvPtr],0
mov dword[LatencySendPtr],0
mov eax,cnetplaybuf
mov ecx,512
.loop20
mov byte[eax],0
inc eax
dec ecx
jnz .loop20
mov al,[Latency]
mov [LatencyLeft],al
mov byte[NetSwap],0
mov dword[CBackupPos],0
mov dword[PBackupPos],0
mov ebx,[romdata]
mov ecx,[NumofBanks]
shl ecx,15
xor eax,eax
or ecx,ecx
jz .nocsumloop
.csumloop
add al,[ebx]
adc ah,0
inc ebx
dec ecx
jnz .csumloop
.nocsumloop
mov [CheckSumVal],eax
mov ebx,eax
; sync with modem
call PreparePacket
mov al,30
call RemoteSendChar
mov al,230
call RemoteSendChar
mov al,[CheckSumVal]
call RemoteSendChar
mov al,[CheckSumVal+1]
call RemoteSendChar
call SendPacket
.nocharb
pushad
call JoyRead
popad
; cmp byte[pressed+1],1
; je near .faileda
call RemoteGetChar
cmp dh,0
je .nocharb
cmp dl,230
jne .nocharb
.nocharb2
call RemoteGetChar
cmp dh,0
je .nocharb2
cmp dl,[CheckSumVal]
jne .wrongcs
.nocharb3
call RemoteGetChar
cmp dh,0
je .nocharb3
cmp dl,[CheckSumVal+1]
je .okaychat
.wrongcs
mov esi,WrongCheckSum
call WritetochatBuffer
jmp StartGUI
.okaychat
call PreparePacket
mov al,229
call RemoteSendChar
call SendPacket
.nocharb5
pushad
call JoyRead
popad
; cmp byte[pressed+1],1
; je near .failedb
call RemoteGetChar
cmp dh,0
je .nocharb5
cmp dl,229
jne .nocharb5
.nostat20b
call EnableSUDPPacket
mov byte[ChatProgress],0
mov dword[RecvProgress],0
; get LoadDrive/LoadDir
mov ebx,LoadDir
mov edx,LoadDrive
@@ -2583,7 +2005,6 @@ NEWSYM StartGUI
mov byte[GUIReset],0
mov dword[StartLL],0
mov dword[StartLR],0
mov byte[NetLoadState],0
jmp continueprog
.faileda
@@ -3207,19 +2628,11 @@ GUITryMenuItem:
.dontquit
ret
.norun
cmp byte[CNetType],21
je near .noreset
cmp byte[CNetType],22
je near .noreset
GUICheckMenuItem 12, 2 ; Reset
cmp byte[GUIcrowpos],2
jne .noreset
mov byte[GUICResetPos],1
.noreset
cmp byte[CNetType],21
je near .noromloaded
cmp byte[CNetType],22
je near .noromloaded
cmp byte[GUIcrowpos],4
jne .nosavestate
mov byte[GUIStatesText5],0
@@ -3293,15 +2706,6 @@ GUITryMenuItem:
.noconfig
cmp byte[romloadskip],0
jne near .nocheat
cmp byte[CheatBDoor],1
je .yescheat
cmp byte[CNetType],20
je near .nocheat
cmp byte[CNetType],21
je near .nocheat
cmp byte[CNetType],22
je near .nocheat
.yescheat
cmp byte[GUIcmenupos],4
jne near .nocheat
GUICheckMenuItem 7, 0
@@ -3319,30 +2723,13 @@ GUITryMenuItem:
cmp byte[GUIcmenupos],5
jne near .nonet
%ifdef __MSDOS__
cmp byte[CNetType],10
jae .nomod
mov byte[CNetType],0
.nomod
GUICheckMenuItem 8, 0
GUICheckMenuItem 8, 1
cmp byte[CNetType],10
jae near .nonet
cmp byte[GUIcrowpos],1
jne .noipx
mov byte[CNetType],7
.noipx
cmp byte[GUIcrowpos],0
jne near .nonet
mov byte[CNetType],1
jmp .nonet
%endif
;.win32
GUICheckMenuItem 8, 0
cmp byte[CNetType],10
jae near .nonet
cmp byte[GUIcrowpos],0
jne near .nonet
mov byte[CNetType],4
call GetHostName
.nonet
cmp byte[GUIcmenupos],6
@@ -3546,11 +2933,6 @@ GUIProcStates:
popad
jmp .changedir
.loadstate
cmp byte[CNetType],20
jne .notnet
call NetLoadStuff
jmp .changedir
.notnet
pushad
call loadstate2
popad
@@ -3602,13 +2984,6 @@ GUIProcReset:
call GUIDoReset
.movieendif
popad
cmp byte[CNetType],20
jne .noreset
call PreparePacket
mov al,40
call RemoteSendChar
call SendPacket
mov byte[GUIQuit],0
.noreset
mov byte[GUICBHold],0
xor eax,eax

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

@@ -138,10 +138,6 @@ UseExtKey resb 1
SECTION .text
GUIgetcurrentinput:
cmp byte[HoldCommand],2
jne .nohold
ret
.nohold
mov byte[UseExtKey],0
xor ch,ch
xor cl,cl
@@ -321,56 +317,6 @@ GUIgetcurrentinput:
dec eax
xor ebx,ebx
mov bl,[GUIwinorder+eax]
cmp ebx,8
jne near .nonetwin
cmp byte[CNetType],12
jne .noprocess7
cmp byte[ModemProcess],7
jne .noprocess7
cmp dh,13
je .ret
cmp dh,32
jb .noprocess7
.ret
%ifdef __MSDOS__
mov al,dh
call ModemSendChar
%endif
ret
.noprocess7
cmp dl,27
jne .nonetwin
cmp byte[CNetType],2
je .yesnetwin
cmp byte[CNetType],3
je .yesnetwin
cmp byte[CNetType],10
je .yesnetwin
cmp byte[CNetType],11
je .yesnetwin
cmp byte[CNetType],12
je .yesnetwin
cmp byte[CNetType],15
je .yesnet15
jmp .nonetwin
.yesnet15
mov byte[CNetType],0
%ifdef __MSDOS__
call deinitipx
.nodeinitipx
%endif
jmp .closewin
.yesnetwin
%ifdef __MSDOS__
cmp byte[ModemInitStat],0
je .nodeinitmodem
call DeInitModemC
mov byte[ModemInitStat],0
.nodeinitmodem
%endif
mov byte[CNetType],1
ret
.nonetwin
cmp ebx,13
jne .notcskeys
cmp byte[CheatWinMode],1
@@ -408,16 +354,6 @@ GUIgetcurrentinput:
je near GUIPathKeys
cmp ebx,20
je near GUISaveKeys
cmp ebx,8
jne .notstartmenu
cmp byte[CNetType],4
jne .notcpip
jmp GUITCPIPKeys
.notcpip
cmp byte[CNetType],1
jne .notstartmenu
jmp GUINetMenuKeys1
.notstartmenu
cmp ebx,8
je near GUIGetInputLine
ret
@@ -650,163 +586,8 @@ GUIgetcurrentinput:
ret
GUITCPIPKeys:
cmp byte[GUINetTextm2],1
je near .section2
mov edi,TCPIPAddress
mov esi,26
cmp byte[GUINetTextm2],2
jne .notsecondstring
mov edi,ChatNick
mov esi,9
.notsecondstring
mov ebx,edi
.next
cmp byte[ebx],0
je .done2
inc ebx
jmp .next
.done2
sub ebx,edi
mov [GUINetTextm2+1],bl
xor eax,eax
mov al,[GUINetTextm2+1]
shl al,2
add al,2
cmp dh,32
jbe .notnum2
cmp byte[GUINetTextm2],0
je .notsecondstringb
cmp dh,'_'
je .notsecondstringb
cmp dh,'-'
je .notsecondstringb
cmp dh,'^'
je .notsecondstringb
cmp dh,'='
je .notsecondstringb
cmp dh,'+'
je .notsecondstringb
cmp dh,'['
je .notsecondstringb
cmp dh,']'
je .notsecondstringb
cmp dh,'0'
jb .notnum2
cmp dh,'9'
jbe .notsecondstringb
cmp dh,'A'
jb .notnum2
cmp dh,'Z'
jbe .notsecondstringb
cmp dh,'a'
jb .notnum2
cmp dh,'z'
jbe .notsecondstringb
.notsecondstringb
cmp ebx,esi
jae near .donesection1
add ebx,edi
mov byte[ebx],dh
jmp .donesection1
.notnum2
cmp dh,8
jne .notbacksp
or ebx,ebx
jz near .donesection1
add ebx,edi
mov byte[ebx-1],0
jmp .donesection1
.notbacksp
cmp dh,'c'
je .yesc
cmp dh,'C'
jne .noc
.yesc
; mov byte[CNetType],15
; mov byte[ModemProcess],41
; mov byte[WhichRemote],4
.noc
cmp dh,'s'
je .yess
cmp dh,'S'
jne .nos
.yess
; mov byte[CNetType],15
; mov byte[ModemProcess],40
; mov byte[WhichRemote],4
.nos
.donesection1
ret
.section2
mov ebx,GUINetTextl2
.loopz
cmp byte[ebx],0
je .donez
inc ebx
jmp .loopz
.donez
cmp byte[GUINetTextl2],'0'
jne .notzerob
cmp byte[GUINetTextl2+1],0
jne .notzerob
dec ebx
.notzerob
cmp dh,'0'
jb .notnum
cmp dh,'9'
ja .notnum
mov byte[ebx],dh
mov byte[ebx+1],0
push ebx
call .convert
pop ebx
cmp ecx,65536
jb .donenumb
mov byte[ebx],0
.donenumb
jmp .donenum
.notnum
cmp dh,8
jne .donenum
cmp byte[GUINetTextl2],0
je .donenum
mov byte[ebx-1],0
.donenum
call .convert
cmp ecx,0
jne .notzero
mov byte[GUINetTextl2],'0'
mov byte[GUINetTextl2+1],0
.notzero
mov [TCPIPPortNum],ecx
ret
.convert
mov ebx,GUINetTextl2
xor ecx,ecx
.loop
cmp byte[ebx],0
je .done
mov eax,ecx
push ebx
mov ebx,10
mul ebx
pop ebx
mov ecx,eax
xor eax,eax
mov al,[ebx]
sub eax,48
add ecx,eax
inc ebx
jmp .loop
.done
ret
SECTION .data
NEWSYM TCPIPPortNum, dd 7845
SECTION .text
GUIOptionKeys:
cmp dh,'a'
jb .nocap
@@ -1569,116 +1350,9 @@ SECTION .data
SECTION .text
GUINetMenuKeys1:
cmp dh,'a'
jb .nocap
cmp dh,'z'
ja .nocap
sub dh,'z'-'Z'
.nocap
cmp dh,'C'
jne .notconfig
mov byte[CNetType],2
.notconfig
cmp dh,'D'
jne .notdial
mov byte[CNetType],3
.notdial
cmp dh,'M'
jne .notmanual
mov byte[CNetType],12
mov byte[ModemProcess],0
%ifdef __MSDOS__
cmp byte[ModemInitStat],1
je .noinit
call InitModem
mov byte[ModemInitStat],1
.noinit
%endif
ret
.notmanual
cmp dh,'W'
jne .notwait
mov byte[CNetType],10
mov byte[ModemProcess],0
%ifdef __MSDOS__
cmp byte[ModemInitStat],1
je .noinit2
call InitModem
mov byte[ModemInitStat],1
.noinit2
%endif
ret
.notwait
ret
GUIGetInputLine:
cmp ebx,8
jne .nodial
cmp byte[CNetType],20
jne .nochat
cmp dh,13
jne .nochat
mov byte[RemoteCommand],2
ret
.nochat
cmp byte[CNetType],3
jne .nodial
cmp dh,13
jne .nodial
mov byte[CNetType],11
mov byte[ModemProcess],0
%ifdef __MSDOS__
cmp byte[ModemInitStat],1
je .noinit
call InitModem
mov byte[ModemInitStat],1
%endif
.noedit
ret
.noinit
.nodial
; search string for 0, record length of string
cmp dword[GUIEditString],0
je .noedit
mov eax,[GUIEditString]
xor ecx,ecx
dec ecx
.next
mov bl,[eax]
inc eax
inc ecx
cmp bl,0
jne .next
cmp byte[GUIEditStringcWin],0
je near .blinkstuff
cmp ecx,0
je .nodel
cmp dh,8
jne .nodel
mov byte[eax-2],0
dec eax
jmp .blinkstuff
.nodel
cmp ecx,[GUIEditStringmLen]
jne .notend
jmp .blinkstuff
.notend
cmp dh,'a'
jb .nocap
cmp dh,'z'
ja .nocap
sub dh,'z'-'Z'
.nocap
cmp dh,32
jb .noinsert
mov [eax-1],dh
mov byte[eax],0
inc eax
.noinsert
jmp .blinkstuff
.blinkstuff
dec eax
mov [GUIEditStringcLen],eax
ret
SECTION .bss

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

@@ -174,46 +174,6 @@ netlastloaded resb 1
SECTION .text
GUIloadfilename:
cmp byte[CNetType],15
je .noload
cmp byte[CNetType],12
je .noload
cmp byte[CNetType],11
je .noload
cmp byte[CNetType],10
je .noload
cmp byte[CNetType],21
je .noload
cmp byte[CNetType],22
jne .yesload
.noload
ret
.yesload
cmp byte[CNetType],20
jne near .nocnettype
mov byte[netlastloaded],1
cmp byte[GUIcmenupos],1
jne .nomenuout
mov byte[GUIcmenupos],0
.nomenuout
mov esi,FileNameMod
.nextfnc
mov cl,[eax]
mov [esi],cl
inc eax
inc esi
cmp cl,0
jne .nextfnc
mov byte[RemoteCommand],10
pushad
call GUIQuickLoadUpdate
popad
ret
.nocnettype
cmp byte[CNetType],20
je .okay20
; ret
.okay20
mov esi,eax
; find length of string & copy filename
xor cl,cl
@@ -318,8 +278,6 @@ GUIloadfilename:
call GUIQuickLoadUpdate
cmp byte[AutoLoadCht],0
je .nocheatload
cmp byte[CNetType],20
je .nocheatload
; change dir to LoadDrive/LoadDir
mov dl,[LoadDrive]
mov ebx,LoadDir

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

@@ -698,73 +698,6 @@ ProcessMouseButtons:
call AddCSCheatCode
; call InsertSearchDescription
.noinsertscc
cmp byte[GUICBHold],21
jne .nomodem1
mov byte[CNetType],3
.nomodem1
cmp byte[GUICBHold],22
jne .nomodem2
mov byte[CNetType],10
mov byte[ModemProcess],0
.nomodem2
cmp byte[GUICBHold],23
jne .nomodem3
mov byte[CNetType],2
.nomodem3
cmp byte[GUICBHold],24
jne .nomodem4
mov byte[CNetType],12
mov byte[ModemProcess],0
.nomodem4
cmp byte[GUICBHold],25
jne .nomodem4b
mov byte[CNetType],15
mov byte[ModemProcess],40
mov byte[WhichRemote],4
.nomodem4b
cmp byte[GUICBHold],26
jne .nomodem4c
mov byte[CNetType],15
mov byte[ModemProcess],41
mov byte[WhichRemote],4
.nomodem4c
cmp byte[GUICBHold],27
jne .noinit
cmp byte[CNetType],20
jne near .nostat20b2
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
call PreparePacket
mov al,255
call RemoteSendChar
call SendPacket
cmp byte[NetQuitAfter],0
je .nostat20b2
mov byte[GUIQuit],1
.nostat20b2
call RemoteDeInit
.noinit
cmp byte[GUICBHold],28
jne .nomodem5
mov byte[CNetType],11
mov byte[ModemProcess],0
.nomodem5
cmp byte[GUICBHold],34
jne .noipx1
mov byte[WhichRemote],2
mov byte[ModemProcess],30
mov byte[CNetType],15
.noipx1
cmp byte[GUICBHold],64
jne .nostatecancel
mov byte[NetStateQuit],1
.nostatecancel
cmp byte[GUICBHold],65
jne .nohomepage
call GotoHomepage
@@ -2634,96 +2567,6 @@ DisplayGUICheatClick:
ret
DisplayNetOptnsClick:
cmp byte[CNetType],1
jne near .nomodem
GUIPHoldbutton 5,15,89,26,21
GUIPHoldbutton 5,30,89,41,22
GUIPHoldbutton 5,45,89,56,23
GUIPHoldbutton 5,60,89,71,24
.nomodem
cmp byte[CNetType],2
jne near .nomodemc
GUIPButtonHole2 9,25,byte[ComNum],1,byte[ComIRQ],4
GUIPButtonHole2 9,35,byte[ComNum],2,byte[ComIRQ],3
GUIPButtonHole2 9,45,byte[ComNum],3,byte[ComIRQ],4
GUIPButtonHole2 9,55,byte[ComNum],4,byte[ComIRQ],3
GUIPButtonHole 94,25,byte[BaudRate],0
GUIPButtonHole 94,35,byte[BaudRate],1
GUIPButtonHole 94,45,byte[BaudRate],2
GUIPButtonHole 94,55,byte[BaudRate],3
GUIPButtonHole 94,65,byte[BaudRate],4
GUIPButtonHole 94,75,byte[BaudRate],5
GUIPButtonHole 94,85,byte[BaudRate],6
GUIPButtonHole 9,85,byte[GUIDialSt+3],'T'
GUIPButtonHole 9,95,byte[GUIDialSt+3],'P'
GUIPHoldbutton2 55,69,63,79,25,byte[ComIRQ],1,15
GUIPHoldbutton2 66,69,74,79,26,byte[ComIRQ],-1,2
GUITextBoxInput 21,125,175,133,GUIInitSt1,24
GUITextBoxInput 21,136,175,144,GUIInitSt2,24
GUIClickCButton 12,147,byte[FossilUse]
.nomodemc
cmp byte[CNetType],3
jne near .nomodemd
GUIPHoldbutton 141,38,175,49,28
.nomodemd
cmp byte[CNetType],4
jne near .notcpip
cmp byte[NetPlayNoMore],1
je near .notcpip
GUIPHoldbutton 5,35,129,46,25
GUIPHoldbutton 5,70,129,81,26
GUITextBoxInputB 55,13,95,21,1
GUITextBoxInputB 26,58,191,66,0
GUITextBoxInputB 55,24,119,32,2
GUIClickCButton 5,93,byte[UDPConfig]
.notcpip
cmp byte[CNetType],10
je .init
cmp byte[CNetType],11
je .init
cmp byte[CNetType],15
je .init
cmp byte[CNetType],12
jne near .noinit
.init
GUIPHoldbutton 120,135,181,146,27
.noinit
cmp byte[CNetType],7
jne near .noipx
GUIPHoldbutton 53,48,87,59,34
.noipx
cmp byte[CNetType],20
jne near .nochat
GUIPHoldbutton 111,169,181,180,27
GUIClickCButtonN 7,135,byte[RemoteCommand],3
GUIClickCButtonN 32,135,byte[RemoteCommand],4
GUIClickCButtonN 57,135,byte[RemoteCommand],5
GUIClickCButtonN 7,145,byte[RemoteCommand],6
GUIClickCButtonN 32,145,byte[RemoteCommand],7
GUIClickCButtonN 7,175,byte[RemoteCommand],8
GUIClickCButtonN 111,135,byte[RemoteCommand],50
GUIClickCButtonN 111,145,byte[RemoteCommand],41
GUIClickCButtonN 111,155,byte[RemoteCommand],42
GUIPHoldbutton2 79,156,87,166,29,byte[Latencytochange],1,19
GUIPHoldbutton2 90,156,98,166,30,byte[Latencytochange],-1,1
; DrawSlideBarWin 8,181,15,[GUIcurrentvideoviewloc],[TViewLoc],12,97,GUINCStA
; GUISlidebarImpl 181,15,188,112,GUINCStA,12,GUIcurrentcheatviewloc,TViewCLoc,TViewLoc,12
mov al,[Latency]
cmp byte[Latencytochange],al
je .nochat
mov byte[RemoteCommand],20
.nochat
cmp byte[CNetType],22
je .yesstate
cmp byte[CNetType],21
jne near .nostate
.yesstate
GUIPHoldbutton 73,48,127,59,64
.nostate
ret
guipresstest:

1781
zsnes/src/gui/guinetpl.inc
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

14
zsnes/src/init.asm
View File

@@ -26,7 +26,7 @@ EXTSYM showinfogui
EXTSYM filefound,inittable,SA1inittable
EXTSYM MessageOn,Msgptr,MsgCount,sndrot,SnowTimer
EXTSYM inittableb,inittablec,newgfx16b,cfgreinittime
EXTSYM Open_File,Read_File,Write_File,Close_File,Output_Text,Get_Key,CNetType
EXTSYM Open_File,Read_File,Write_File,Close_File,Output_Text,Get_Key
EXTSYM Delete_File,Get_First_Entry,Get_Next_Entry,Change_Dir,InitDSP
EXTSYM Remove_Dir,Change_Single_Dir,Create_Dir,Get_Memfree,Create_File
EXTSYM SPCDisable,osm2dis,CurRecv,BackupSystemVars
@@ -34,7 +34,6 @@ EXTSYM SnowData,SnowVelDist
EXTSYM cvidmode,newengen,cfgnewgfx,GUI16VID,NewEngEnForce
EXTSYM PrintChar,TextFile
EXTSYM Setper2exec,per2exec
EXTSYM chaton
EXTSYM JoyRead,JoyReadControl,joy4218,joy4219,joy421A,joy421B,pressed
EXTSYM pl3Ak,pl3Bk,pl3Lk,pl3Rk,pl3Xk,pl1p209,pl2p209,pl3p209,pl4p209
EXTSYM pl3Yk,pl3contrl,pl3downk,pl3leftk,pl3rightk,pl3selk,pl3startk
@@ -50,7 +49,7 @@ EXTSYM pl1ULk,pl1URk,pl1DLk,pl1DRk,pl2ULk,pl2URk,pl2DLk,pl2DRk
EXTSYM pl3ULk,pl3URk,pl3DLk,pl3DRk,pl4ULk,pl4URk,pl4DLk,pl4DRk
EXTSYM pl5ULk,pl5URk,pl5DLk,pl5DRk,pl5Xtk,pl5Ytk,pl5Atk,pl5Btk
EXTSYM pl1Ltk,pl1Rtk,pl2Ltk,pl2Rtk,pl3Ltk,pl3Rtk,pl4Ltk,pl4Rtk,pl5Ltk,pl5Rtk
EXTSYM Turbo30hz,nojoystickpoll
EXTSYM Turbo30hz
EXTSYM NumComboLocl,ComboBlHeader,ComboHeader,CombinDataLocl
EXTSYM CombinDataGlob,NumCombo,GUIComboGameSpec
EXTSYM mousexloc,mouseyloc
@@ -527,11 +526,6 @@ SECTION .text
%macro PlayerDeviceHelp 3
mov eax,[%1]
cmp byte[chaton],0
je %%okay
cmp eax,40h
jb %%no
%%okay
cmp byte[pressed+eax],1
jne %%no
or dword[%2],%3
@@ -568,8 +562,6 @@ SECTION .text
%macro ProcessKeyComb 2
cmp dword[NumCombo],0
je near %%nocomb
cmp byte[CNetType],20
je near %%nocomb
mov eax,CombinDataGlob
cmp byte[GUIComboGameSpec],0
je %%local
@@ -751,9 +743,7 @@ NEWSYM ReadInputDevice
mov byte[TurboCB],02h
.noturbo30
; Read External Devices (Joystick, PPort, etc.)
mov byte[nojoystickpoll],1
call JoyRead
mov byte[nojoystickpoll],0
; Process Data
mov dword[JoyAOrig],0
; Get Player1 input device

6
zsnes/src/linux/sdlintrf.asm
View File

@@ -1453,7 +1453,7 @@ NEWSYM TCPIPStartServer
mov byte[TCPIPStatus],1
; StartServer(unsigned short port)
xor eax,eax
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push eax
call StartServerCycle
add esp,4
@@ -1499,7 +1499,7 @@ NEWSYM TCPIPInitConnectToServer
jnz .failed
mov byte[TCPIPStatus],1
; Convert TCPIPAddress to IPAddrStr
mov ebx,TCPIPAddress
; mov ebx,TCPIPAddress
mov edx,IPAddrStr
.notend
mov al,[ebx]
@@ -1523,7 +1523,7 @@ NEWSYM TCPIPConnectToServer
; int ConnectServer(char *servername, unsigned short port)
pushad
xor eax,eax
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push eax
mov eax,IPAddrStr
push eax

7
zsnes/src/makefile.ms
View File

@@ -43,7 +43,6 @@ GUIDIR=gui
VIDEODIR=video
WINDIR=win
NETDIR=net
OBJDIR=obj
ZIPDIR=zip
EFFECTSDIR=effects
JMADIR=jma
@@ -175,9 +174,6 @@ WINOBJ=${WINDIR}/copyvwin${OE} ${DRESOBJ}\
NETOBJ=${NETDIR}/ztcp${OE}
#only used on DOS
PREOBJ=${OBJDIR}/dosbuff.o ${OBJDIR}/ipx.o ${OBJDIR}/zipx.o
ZIPOBJ=${ZIPDIR}/unzip${OE} ${ZIPDIR}/zpng${OE}
EFFECTSOBJ=${EFFECTSDIR}/burn${OE} ${EFFECTSDIR}/water${OE} ${EFFECTSDIR}/smoke${OE}
@@ -198,7 +194,7 @@ OBJSORIG=${CHIPSOBJ} ${CPUOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFEC
ifeq (${OS},__MSDOS__)
DOSOBJ=${DOSOBJORIG} ${DOSDIR}/dosintrf${OE} ${DOSDIR}/sound${OE} ${DOSDIR}/zfile${OE}
OBJS=${OBJSORIG} ${DOSOBJ} ${PREOBJ}
OBJS=${OBJSORIG} ${DOSOBJ}
DELETEOBJS=${OBJSORIG} ${DOSOBJ}
endif
@@ -383,6 +379,7 @@ clean:
${DELETECOMMAND} ${DOSDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${GUIDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${NETDIR}${SLASH}*${OE} ${TRUTH}
else #else no ENV specified
help:

BIN
zsnes/src/obj/dosbuff.o
View File

Binary file not shown.

BIN
zsnes/src/obj/ipx.o
View File

Binary file not shown.

BIN
zsnes/src/obj/zipx.o
View File

Binary file not shown.

20
zsnes/src/vcache.asm
View File

@@ -43,10 +43,7 @@ EXTSYM WindowDisables,scanlines,romispal
EXTSYM MusicRelVol,MusicVol,WDSPReg0C,WDSPReg1C
EXTSYM DSPOp02,Op02AAS,Op02AZS,Op02CX,Op02CY,Op02FX,Op02FY
EXTSYM Op02FZ,Op02LES,Op02LFE,Op02VOF,Op02VVA
EXTSYM CurRecv
EXTSYM CNetType
EXTSYM KeySlowDown
EXTSYM chaton
EXTSYM genfulladdtab
EXTSYM KeyFRateDown,KeyFRateUp,KeyVolUp,KeyVolDown,KeyDisplayFPS,FPSOn,pl12s34
EXTSYM bg1ptr,bg2ptr,bg3ptr,bg4ptr,cachebg1,resolutn
@@ -270,9 +267,6 @@ NEWSYM cachevideo
dec dword[WindowDisables]
.nowindis
cmp byte[CurRecv],1
je near .fskipall
call ClockCounter
cmp byte[mode7hiresen],0
@@ -317,9 +311,6 @@ NEWSYM cachevideo
mov dword[sramb4save],0
.nofocussave
cmp byte[CNetType],20
je near .sdskip
cmp byte[FastFwdToggle],0
jne .ffmode2
mov eax,[KeyFastFrwrd]
@@ -404,7 +395,6 @@ NEWSYM cachevideo
cmp byte[frskipper],bl
pop ebx
jae .nofrskip
.fskipall
mov byte[curblank],40h
mov al,40h
jmp .frskip
@@ -438,8 +428,6 @@ NEWSYM cachevideo
shl al,cl
mov [cachedmode],al
; disable all necessary backgrounds
cmp byte[chaton],1
je near .finishchatskip
mov eax,[KeyBGDisble0]
test byte[pressed+eax],1
je .nodis1
@@ -556,13 +544,6 @@ NEWSYM cachevideo
mov [MessageOn],eax
call Get_MousePositionDisplacement
.nodis7
cmp byte[CNetType],20
jne .nonet
cmp byte[snesmouse],0
je .nonet
mov byte[snesmouse],0
mov dword[MessageOn],0
.nonet
mov eax,[KeyNewGfxSwt]
test byte[pressed+eax],1
je near .nodis8
@@ -813,7 +794,6 @@ NEWSYM cachevideo
soundselcomp KeyDisableSC6,Voice6Disable,Voice6Status,'7'
soundselcomp KeyDisableSC7,Voice7Disable,Voice7Status,'8'
.finishchatskip
cmp byte[curblank],0h
jne near yesblank
; Swap video addresses

285
zsnes/src/video/procvid.asm
View File

@@ -50,11 +50,9 @@ EXTSYM objptrn,nglogicval,bgtilesz,C4values
EXTSYM curexecstate,TempVidInfo,LatestBank,C4ObjSelec
EXTSYM BGMS1,scadsng,winenabm,winenabs,vidbright
EXTSYM genfulladdtab,genfulladdtabng
EXTSYM KeyQuickChat,CNetType,WritetochatBuffer,NetAddChar,TimerEnable,ShowTimer
EXTSYM TimerEnable,ShowTimer
EXTSYM ClearScreenSkip,debugdisble,cmovietimeint
EXTSYM ChatNick
EXTSYM StringLength
EXTSYM chatstrLt
EXTSYM GUIOn,FilteredGUI,HalfTrans
EXTSYM SmallMsgText
EXTSYM ClearScreen
@@ -63,7 +61,7 @@ EXTSYM GUICPC, newgfx16b
EXTSYM vesa2_clbitng,vesa2_clbitng2,vesa2_clbitng3
EXTSYM granadd,CSStatus,CSStatus2,CSStatus3
EXTSYM SpecialLine
EXTSYM Clear2xSaIBuffer
EXTSYM Clear2xSaIBuffer,vidbufferofsb
;EXTSYM Super2xSaI
EXTSYM HalfTransB,HalfTransC
@@ -3211,291 +3209,12 @@ NEWSYM waitvsync
SECTION .data
NEWSYM prevengval, db 10
SECTION .bss
NEWSYM chaton, resb 1
NEWSYM chatstrL, resb 140
NEWSYM chatLpos, resd 1
NEWSYM chatstrR, resb 140
NEWSYM chatstrR2, resb 140
NEWSYM chatstrR3, resb 140
NEWSYM chatstrR4, resb 140
NEWSYM chatstrR5, resb 140
NEWSYM chatRTL, resd 1
NEWSYM chatRTL2, resd 1
NEWSYM chatRTL3, resd 1
NEWSYM chatRTL4, resd 1
NEWSYM chatRTL5, resd 1
NEWSYM chatTL, resd 1
SECTION .data
NEWSYM chatreqtable
db 0 ,2 ,'1','2','3','4','5','6','7','8','9','0','-','=',8 ,0
db 'Q','W','E','R','T','Y','U','I','O','P','[',']',13 ,0 ,'A','S'
db 'D','F','G','H','J','K','L',';',27h,'`',1 ,'\','Z','X','C','V'
db 'B','N','M',',','.','/',1 ,0 ,0 ,' ',0 ,0 ,0 ,0 ,0 ,0
; Shift Key Presses
db 0 ,2 ,'!','@','#','$','%','^','&','*','(',')','_','+',8 ,0
db 'Q','W','E','R','T','Y','U','I','O','P','{','}',13 ,0 ,'A','S'
db 'D','F','G','H','J','K','L',':','"','~',1 ,'|','Z','X','C','V'
db 'B','N','M','<','>','?',1 ,0 ,0 ,' ',0 ,0 ,0 ,0 ,0 ,0
SECTION .text
; Letters transferred & string cleared when chatstrL[0]!=0 and chaton=0
; Disable all transfers when chaton=1 (except joysticks and upper keyboard
; in input devices)
NEWSYM ChatType2
jmp ChatType.skipchatdisp
NEWSYM ChatType
cmp dword[chatTL],0
jne near .chatdisplayed
cmp byte[chatstrL],0
jne near .processchat
jmp .skipchatdisp
.chatdisplayed
dec dword[chatTL]
cmp dword[chatTL],0
jne .skipchatdisp
mov dword[chatstrL],0
.skipchatdisp
mov eax,[KeyQuickChat]
cmp byte[chaton],0
jne .nosendchats
cmp byte[chatstrL],0
je .nosendchats
cmp dword[chatTL],0
jne .nosendchats
mov byte[pressed+eax],0
.nosendchats
cmp byte[pressed+eax],1
jne .noqchat
mov dword[chatTL],0
mov byte[pressed+eax],2
mov byte[chaton],1
mov dword[chatLpos],0
mov byte[chatstrL],'>'
mov byte[chatstrL+1],'_'
mov byte[chatstrL+2],0
.noqchat
jmp .skipall
.processchat
cmp byte[chaton],0
je near .skipall
mov eax,63
.notof
cmp byte[chatreqtable+eax],1
jbe near .skipthis
cmp byte[pressed+eax],1
jne near .skipthis
mov byte[pressed+eax],2
push eax
cmp byte[pressed+42],1
je .shift
cmp byte[pressed+54],1
je .shift
mov al,[chatreqtable+eax]
jmp .noshift
.shift
mov al,[chatreqtable+eax+64]
.noshift
cmp al,8
je .delete
cmp al,13
je .enter
cmp al,2
je near .cancel
cmp dword[chatLpos],32+30
jae near .skipoutput
mov ebx,[chatLpos]
mov [chatstrL+ebx+1],al
mov byte[chatstrL+ebx+2],'_'
mov byte[chatstrL+ebx+3],0
inc dword[chatLpos]
jmp .skipoutput
.delete
mov byte[pressed+0Eh],2
cmp dword[chatLpos],0
je near .skipoutput
dec dword[chatLpos]
mov ebx,[chatLpos]
mov byte[chatstrL+ebx+1],'_'
mov byte[chatstrL+ebx+2],0
jmp .skipoutput
.enter
mov byte[pressed+1Ch],2
mov byte[chaton],0
cmp dword[chatLpos],0
jne .noskipoutput
mov byte[chatstrL],0
jmp .skipoutput
.noskipoutput
mov ebx,[chatLpos]
mov byte[chatstrL+ebx+1],0
pushad
mov dl,'L'
%ifndef __MSDOS__
cmp dword[chatstrL+1],'/ME '
je .action
%endif
;.dos
mov esi,ChatNick
call WritetochatBuffer
mov esi,chatstrL
call WritetochatBuffer
jmp .noaction
.action
mov dl,'*'
call NetAddChar
mov esi,ChatNick
call WritetochatBuffer
mov dl,' '
call NetAddChar
mov esi,chatstrL+5
call WritetochatBuffer
.noaction
mov dl,13
call NetAddChar
mov dl,10
call NetAddChar
popad
jmp .skipoutput
.cancel
mov byte[chatstrL],0
mov byte[chaton],0
mov byte[pressed+1],2
.skipoutput
pop eax
.skipthis
dec eax
jns near .notof
.skipall
ret
%macro RemoteStringPrint 1
cmp byte[%1],0
je %%nostringremote
mov edi,%1
mov esi,[vidbuffer]
cmp byte[cbitmode],1
je %%do16b3
mov byte[ngfont],1
add esi,194*288+20
add esi,[.sdrawptr]
cmp byte[%1],' '
jne %%nospace
inc edi
add esi,6
%%nospace
add dword[.sdrawptr],288*6
call OutputGraphicString5x5.no16bit
jmp %%nostringremote
%%do16b3
add esi,194*288*2+20*2
add esi,[.sdrawptr]
cmp byte[%1],' '
jne %%nospaceb
inc edi
add esi,6
%%nospaceb
add dword[.sdrawptr],288*6*2
call OutputGraphicString16b5x52
%%nostringremote
%endmacro
NEWSYM copyvid
cmp byte[CNetType],20
jne .nonet
call ChatType
.nonet
mov byte[ngfont],0
cmp byte[chatstrL],0
je .nostringlocal
mov eax,chatstrL
call StringLength
sub ecx,42
cmp ecx,0
jge .notover
xor ecx,ecx
.notover
mov edi,chatstrL
add edi,ecx
mov esi,[vidbuffer]
cmp byte[cbitmode],1
je .do16b2
.no16b2
mov byte[ngfont],1
add esi,188*288+20
call OutputGraphicString5x5.no16bit
jmp .nostringlocal
.do16b2
add esi,188*288*2+20*2
call OutputGraphicString16b5x52
.nostringlocal
cmp byte[chatstrLt],0
je .nostringtemp
mov edi,chatstrLt
mov esi,[vidbuffer]
cmp byte[cbitmode],1
je .do16b2temp
.no16b2temp
mov byte[ngfont],1
add esi,182*288+20
call OutputGraphicString5x5.no16bit
jmp .nostringtemp
.do16b2temp
add esi,182*288*2+20*2
call OutputGraphicString16b5x52
.nostringtemp
mov dword[.sdrawptr],0
RemoteStringPrint chatstrR5
RemoteStringPrint chatstrR4
RemoteStringPrint chatstrR3
RemoteStringPrint chatstrR2
RemoteStringPrint chatstrR
cmp dword[chatRTL],0
je .nortl
dec dword[chatRTL]
cmp dword[chatRTL],0
jne .nortl
mov dword[chatstrR],0
.nortl
cmp dword[chatRTL2],0
je .nortl2
dec dword[chatRTL2]
cmp dword[chatRTL2],0
jne .nortl2
mov dword[chatstrR2],0
.nortl2
cmp dword[chatRTL3],0
je .nortl3
dec dword[chatRTL3]
cmp dword[chatRTL3],0
jne .nortl3
mov dword[chatstrR3],0
.nortl3
cmp dword[chatRTL4],0
je .nortl4
dec dword[chatRTL4]
cmp dword[chatRTL4],0
jne .nortl4
mov dword[chatstrR4],0
.nortl4
cmp dword[chatRTL5],0
je .nortl5
dec dword[chatRTL5]
cmp dword[chatRTL5],0
jne .nortl5
mov dword[chatstrR5],0
.nortl5
; Test if add table needs updating
cmp byte[cbitmode],0
je .notatud

6
zsnes/src/win/winintrf.asm
View File

@@ -1757,7 +1757,7 @@ NEWSYM TCPIPStartServer
mov byte[TCPIPStatus],1
; StartServer(unsigned short port)
xor eax,eax
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push eax
call StartServerCycle
add esp,4
@@ -1803,7 +1803,7 @@ NEWSYM TCPIPInitConnectToServer
jnz .failed
mov byte[TCPIPStatus],1
; Convert TCPIPAddress to IPAddrStr
mov ebx,TCPIPAddress
; mov ebx,TCPIPAddress
mov edx,IPAddrStr
.notend
mov al,[ebx]
@@ -1827,7 +1827,7 @@ NEWSYM TCPIPConnectToServer
; int ConnectServer(char *servername, unsigned short port)
pushad
xor eax,eax
mov ax,[TCPIPPortNum]
; mov ax,[TCPIPPortNum]
push eax
mov eax,IPAddrStr
push eax

35
zsnes/src/zloader.c
View File

@@ -218,27 +218,16 @@ static void handle_params(int argc, char *argv[])
int i;
#ifndef __MSDOS__
NetServer=0;
NetChatFirst=0;
NetQuitAfter=0;
if (argc >= 5 && argv[1][0] == '/' && strlen(argv[1]) == 6)
{
size_t i = 0, j = 0;
char *strp, *p;
char *strp;
if (toupper(argv[1][1]) == 'T') UDPConfig=0;
if (toupper(argv[1][2]) == 'S') NetServer=1;
if (toupper(argv[1][2]) == 'C') NetServer=2;
if (toupper(argv[1][3]) == 'C') NetChatFirst=0;
if (toupper(argv[1][3]) == 'L') NetChatFirst=1;
if (toupper(argv[1][4]) == 'N') NetQuitAfter=0;
if (toupper(argv[1][4]) == 'Q') NetQuitAfter=1;
//Next should be # of connections
strp = &NetNewNick;
while (argv[2][i]!=0)
{
switch (argv[2][i])
@@ -273,26 +262,6 @@ static void handle_params(int argc, char *argv[])
}
strp[j] = 0;
strncpy(NetFilename, argv[3], 512);
NetFilename[511] = 0;
if (NetServer == 2)
{
if (argc < 5)
{
NetServer = 0;
}
else
{
CmdLineNetPlay = 1;
strp = &CmdLineTCPIPAddress;
strncpy(strp, argv[4], 28);
}
}
for (p = NetFilename+strlen(NetFilename)-1; (p > (char *)NetFilename) && (*p != DIR_SLASH); p--);
*p = 0;
chdir(NetFilename);
*p = DIR_SLASH;
}
#endif

7
zsnes/src/zstate.c
View File

@@ -785,10 +785,3 @@ void loadstate2()
{
stateloader(fnamest+1, 0, 1);
}
extern unsigned char Netfname[11];
void loadstate3()
{
stateloader(Netfname, 0, 1);
}