diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in index 494407af..1c66115c 100644 --- a/zsnes/src/Makefile.in +++ b/zsnes/src/Makefile.in @@ -88,8 +88,8 @@ ${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\ ${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\ ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac -${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c betauser.mac -ui.o: ui.asm macros.mac betauser.mac +${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c +ui.o: ui.asm macros.mac cfgload.o:cfgload.asm macros.mac init.o:init.asm macros.mac ${DOSDIR}/debug.o: ${DOSDIR}/debug.asm macros.mac diff --git a/zsnes/src/betauser.mac b/zsnes/src/betauser.mac deleted file mode 100644 index 1c6ac94b..00000000 --- a/zsnes/src/betauser.mac +++ /dev/null @@ -1,28 +0,0 @@ -;Copyright (C) 1997-2001 ZSNES Team ( zsknight@zsnes.com / _demo_@zsnes.com ) -; -;This program is free software; you can redistribute it and/or -;modify it under the terms of the GNU General Public License -;as published by the Free Software Foundation; either -;version 2 of the License, or (at your option) any later -;version. -; -;This program is distributed in the hope that it will be useful, -;but WITHOUT ANY WARRANTY; without even the implied warranty of -;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;GNU General Public License for more details. -; -;You should have received a copy of the GNU General Public License -;along with this program; if not, write to the Free Software -;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - - - - - - - -%define USERNAMEN 'Public' -%define USERNAMEC 'P'^76,'b'^89,'-'^178,'|'^34,'-'^217 -%define USERNAMEI 0 ; 1 - diff --git a/zsnes/src/cpu/dsp.asm b/zsnes/src/cpu/dsp.asm index 864fdcc4..de3c5f06 100644 --- a/zsnes/src/cpu/dsp.asm +++ b/zsnes/src/cpu/dsp.asm @@ -40,7 +40,6 @@ EXTSYM KeyOnStA,KeyOnStB,SoundTest NEWSYM DspAsmStart -%include "betauser.mac" @@ -49,7 +48,6 @@ NEWSYM DspAsmStart ;none times 256 db 0 identcode db 255,1,78,78 -idcodedata db USERNAMEI ;sardcode db 234,76,80,128,65,65 ; 6 ;efxcode db 17,47,62,97,26,126,98 ; 7 ;zopcode db 54,39,21,0,0,8,14,12,18 ; 9 diff --git a/zsnes/src/makefile.dos b/zsnes/src/makefile.dos index a532620a..1a2036a4 100644 --- a/zsnes/src/makefile.dos +++ b/zsnes/src/makefile.dos @@ -103,8 +103,8 @@ ${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\ ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\ ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac -${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c betauser.mac -ui.o: ui.asm macros.mac betauser.mac +${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c +ui.o: ui.asm macros.mac cfgload.o:cfgload.asm macros.mac init.o:init.asm macros.mac ${DOSDIR}/debug.o: ${DOSDIR}/debug.asm macros.mac diff --git a/zsnes/src/makefile.win b/zsnes/src/makefile.win index 2e2c530d..0a9e6360 100644 --- a/zsnes/src/makefile.win +++ b/zsnes/src/makefile.win @@ -119,10 +119,10 @@ ${CHIPDIR}/sa1regs.obj: ${CHIPDIR}/sa1regs.asm macros.mac\ ${CHIPDIR}/sfxproc.obj: ${CHIPDIR}/sfxproc.asm macros.mac\ ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac -${CHIPDIR}/dsp1emu.obj: ${CHIPDIR}/dsp1emu.c betauser.mac +${CHIPDIR}/dsp1emu.obj: ${CHIPDIR}/dsp1emu.c ${CC} ${CFLAGS} /Fo$@ $< ${CHIPDIR}/dsp1proc.obj: ${CHIPDIR}/dsp1proc.asm macros.mac -ui.obj: ui.asm macros.mac betauser.mac +ui.obj: ui.asm macros.mac cfgload.obj:cfgload.asm macros.mac init.obj:init.asm macros.mac ${DOSDIR}/debug.obj: ${DOSDIR}/debug.asm macros.mac diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm index b9ed2ccf..48d26aa1 100644 --- a/zsnes/src/ui.asm +++ b/zsnes/src/ui.asm @@ -43,7 +43,6 @@ EXTSYM GetFilename %endif NEWSYM UIAsmStart -%include "betauser.mac" @@ -151,11 +150,6 @@ NEWSYM vibradetect NEWSYM welcome -;%ifdef ZBETA -; db 'ZSNES v1.',ZVERSION,' beta (c)1997-2001, Compiled under NASM, GCC, and WDOSX',13,10 -; db 'PRIVATE BETA VERSION!!! PLEASE DO NOT DISTRIBUTE!!! Thank you!',13,10 -; db 'Private Beta is Registered to : ',USERNAMEN,13,10 -;%else db 'ZSNES v1.',ZVERSION,' beta (c) 1997-2002, ZSNES Team (zsKnight & _Demo_)',13,10 %ifdef __LINUX__ db 'Compiled under NASM and GCC. (Linux/FreeBSD)',13,10,13,10 @@ -1092,32 +1086,6 @@ section .data ; Check Parameter This Processes the Parameters ;******************************************************* -SECTION .text - -ShowIdentStr: - mov dl,[.idstrdata] - xor dl,76 - call .prst - mov dl,[.idstrdata+1] - xor dl,89 - call .prst - mov dl,[.idstrdata+2] - xor dl,178 - call .prst - mov dl,[.idstrdata+3] - xor dl,34 - call .prst - mov dl,[.idstrdata+4] - xor dl,217 - call .prst - jmp DosExit - ret -.prst - call PrintChar - ret - -SECTION .data -.idstrdata db USERNAMEC SECTION .bss newestfileloc resb 1 newestfiledate resd 1