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

Fixed typo in uic.c. Removed hacks for Kamen Rider and Lamborghini - American Challenge. Removed useless code.

Browse Source
This commit is contained in:
jbo_85
2006-05-01 00:30:12 +00:00
parent 1299a4a2c1
commit 6394bfec50
9 changed files with 10 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,10 +20,10 @@
EXTSYM KeyRewind,statesaver,Voice0Status,UpdateDPage
EXTSYM StartGUI,debuggeron,romdata,initvideo
EXTSYM vidbufferofsa,disable65816sh,GUISaveVars,virqnodisable
EXTSYM vidbufferofsa,disable65816sh,GUISaveVars
EXTSYM KeySaveState,KeyLoadState,KeyQuickExit,KeyQuickLoad,KeyQuickRst
EXTSYM GUIDoReset,GUIReset,KeyOnStA,KeyOnStB,ProcessKeyOn,C4Enable,KeyQuickClock
EXTSYM KeyQuickSaveSPC,TimerEnable,IRQHack,splitflags,joinflags
EXTSYM KeyQuickSaveSPC,TimerEnable,splitflags,joinflags
EXTSYM KeyQuickSnapShot,csounddisable,videotroub,ResetTripleBuf
EXTSYM Output_Text,Check_Key,Get_Key,Change_Dir
EXTSYM InitPreGame,Curtableaddr,curcyc,debugdisble,dmadata,guioff,memtabler8
@@ -157,8 +157,6 @@ VoiceStartMute:
%macro ProcessIRQStuff 0
; check for VIRQ/HIRQ
cmp byte[virqnodisable],1
je %%virqdo
test dl,04h
jnz %%virqdo
cmp byte[doirqnext],1
@@ -167,7 +165,6 @@ VoiceStartMute:
test byte[INTEnab],20h
jz near %%novirq
mov ax,[VIRQLoc]
add ax,[IRQHack]
cmp ax,[resolutn]
jne %%notres
dec ax
@@ -1543,7 +1540,6 @@ NEWSYM cpuover
.novblch
mov byte[NMIEnab],01h
call starthdma
.noirqhack
; check for VIRQ/HIRQ/NMI
ProcessIRQStuff
xor ebx,ebx

8
zsnes/src/cpu/regs.inc
View File

@@ -709,8 +709,6 @@ reg213Cr:
; V counter data by external or software latch
reg213Dr:
cmp byte[latchyr],2 ; hack for games that don't read 213F
je .noreset
cmp byte[latchyr],1
je .highv
mov al,[latchy]
@@ -722,11 +720,7 @@ reg213Dr:
or al,byte[latchy+1]
mov byte[latchyr],0
ret
.noreset
mov al,[latchy]
and al,0FEh
or al,byte[latchy+1]
ret
; PPU Status Flag & Version number (OBJ over flags)
reg213Er:
mov al,01h

5
zsnes/src/cpu/regsw.inc
View File

@@ -20,7 +20,7 @@
EXTSYM initsfxregsw,reg420Bw,reg420Cw,regptw,initSA1regsw,SDD1Reset
EXTSYM SPC7110Reset,RTCReset2,debstop,NextLineCache,vidmemch2,vidmemch4
EXTSYM vidmemch8,vrama,nmirept,sndwrit,SPCRAM,HIRQCycNext,HIRQNextExe,HIRQSkip
EXTSYM vidmemch8,vrama,nmirept,sndwrit,SPCRAM,HIRQCycNext,HIRQNextExe
EXTSYM cycpb268,cycpb358,cycpbl,cycpblt,opexec268,opexec268cph,opexec358
EXTSYM opexec358cph
@@ -1406,8 +1406,6 @@ reg4206w:
DetermineHIRQExec
cmp byte[HIRQSkip],1
je near .ret
add dh,[HIRQCycNext]
mov byte[HIRQCycNext],0
mov byte[HIRQNextExe],0
@@ -1428,7 +1426,6 @@ DetermineHIRQExec
.notokay
pop ecx
pop eax
.ret
ret
.hirqokay
sub dh,cl

7
zsnes/src/init.asm
View File

