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

'spcRam' -> 'SPCRAM'. Prerequisite for new SPC stuff.

Browse Source
This commit is contained in:
grinvader
2005-07-16 21:42:52 +00:00
parent 9bb7d64292
commit ffaf266913
19 changed files with 210 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@
;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
; Sorry. The GUI code is a total mess. One problem I encountered is that
; there seems to be a bug in nasm with using math calculations combined
; with macros within macros, so in some macro definitions, I had to
@@ -71,7 +72,7 @@ EXTSYM smallscreenon,soundon,StereoSound,SoundQuality,MusicRelVol,endprog
EXTSYM continueprog,spcBuffera,spcRamcmp,cbitmode,makepal,t1cc,LoadDir,LoadDrive
EXTSYM SRAMDir,SRAMChdir,SRAMDirCurDir,initsnes,fname,makeextension,sram
EXTSYM loadfileGUI,GUIloadfailed,romloadskip,SetupROM,romdata,ramsize
EXTSYM cfgloadsdir,init65816,procexecloop,spcRam,spcPCRam,spcS,spcRamDP,spcA
EXTSYM cfgloadsdir,init65816,procexecloop,SPCRAM,spcPCRam,spcS,spcRamDP,spcA
EXTSYM spcX,spcY,spcP,spcNZ,Voice0Status,Voice1Status,Voice2Status,Voice3Status
EXTSYM Voice4Status,Voice5Status,Voice6Status,Voice7Status,ClearScreen
EXTSYM statesaver,loadstate2,vidbuffer,ASCII2Font,hirestiledat,showallext

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

@@ -20,7 +20,6 @@
; GUI Keyboard Routines
%macro GUIqcheckkeys 1
@@ -3168,5 +3167,3 @@ WaitForKey:
.mousedis2
mov byte[GUIpclicked],1
ret

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

@@ -19,6 +19,7 @@
;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
; GUI File (Game) Loader
%macro GUIGetEntry 1
@@ -1559,5 +1560,3 @@ loadquickfname:
SECTION .bss
.temp resd 256
SECTION .text

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

@@ -379,12 +379,12 @@ NEWSYM GUIDoReset
popad
xor eax,eax
mov edx,spcRam
mov edx,SPCRAM
mov ax,0FFC0h
add edx,eax
mov [spcPCRam],edx
mov dword[spcS],1EFh
mov dword[spcRamDP],spcRam
mov dword[spcRamDP],SPCRAM
mov byte[spcA],0
mov byte[spcX],0
mov byte[spcY],0

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

@@ -18,6 +18,8 @@
;along with this program; if not, write to the Free Software
;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
SECTION .text
; Window Display Routines

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

@@ -26,7 +26,7 @@ EXTSYM DSPMem,FPSOn,Makemode7Table,MessageOn,vesa2red10,scanlines,smallscreenon
EXTSYM MsgCount,Msgptr,OutputGraphicString,OutputGraphicString16b,vidbuffer
EXTSYM PrepareSaveState,ResetState,breakatsignb,cvidmode,cbitmode,copyvid
EXTSYM curblank,drawhline,drawhline16b,drawvline,drawvline16b,fnames,frameskip
EXTSYM mode7tab,pressed,spcA,spcBuffera,spcNZ,spcP,spcPCRam,spcRam,spcS,spcX
EXTSYM mode7tab,pressed,spcA,spcBuffera,spcNZ,spcP,spcPCRam,SPCRAM,spcS,spcX
EXTSYM spcY,spcon,vesa2_bpos,vesa2_clbit,vesa2_gpos,vesa2_rpos,vesa2selec
EXTSYM spritetablea,sprlefttot,newengen,spcextraram,resolutn,Open_File
EXTSYM Close_File,Write_File,Create_File,Get_Key,Get_Date,continueprognokeys
@@ -818,7 +818,7 @@ NEWSYM menudrawcursor16b
ret
NEWSYM savespcdata
sub dword[spcPCRam],spcRam
sub dword[spcPCRam],SPCRAM
; Assemble N/Z flags into P
and byte[spcP],0FDh
test byte[spcNZ],0FFh
@@ -842,7 +842,7 @@ NEWSYM savespcdata
mov [ssdatst+42],al
mov al,[spcS]
mov [ssdatst+43],al
add dword[spcPCRam],spcRam
add dword[spcPCRam],SPCRAM
.savestuff
ChangeDir SPCPath
pushad
@@ -983,7 +983,7 @@ NEWSYM savespcdata
; Save SPC stuff
mov ecx,65536
mov edx,spcRam
mov edx,SPCRAM
call Write_File
mov ecx,256
mov edx,DSPMem
@@ -1007,7 +1007,7 @@ NEWSYM savespcdata
mov byte[SPCSave_dump],1
mov eax, [spcRam+0F4h]
mov eax, [SPCRAM+0F4h]
mov [SPCSave_ports], eax
xor eax, eax
mov [SPCSave_buffer], eax