From 6394bfec50a08fad10606620bb424badb9cd5542 Mon Sep 17 00:00:00 2001 From: jbo_85 <> Date: Mon, 1 May 2006 00:30:12 +0000 Subject: [PATCH] Fixed typo in uic.c. Removed hacks for Kamen Rider and Lamborghini - American Challenge. Removed useless code. --- zsnes/src/cpu/execute.asm | 8 ++------ zsnes/src/cpu/regs.inc | 8 +------- zsnes/src/cpu/regsw.inc | 5 +---- zsnes/src/init.asm | 7 ------- zsnes/src/initc.c | 19 ------------------- zsnes/src/uic.c | 4 ++-- zsnes/src/vcache.asm | 6 +----- zsnes/src/video/makevid.asm | 6 ++---- zsnes/src/video/newgfx.asm | 6 +----- 9 files changed, 10 insertions(+), 59 deletions(-) diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm index bbcb3915..6b9e1cd8 100644 --- a/zsnes/src/cpu/execute.asm +++ b/zsnes/src/cpu/execute.asm @@ -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 diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc index 438a7d5b..83337798 100644 --- a/zsnes/src/cpu/regs.inc +++ b/zsnes/src/cpu/regs.inc @@ -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 diff --git a/zsnes/src/cpu/regsw.inc b/zsnes/src/cpu/regsw.inc index d3a2ed40..b8a03627 100644 --- a/zsnes/src/cpu/regsw.inc +++ b/zsnes/src/cpu/regsw.inc @@ -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 diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm index 204eff15..2e0f1060 100644 --- a/zsnes/src/init.asm +++ b/zsnes/src/init.asm @@ -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 diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c index 140fd3a2..5559dd34 100755 --- a/zsnes/src/initc.c +++ b/zsnes/src/initc.c @@ -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)) { diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c index c3353a04..6f7c87b5 100644 --- a/zsnes/src/uic.c +++ b/zsnes/src/uic.c @@ -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 diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm index cba3a622..d9924dcf 100644 --- a/zsnes/src/vcache.asm +++ b/zsnes/src/vcache.asm @@ -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 diff --git a/zsnes/src/video/makevid.asm b/zsnes/src/video/makevid.asm index 74f50de3..643e7cf4 100644 --- a/zsnes/src/video/makevid.asm +++ b/zsnes/src/video/makevid.asm @@ -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 diff --git a/zsnes/src/video/newgfx.asm b/zsnes/src/video/newgfx.asm index 7dd804d6..c930de8c 100644 --- a/zsnes/src/video/newgfx.asm +++ b/zsnes/src/video/newgfx.asm @@ -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