@@ -139,7 +139,6 @@ NEWSYM init
inc eax
dec ecx
jnz .rbackupl
mov byte[virqnodisable],0
pushad
call clearmem
popad
@@ -991,13 +990,8 @@ NEWSYM disableeffects, db 0
NEWSYM hdmaearlstart, db 0
NEWSYM disable65816sh, db 0
NEWSYM disablespcclr, db 0
NEWSYM virqnodisable, db 0
NEWSYM numspcvblleft, dd 0
NEWSYM spc700idle, dd 0
NEWSYM IRQHack, dw 0
NEWSYM CacheCheckSkip, db 0
NEWSYM HIRQSkip, db 0
NEWSYM ClearScreenSkip, db 0
NEWSYM ENVDisable, db 0
SECTION .text
@@ -1022,7 +1016,6 @@ SECTION .bss
NEWSYM ReturnFromSPCStall, resb 1
NEWSYM SPCStallSetting, resb 1
NEWSYM SPCSkipXtraROM, resb 1
NEWSYM WindowDisables, resd 1
SECTION .text
%macro helpclearmem 2

19
zsnes/src/initc.c
View File

@@ -1421,10 +1421,7 @@ Would be nice to trash this section in the future
extern unsigned char disablehdma;
extern unsigned char hdmaearlstart;
extern unsigned int WindowDisables;
extern unsigned char ClearScreenSkip;
extern unsigned char ENVDisable;
extern unsigned char latchyr;
extern unsigned char cycpb268;
extern unsigned char cycpb358;
extern unsigned char cycpbl2;
@@ -1440,7 +1437,6 @@ extern unsigned char opexec358cph;
extern unsigned char opexec268cphb;
extern unsigned char opexec358cphb;
extern unsigned char DSP1Type;
extern unsigned char cycpl;
unsigned char HacksDisable;
void headerhack()
@@ -1448,8 +1444,6 @@ void headerhack()
char *RomData = (char *)romdata;
disablehdma = 0;
hdmaearlstart = 0;
WindowDisables = 0;
ClearScreenSkip = 0;
ENVDisable = 0;
if ((curromspace < Lo) || (HacksDisable && !DSP1Type))
@@ -1477,12 +1471,6 @@ void headerhack()
RomData[0x6CFA] = 0xEA;
}
//Kamen Rider (J)
if (!strncmp((RomData+Lo),"SFC \x0b6\x0d2\x0dd\x0d7\x0b2\x0c0\x0de\x0b0 " ,16))
{
latchyr = 2;
}
//Deae Tonosama Appare Ichiban (J)
if (!strncmp((RomData+Lo),"\x0c3\x0de\x0b1\x0b4\x0c4\x0c9\x0bb\x0cf \x0b1\x0af\x0ca" ,12))
{
@@ -1623,13 +1611,6 @@ void headerhack()
//Okaaay...
if(DSP1Type) { disablehdma = true; }
//Lamborghini - American Challenge (U/E)
if (!strncmp((RomData+Lo), "LAMBORGHINI AMERICAN", 20))
{
opexec268 = 76;
opexec358 = 76;
}
//Addams Family Values (U/E)
if (!strncmp((RomData+Lo), "ADDAMS FAMILY VALUES", 20))
{

4
zsnes/src/uic.c
View File

@@ -103,8 +103,8 @@ unsigned char opexec268 = 155; // # of opcodes/scanline in 2.68Mhz mode
unsigned char opexec358 = 142; // # of opcodes/scanline in 3.58Mhz mode (228/180)
unsigned char opexec268cph = 42; // # of opcodes/hblank in 2.68Mhz mode
unsigned char opexec358cph = 45; // # of opcodes/hblank in 3.58Mhz mode (56/50)
unsigned char opexec268b = 142; // # of opcodes/scanline in 2.68Mhz mode
unsigned char opexec358b = 155; // # of opcodes/scanline in 3.58Mhz mode (228/180)
unsigned char opexec268b = 155; // # of opcodes/scanline in 2.68Mhz mode
unsigned char opexec358b = 142; // # of opcodes/scanline in 3.58Mhz mode (228/180)
unsigned char opexec268cphb = 42; // # of opcodes/hblank in 2.68Mhz mode
unsigned char opexec358cphb = 45; // # of opcodes/hblank in 3.58Mhz mode (56/50)
unsigned char debugdisble = 1; // debugger disable. 0 = no, 1 = yes

6
zsnes/src/vcache.asm
View File

@@ -38,7 +38,7 @@ EXTSYM KeyStateSlc0,KeyStateSlc1,KeyStateSlc2,KeyStateSlc3,KeyStateSlc4
EXTSYM KeyStateSlc5,KeyStateSlc6,KeyStateSlc7,KeyStateSlc8,KeyStateSlc9
EXTSYM KeyIncStateSlot,KeyDecStateSlot,KeyUsePlayer1234,maxskip,DSPMem,dsp1ptr
EXTSYM dsp1array,FastFwdToggle,SaveSramData,ngextbg,Mode7HiRes,Check60hz
EXTSYM Get_MouseData,Get_MousePositionDisplacement,WindowDisables,scanlines
EXTSYM Get_MouseData,Get_MousePositionDisplacement,scanlines
EXTSYM romispal,MusicRelVol,MusicVol,WDSPReg0C,WDSPReg1C,Op02AAS,Op02AZS,Op02CX
EXTSYM Op02CY,Op02FX,Op02FY,Op02FZ,Op02LES,Op02LFE,Op02VOF,Op02VVA,KeySlowDown
EXTSYM genfulladdtab,KeyFRateDown,KeyFRateUp,KeyVolUp,KeyVolDown,KeyDisplayFPS
@@ -250,10 +250,6 @@ NEWSYM cachevideo
mov dword[scaddtngbx],0FFFFFFFFh
mov byte[hiresstuff],0
mov byte[Mode7HiRes],0
cmp dword[WindowDisables],0
je .nowindis
dec dword[WindowDisables]
.nowindis
call ClockCounter

6
zsnes/src/video/makevid.asm
View File

@@ -29,7 +29,7 @@ EXTSYM colormodeofs,drawline16b,forceblnk,newengine8b,preparesprpr,scaddset
EXTSYM spritetablea,sprleftpr,vidbright,ForceNewGfxOff,curypos,drawmode7
EXTSYM mode7set,mosaicon,mosaicsz,sprleftpr1,sprleftpr2,sprleftpr3,sprlefttot
EXTSYM sprprifix,drawmode7extbg,interlval,drawmode7extbg2,sprclprio,sprpriodata
EXTSYM sprsingle,cachetile2b,cachetile4b,cachetile8b,vram,CacheCheckSkip
EXTSYM sprsingle,cachetile2b,cachetile4b,cachetile8b,vram
EXTSYM cachetile2b16x16,cachetile4b16x16,cachetile8b16x16,osm2dis,xtravbuf
EXTSYM bg3ptr,bg3scrolx,bg3scroly,vidmemch4,ofsmcptr,ofsmady,ofsmadx,yposngom
EXTSYM flipyposngom,ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
@@ -2435,11 +2435,9 @@ NEWSYM proc8x8
shr eax,3
and eax,63
and ebx,07h
cmp byte[CacheCheckSkip],1
je .docache
cmp byte[edi+eax],0
jne .nocachereq
.docache
;.docache
; cmp byte[ccud],0
; jne .nocachereq
mov byte[edi+eax],1

6
zsnes/src/video/newgfx.asm
View File

@@ -43,7 +43,7 @@ EXTSYM winbg1enval,winbg2enval,winbg3enval,winbg4enval,winbgobjenval
EXTSYM winlogicaval,disableeffects,winenabs,scanlines,winl1,winbg1en,winobjen
EXTSYM winlogica,winenabm,bgallchange,bg1change,bg2change,bg3change,bg4change
EXTSYM hiresstuff,drawlineng16x84b,drawlineng16x82b,drawlinengom4b,WindowRedraw
EXTSYM WindowDisables,winlogicb,ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr
EXTSYM winlogicb,ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr
%include "video/vidmacro.mac"
%include "video/newgfx2.mac"
@@ -601,10 +601,6 @@ NEWSYM BuildWindow2
NEWSYM BuildWindow
cmp byte[WindowRedraw],1
je .ns2
cmp byte[WindowDisables],0
je .nodisable
ret
.nodisable
mov dword[valtemp],0EE00h
push edx
push ecx