More spaces removed. Removed some dead code and useless macros and variables.

2005-07-06 14:13:32 +00:00
parent 0e58ee7723
commit b0c151615b
16 changed files with 168 additions and 307 deletions
--- a/zsnes/src/chips/fxemu2.mac
+++ b/zsnes/src/chips/fxemu2.mac
@@ -43,11 +43,6 @@
    mov [SfxRomBuffer],eax
 %endmacro

-%macro UpdateR15 0
-    mov ebp,[SfxCPB]
-    add ebp,[SfxR15]
-%endmacro
-
 %macro CLRFLAGS 0
  ;and dword [SfxSFR],0FFFFh-0100h-0200h-1000h  ; Clear ALT1,ALT2 and B Flags
 ;  xor ch,ch
--- a/zsnes/src/cpu/dspproc.asm
+++ b/zsnes/src/cpu/dspproc.asm
@@ -614,7 +614,7 @@ NEWSYM AdjustFrequency
 %ifdef __MSDOS__
      ; code for supporting vibra cards (coded by Peter Santing)
      cmp byte [vibracard], 1
-      je  .vibrafix
+      je .vibrafix

      cmp byte [SBHDMA],0
      je .not16bit
@@ -1262,7 +1262,7 @@ NEWSYM InitSPC
      mov ecx,256
      mov eax,Invalidopcode
      mov ebp,0
-      .loop
+.loop
 %ifdef __MSDOS__
      mov [ds:opcjmptab+ebp],eax
 %else
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -20,12 +20,12 @@

 %include "macros.mac"

-EXTSYM KeyRewind,statesaver,timer2upd,Voice0Status,UpdateDPage,MessageOn
-EXTSYM MsgCount,Msgptr,StartGUI,cbitmode,debuggeron,romdata,initvideo,newgfx16b
-EXTSYM cvidmode,vidbufferofsa,disable65816sh,GUISaveVars,virqnodisable
+EXTSYM KeyRewind,statesaver,timer2upd,Voice0Status,UpdateDPage
+EXTSYM StartGUI,debuggeron,romdata,initvideo
+EXTSYM vidbufferofsa,disable65816sh,GUISaveVars,virqnodisable
 EXTSYM KeySaveState,KeyLoadState,KeyQuickExit,KeyQuickLoad,KeyQuickRst
 EXTSYM GUIDoReset,GUIReset,KeyOnStA,KeyOnStB,ProcessKeyOn,C4Enable,KeyQuickClock
-EXTSYM KeyQuickSaveSPC,TimerEnable,IRQHack,HIRQLoc,splitflags,joinflags
+EXTSYM KeyQuickSaveSPC,TimerEnable,IRQHack,splitflags,joinflags
 EXTSYM KeyQuickSnapShot,csounddisable,videotroub,ResetTripleBuf
 EXTSYM Output_Text,Check_Key,Get_Key,Change_Dir
 EXTSYM InitPreGame,Curtableaddr,curcyc,debugdisble,dmadata,guioff,memtabler8
@@ -241,10 +241,6 @@ VoiceStartMute:

 SECTION .data
 NEWSYM romloadskip, db 0
-NEWSYM abcdefg,     dd 0
-NEWSYM abcdefg1,    dd 0
-NEWSYM abcdefg2,    dd 0
-NEWSYM abcdefg3,    dd 0
 NEWSYM SSKeyPressed, dd 0
 NEWSYM SPCKeyPressed, dd 0
 NEWSYM NoSoundReinit, dd 0
@@ -265,25 +261,6 @@ NEWSYM start65816
    ret
 .notrouble

-    jmp .nonewgfxcheck
-    cmp byte[cbitmode],1
-    jne .nonewgfxcheck
-    cmp byte[newengen],1
-    jne .nonewgfxcheck
-    cmp byte[cvidmode],3
-    jne .nocorrectmode
-    cmp byte[newgfx16b],1
-    je .nonewgfxcheck
-    jmp .correctmode
-.nocorrectmode
-    mov dword[Msgptr],newgfxerror2
-    jmp .correctmode
-    mov dword[Msgptr],newgfxerror
-.correctmode
-    mov eax,[MsgCount]
-    mov [MessageOn],eax
-    mov byte[newengen],0
-.nonewgfxcheck
    mov edi,[vidbufferofsa]
    mov ecx,37518
    xor eax,eax
@@ -400,13 +377,6 @@ reexecuteb2:
    mov edi,[tableadb+ebx*4]
    and byte[curexecstate],0FDh
 .soundta
-    jmp .nomovie
-.movie
-    mov edi,[tableadc+ebx*4]
-    test byte[curexecstate],2
-    jnz .nomovie
-    mov edi,[tableadb+ebx*4]
-.nomovie

    mov ebp,[spcPCRam]

@@ -416,13 +386,7 @@ reexecuteb2:

    call splitflags

-;    cmp byte[MovieProcessing],0
-;    jne .movie2
    call execute
-    jmp .nomovie2
-.movie2
-    call cpuover.returntoloop
-.nomovie2

    call joinflags

@@ -597,8 +561,8 @@ NEWSYM initaddrl, dd 0                  ; initial address location
 NEWSYM NetSent, dd 0
 NEWSYM nextframe, dd 0                  ; tick count for timer
 NEWSYM curfps,    db 0                  ; frame/sec for current screen
-NEWSYM newgfxerror, db 'NEED MEMORY FOR GFX ENGINE',0
-NEWSYM newgfxerror2, db 'NEED 320x240 FOR NEW GFX 16B',0
+;NEWSYM newgfxerror, db 'NEED MEMORY FOR GFX ENGINE',0
+;NEWSYM newgfxerror2, db 'NEED 320x240 FOR NEW GFX 16B',0
 ;newgfxerror db 'NEW GFX IN 16BIT IS N/A',0
 NEWSYM HIRQCycNext,   dd 0
 NEWSYM HIRQNextExe,   db 0
@@ -1538,13 +1502,6 @@ NEWSYM cpuover
    jne .nointrset2w
    mov byte[intrset],2
 .nointrset2w
-    cmp byte[esi],0CBh
-    jne .nowai
-    jmp .nowai
-    test dl,04h
-    jz .nowai
-    or byte[INTEnab],80h
-.nowai
    xor ebx,ebx
    xor ecx,ecx
    mov bl,[esi]
@@ -1614,33 +1571,6 @@ NEWSYM cpuover
    jmp execloop.startagain

 .virq
-    test byte[INTEnab],10h
-    jz .skiphirq
-    cmp word[HIRQLoc],0
-    je .skiphirq
-    jmp .skiphirq
-    cmp word[HIRQLoc],339
-    jbe .hirqnotover
-    mov word[HIRQLoc],339
-.hirqnotover
-    ; first dh = HIRQLoc*DHAdd/340, second dh = DHAdd-first dh
-    push edx
-    mov ax,[HIRQLoc]
-    xor ecx,ecx
-    mov cl,[cycpl]
-    mul cx
-    mov cx,340
-    div cx
-    pop edx
-    mov dh,al
-    mov cl,[cycpl]
-    sub cl,al
-    xor cl,cl
-    mov [HIRQCycNext],cl
-    mov byte[HIRQNextExe],1
-;    jmp .hirq
-    jmp .returnfromhirq
-.skiphirq
    test byte[curexecstate],01h
    jnz .dis658162
    or byte[curexecstate],01h
--- a/zsnes/src/cpu/regsw.inc
+++ b/zsnes/src/cpu/regsw.inc
@@ -381,7 +381,7 @@ reg2102w:
 ; OAM address register
 reg2103w:
    cmp byte[oamlow],1
-    jne  .afteroamlow
+    jne .afteroamlow
    mov byte[oamlow],0
    mov bl,al
    and bl,01h
--- a/zsnes/src/cpu/spc700.asm
+++ b/zsnes/src/cpu/spc700.asm
@@ -531,17 +531,17 @@ NEWSYM RSPCRegFC

 %macro skipmacro 1
 .spcnextskip
-  	  test byte[timeron],1<<%1
-	  je .ret
-	  cmp byte[timincr0+%1],0
-	  je .ret
-	  ;cmp byte[SpeedHack],0
-	  ;je .ret
+      test byte[timeron],1<<%1
+      je .ret
+      cmp byte[timincr0+%1],0
+      je .ret
+      ;cmp byte[SpeedHack],0
+      ;je .ret
      inc byte[spcnumread+%1]
-	  cmp byte[spcnumread+%1],8h
+      cmp byte[spcnumread+%1],8h
      je near haltspc
-	  .ret
-      ret
+.ret
+    ret
 %endmacro

 ALIGN16
--- a/zsnes/src/dos/debug.asm
+++ b/zsnes/src/dos/debug.asm
@@ -2487,7 +2487,7 @@ SECTION .text
    xor edx,edx           ; clear high byte
    xor cx,cx             ; clear counter variable
    mov ebx,10
-  .loopa2
+.loopa2
    div ebx              ; get quotent and remainder
    push dx              ; store number to stack
    inc cl
@@ -2500,7 +2500,7 @@ SECTION .text
    sub ax,cx
    cmp ax,0
    je .loopb4
-  .loopb3
+.loopb3
    push ax
    mov al,[.charprin]
    mov ah,31
@@ -2508,8 +2508,8 @@ SECTION .text
    pop ax
    dec ax
    jnz .loopb3
-  .loopb4
-  .loopb2
+.loopb4
+.loopb2
    pop ax              ; get number back from stack
    add al,30h          ; adjust to ASCII value
    mov ah,31
--- a/zsnes/src/dos/sound.asm
+++ b/zsnes/src/dos/sound.asm
@@ -466,7 +466,7 @@ NEWSYM SBHandler16
    inc dword[sbhandexec]

    cmp byte [vibracard], 1
-    je  .donotcallcmdapos
+    je .donotcallcmdapos
    call GetCDMAPos
 .donotcallcmdapos

@@ -1257,7 +1257,7 @@ NEWSYM SB_quality_limiter
      ; before REALLY switching back to 8-bit sucky mono mode
      ; check that we're dealing with a ViBRA16X Creative Labs Card
      cmp byte[vibracard], 1
-      je  .nostereo8b
+      je .nostereo8b

      cmp dword[SoundQuality],2
      jbe .nostereo8b
--- a/zsnes/src/dos/vesa12.asm
+++ b/zsnes/src/dos/vesa12.asm
@@ -79,7 +79,7 @@ NEWSYM InitVesa12
        jnc .gotmem
        mov edx,.nomemmessage
        jmp VESA12EXITTODOS
-    .gotmem
+.gotmem
        mov fs,dx          ; FS now points to the DOS buffer


@@ -134,7 +134,7 @@ NEWSYM InitVesa12
 		 ; mode information into VESAmodelist		     ;
 		;-----------------------------------------------------;

-        .vesa12detected
+.vesa12detected
 	mov ax,[fs:12h]			; Get no. of 64k blocks
 	mov [noblocks],ax
 	mov ax, 2
@@ -173,12 +173,12 @@ NEWSYM InitVesa12
 		    ; mode for vesa2_x, vesa2_y and vesa2_depth	 ;
 		   ;----------------------------------------------;

-    .copiedmodes
+.copiedmodes

 	mov ebp,VESAmodelist
 	xor ecx,ecx

-    .loopcheckmodes
+.loopcheckmodes
 	mov cx, [ebp]
 	cmp cx, 0ffffh
 	jnz .notendoflist
@@ -186,7 +186,7 @@ NEWSYM InitVesa12
 	    mov edx,.endoflist
            jmp VESA12EXITTODOS

-    .notendoflist
+.notendoflist

        mov edi, RMREGS
        mov dword[RMREGS.eax],4f01h
@@ -314,11 +314,11 @@ NEWSYM InitVesa12
        cmp bh,ah
        jb .scheck1
        mov bh,ah
-      .scheck1
+.scheck1
        cmp bh,bl
        jb .scheck2
        mov bh,bl
-      .scheck2
+.scheck2
        mov byte[fs:19h],5

        mov al,16
@@ -331,11 +331,11 @@ NEWSYM InitVesa12
        cmp bh,ah
        jb .scheck1b
        mov bh,ah
-      .scheck1b
+.scheck1b
        cmp bh,bl
        jb .scheck2b
        mov bh,bl
-      .scheck2b
+.scheck2b
        mov [fs:21h],bh

        mov al,16
@@ -348,11 +348,11 @@ NEWSYM InitVesa12
        cmp bh,ah
        jb .scheck1c
        mov bh,ah
-      .scheck1c
+.scheck1c
        cmp bh,bl
        jb .scheck2c
        mov bh,bl
-      .scheck2c
+.scheck2c
        mov [fs:23h],bh

        mov word[vesa2_clbit],0
--- a/zsnes/src/dos/vesa2.asm
+++ b/zsnes/src/dos/vesa2.asm
@@ -241,7 +241,7 @@ NEWSYM InitVesa2
        cmp word[fs:004],300h
        jb .notvbe3
        mov dword[vesa3en],1
-        .notvbe3
+.notvbe3
 	mov ax,[fs:12h]			; Get no. of 64k blocks
 	mov [noblocks],ax
 	mov ax, 2
@@ -280,12 +280,12 @@ NEWSYM InitVesa2
 		    ; mode for vesa2_x, vesa2_y and vesa2_depth	 ;
 		   ;----------------------------------------------;

-    .copiedmodes
+.copiedmodes

 	mov ebp,VESAmodelist
 	xor ecx,ecx

-    .loopcheckmodes
+.loopcheckmodes
 	mov cx, [ebp]
 	cmp cx, 0ffffh
 	jnz .notendoflist
@@ -293,7 +293,7 @@ NEWSYM InitVesa2
 	    mov edx,.endoflist
            jmp VESA2EXITTODOS

-    .notendoflist
+.notendoflist

        mov edi, RMREGS
        mov dword[RMREGS.eax],4f01h
@@ -411,11 +411,11 @@ NEWSYM InitVesa2
        cmp bh,ah
        jb .scheck1
        mov bh,ah
-      .scheck1
+.scheck1
        cmp bh,bl
        jb .scheck2
        mov bh,bl
-      .scheck2
+.scheck2
        mov byte[fs:19h],5

        mov al,16
@@ -428,11 +428,11 @@ NEWSYM InitVesa2
        cmp bh,ah
        jb .scheck1b
        mov bh,ah
-      .scheck1b
+.scheck1b
        cmp bh,bl
        jb .scheck2b
        mov bh,bl
-      .scheck2b
+.scheck2b
        mov [fs:21h],bh

        mov al,16
@@ -445,11 +445,11 @@ NEWSYM InitVesa2
        cmp bh,ah
        jb .scheck1c
        mov bh,ah
-      .scheck1c
+.scheck1c
        cmp bh,bl
        jb .scheck2c
        mov bh,bl
-      .scheck2c
+.scheck2c
        mov [fs:23h],bh

        mov word[vesa2_clbit],0
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -78,7 +78,7 @@ EXTSYM statesaver,loadstate2,vidbuffer,ASCII2Font,hirestiledat,showallext
 EXTSYM scanlines,statefileloc,pl1selk,pl2selk,fnamest,sprlefttot,spritetablea
 EXTSYM fnames,CHIPBATT,sfxramdata,setaramdata,SETAEnable,cgram,srama,tempco0
 EXTSYM prevbright,maxbr,prevpal,coladdr,coladdg,coladdb,scaddtype,ScreenScale
-EXTSYM vesa2red10,initvideo2,initvideo,pressed,UpdateDevices,memtabler8
+EXTSYM initvideo2,initvideo,pressed,UpdateDevices,memtabler8
 EXTSYM memtablew8,writeon,pl1contrl,pl2contrl,JoyRead,SetInputDevice,delay
 EXTSYM SetInputDevice209,FPSOn,RevStereo,WDSPReg0C,WDSPReg1C,pl12s34,resolutn
 EXTSYM InitDrive,InitDir,createnewcfg,Makemode7Table,vidbufferofsb,ZipSupport
@@ -2626,32 +2626,32 @@ DisplayMenu:
    GUIBox 0,14,229,14,70
    GUIBox 0,15,229,15,71

-    %ifdef __LINUX__
+%ifdef __LINUX__
    GUIShadow 238,9,247,20
    GUIShadow 249,9,257,20
-    %endif
-    %ifdef __WIN32__
+%endif
+%ifdef __WIN32__
    GUIShadow 238,9,247,14
    GUIShadow 238,16,247,20
    GUIShadow 249,9,257,20
-    %endif
+%endif
 .notwinpressa

-    %ifdef __LINUX__
+%ifdef __LINUX__
    mov byte[GUIMenuItem+36],247
    GUIDMHelpB 233,242,GUIMenuItem+36,1
    mov byte[GUIMenuItem+36],'x'
    GUIDMHelpB 244,253,GUIMenuItem+36,2
-    %endif
+%endif

-    %ifdef __WIN32__
+%ifdef __WIN32__
    mov byte[GUIMenuItem+36],249
    GUIDMHelpB2 233,242,GUIMenuItem+36,1
    mov byte[GUIMenuItem+36],248
    GUIDMHelpB3 233,242,GUIMenuItem+36,3
    mov byte[GUIMenuItem+36],'x'
    GUIDMHelpB 244,253,GUIMenuItem+36,2
-    %endif
+%endif
 .notwinpressb

    ; Display upper-left box
@@ -3576,23 +3576,6 @@ GUISetPal16:
    GUIPal16b 237,60,20,25
    GUIPal16b 238,42,20,25

-    cmp byte[vesa2red10],1
-    jne .nored10
-    jmp .nored10
-    mov esi,GUICPC
-    mov ecx,256
-.next2
-    mov ax,[esi]
-    mov bx,ax
-    and bx,0000000000011111b
-    and ax,1111111111000000b
-    shr ax,1
-    or ax,bx
-    mov [esi],ax
-    add esi,2
-    dec ecx
-    jnz .next2
-.nored10
    cmp byte[GUIPalConv],0
    je .convert
    ret
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -629,7 +629,7 @@ GUIgetcurrentinput:
    cmp al,92
    je .leftpressed
    cmp dword[numlockptr],1
-    je  .noleft
+    je .noleft
    cmp al,75
    jne .noleft
 .leftpressed
@@ -647,9 +647,9 @@ GUIgetcurrentinput:
 .noleft
 %ifdef __LINUX__
    cmp al,94
-    je  .rightpressed
+    je .rightpressed
    cmp dword[numlockptr],1
-    je  .noright
+    je .noright
    cmp al,77
    jne .noright
 .rightpressed
@@ -667,9 +667,9 @@ GUIgetcurrentinput:
    je near .noupdown
 %ifdef __LINUX__
    cmp al,96
-    je  .downpressed
+    je .downpressed
    cmp dword[numlockptr],1
-    je  .nodown
+    je .nodown
    cmp al,80
    jne .nodown
 .downpressed
@@ -693,9 +693,9 @@ GUIgetcurrentinput:
 .nodown
 %ifdef __LINUX__
    cmp al, 90
-    je  .uppressed
+    je .uppressed
    cmp dword[numlockptr],1
-    je  .noup
+    je .noup
    cmp al,72
    jne .noup
 .uppressed
@@ -1145,8 +1145,8 @@ GUIVideoKeys:
 ;    mov byte[vsyncon],0
 ;    mov byte[cfgvsync],0
    call initDirectDraw
- .notriplebufferwin
- %endif
+.notriplebufferwin
+%endif
 %ifdef __MSDOS__
    cmp dh,'T'
    jne .notriplebuffer
@@ -1180,9 +1180,9 @@ GUIVideoKeys:
 ;   "Home"
 %ifdef __LINUX__
    cmp dl,89
-    je  .yeshome
+    je .yeshome
    cmp dword[numlockptr],1
-    je  .nohome
+    je .nohome
    cmp dl,71
    jne .nohome
 .yeshome
@@ -1196,9 +1196,9 @@ GUIVideoKeys:
 ;   "End"
 %ifdef __LINUX__
    cmp dl,95
-    je  .yesendp
+    je .yesendp
    cmp dword[numlockptr],1
-    je  .noendp
+    je .noendp
    cmp dl,79
    jne .noendp
 .yesendp
@@ -1218,9 +1218,9 @@ GUIVideoKeys:
 ;   "Up"
 %ifdef __LINUX__
    cmp dl,90
-    je  .up
+    je .up
    cmp dword[numlockptr],1
-    je  .noup
+    je .noup
    cmp dl,72
    jne .noup
 %else
@@ -1240,9 +1240,9 @@ GUIVideoKeys:
 ;   "Down"
 %ifdef __LINUX__
    cmp dl,96
-    je  .yesdown
+    je .yesdown
    cmp dword[numlockptr],1
-    je  .nodown
+    je .nodown
    cmp dl,80
    jne .nodown
 .yesdown
@@ -1263,9 +1263,9 @@ GUIVideoKeys:
 ;   "PageUp"
 %ifdef __LINUX__
    cmp dl,91
-    je  .yespageup
+    je .yespageup
    cmp dword[numlockptr],1
-    je  .nopageup
+    je .nopageup
    cmp dl,73
    jne .nopageup
 .yespageup
@@ -1287,9 +1287,9 @@ GUIVideoKeys:
 ;   "PageDown"
 %ifdef __LINUX__
    cmp dl,97
-    je  .yespagedn
+    je .yespagedn
    cmp dword[numlockptr],1
-    je  .nopagedown
+    je .nopagedown
    cmp dl,81
    jne .nopagedown
 .yespagedn
@@ -1625,9 +1625,9 @@ GUICheatKeys:
 .nozero
 %ifdef __LINUX__
    cmp al,89
-    je  .homepressed
+    je .homepressed
    cmp dword[numlockptr],1
-    je  .nohome
+    je .nohome
    cmp al,71
    jne .nohome
 .homepressed
@@ -1641,9 +1641,9 @@ GUICheatKeys:
 .nohome
 %ifdef __LINUX__
    cmp al,89
-    je  .endppressed
+    je .endppressed
    cmp dword[numlockptr],1
-    je  .noendp
+    je .noendp
    cmp al,79
    jne .noendp
 .endppressed
@@ -1664,9 +1664,9 @@ GUICheatKeys:
 .noendp
 %ifdef __LINUX__
    cmp al,90
-    je  .up
+    je .up
    cmp dword[numlockptr],1
-    je  .noup
+    je .noup
    cmp al,72
    jne .noup
 %else
@@ -1685,9 +1685,9 @@ GUICheatKeys:
 .noup
 %ifdef __LINUX__
    cmp al, 96
-    je  .downpressed
+    je .downpressed
    cmp dword[numlockptr],1
-    je  .nodown
+    je .nodown
    cmp al,80
    jne .nodown
 .downpressed
@@ -1708,9 +1708,9 @@ GUICheatKeys:
 .nodown
 %ifdef __LINUX__
    cmp al,91
-    je  .pageuppressed
+    je .pageuppressed
    cmp dword[numlockptr],1
-    je  .nopageup
+    je .nopageup
    cmp al,73
    jne .nopageup
 .pageuppressed
@@ -1731,9 +1731,9 @@ GUICheatKeys:
 .nopageup
 %ifdef __LINUX__
    cmp al, 97
-    je  .pagednpressed
+    je .pagednpressed
    cmp dword[numlockptr],1
-    je  .nopagedown
+    je .nopagedown
    cmp al,81
    jne .nopagedown
 .pagednpressed
@@ -2084,9 +2084,9 @@ GUICheatSearchKeys:

 %ifdef __LINUX__          ; Select with Arrow Keys
    cmp al,90
-    je  .yesmoveup
+    je .yesmoveup
    cmp dword[numlockptr],1
-    je  .nomoveup
+    je .nomoveup
    cmp al,72
    jne .nomoveup
 .yesmoveup
@@ -2100,9 +2100,9 @@ GUICheatSearchKeys:
 .nomoveup
 %ifdef __LINUX__
    cmp al,96
-    je  .yesmovedown
+    je .yesmovedown
    cmp dword[numlockptr],1
-    je  .nomovedown
+    je .nomovedown
    cmp al,80
    jne .nomovedown
 .yesmovedown
@@ -2151,9 +2151,9 @@ GUICheatSearchKeys:
 .nozero                   ; Select Codes with arrow keys
 %ifdef __LINUX__
    cmp al,89
-    je  .yeshome
+    je .yeshome
    cmp dword[numlockptr],1
-    je  .nohome
+    je .nohome
    cmp al,71
    jne .nohome
 .yeshome
@@ -2167,9 +2167,9 @@ GUICheatSearchKeys:
 .nohome
 %ifdef __LINUX__
    cmp al,95
-    je  .yesendp
+    je .yesendp
    cmp dword[numlockptr],1
-    je  .noendp
+    je .noendp
    cmp al,79
    jne .noendp
 .yesendp
@@ -2190,9 +2190,9 @@ GUICheatSearchKeys:
 .noendp
 %ifdef __LINUX__
    cmp al,90
-    je  .up
+    je .up
    cmp dword[numlockptr],1
-    je  .noup
+    je .noup
    cmp al,72
    jne .noup
 %else
@@ -2211,9 +2211,9 @@ GUICheatSearchKeys:
 .noup
 %ifdef __LINUX__
    cmp al,96
-    je  .yesdown
+    je .yesdown
    cmp dword[numlockptr],1
-    je  .nodown
+    je .nodown
    cmp al,80
    jne .nodown
 .yesdown
@@ -2235,9 +2235,9 @@ GUICheatSearchKeys:

 %ifdef __LINUX__            ; Pageup/Down to select Cheats
    cmp al,91
-    je  .yespgup
+    je .yespgup
    cmp dword[numlockptr],1
-    je  .nopageup
+    je .nopageup
    cmp al,73
    jne .nopageup
 .yespgup
@@ -2258,9 +2258,9 @@ GUICheatSearchKeys:
 .nopageup
 %ifdef __LINUX__
    cmp al,97
-    je  .yespgdn
+    je .yespgdn
    cmp dword[numlockptr],1
-    je  .nopagedown
+    je .nopagedown
    cmp al,81
    jne .nopagedown
 .yespgdn
@@ -2363,9 +2363,9 @@ GUIStateSelKeys:
 .noenter
 %ifdef __LINUX__
    cmp al,92               ; linux keypad left
-    je  .yesleft
+    je .yesleft
    cmp dword[numlockptr],1 ; if numlock on, disregard numpad
-    je  .noleft
+    je .noleft
 %endif
    cmp al,75               ; linux numpad left, non-linux num/keypad left
    jne .noleft
@@ -2392,9 +2392,9 @@ GUIStateSelKeys:
 .noleft
 %ifdef __LINUX__
    cmp al,94               ; linux keypad right
-    je  .yesright
+    je .yesright
    cmp dword[numlockptr],1 ; if numlock on, disregard numpad
-    je  .noright
+    je .noright
 %endif
    cmp al,77               ; linux numpad right, non-linux num/keypad right
    jne .noright
@@ -2421,18 +2421,18 @@ GUIStateSelKeys:
 .noright
 %ifdef __LINUX__
    cmp al,90               ; linux keypad up
-    je  .yesvert
+    je .yesvert
    cmp dword[numlockptr],1 ; if numlock on, disregard numpad
-    je  .noup
+    je .noup
 %endif
    cmp al,72               ; linux numpad up, non-linux num/keypad up
-    je  .yesvert
+    je .yesvert
 .noup
 %ifdef __LINUX__
    cmp al,96               ; linux keypad down
-    je  .yesvert
+    je .yesvert
    cmp dword[numlockptr],1 ; if numlock on, disregard numpad
-    je  .novert
+    je .novert
 %endif
    cmp al,80               ; linux numpad down, non-linux num/keypad down
    jne .novert
@@ -2464,9 +2464,9 @@ GUIStateSelKeys:
 GUIResetKeys:
 %ifdef __LINUX__
    cmp al,92
-    je  .yesleft
+    je .yesleft
    cmp dword[numlockptr],1
-    je  .noleft
+    je .noleft
    cmp al,75
    jne .noleft
 .yesleft
@@ -2478,9 +2478,9 @@ GUIResetKeys:
 .noleft
 %ifdef __LINUX__
    cmp al,94
-    je  .yesright
+    je .yesright
    cmp dword[numlockptr],1
-    je  .noright
+    je .noright
    cmp al,77
    jne .noright
 .yesright
@@ -2524,9 +2524,9 @@ GUIResetKeys:
 GUIStateKeys:
 %ifdef __LINUX__
    cmp al,92
-    je  .yesleft
+    je .yesleft
    cmp dword[numlockptr],1
-    je  .noleft
+    je .noleft
    cmp al,75
    jne .noleft
 .yesleft
@@ -2538,9 +2538,9 @@ GUIStateKeys:
 .noleft
 %ifdef __LINUX__
    cmp al,94
-    je  .yesright
+    je .yesright
    cmp dword[numlockptr],1
-    je  .noright
+    je .noright
    cmp al,77
    jne .noright
 .yesright
@@ -2589,9 +2589,9 @@ GUILoadKeys:
    je .noright
 %ifdef __LINUX__
    cmp al,92
-    je  .yesleft
+    je .yesleft
    cmp dword[numlockptr],1
-    je  .noleft
+    je .noleft
    cmp al,75
    jne .noleft
 .yesleft
@@ -2604,9 +2604,9 @@ GUILoadKeys:
 .noleft
 %ifdef __LINUX__
    cmp al,94
-    je  .yesright
+    je .yesright
    cmp dword[numlockptr],1
-    je  .noright
+    je .noright
    cmp al,77
    jne .noright
 .yesright
@@ -2657,9 +2657,9 @@ GUILoadKeys:
    je near .dirwin
 %ifdef __LINUX__
    cmp al,89
-    je  .yeshome
+    je .yeshome
    cmp dword[numlockptr],1
-    je  .nohome
+    je .nohome
    cmp al,71
    jne .nohome
 .yeshome
@@ -2674,9 +2674,9 @@ GUILoadKeys:
 .nohome
 %ifdef __LINUX__
    cmp al,95
-    je  .yesendp
+    je .yesendp
    cmp dword[numlockptr],1
-    je  .noendp
+    je .noendp
    cmp al,79
    jne .noendp
 .yesendp
@@ -2698,9 +2698,9 @@ GUILoadKeys:
 .noendp
 %ifdef __LINUX__
    cmp al,90
-    je  .up
+    je .up
    cmp dword[numlockptr],1
-    je  .noup
+    je .noup
    cmp al,72
    jne .noup
 %else
@@ -2720,9 +2720,9 @@ GUILoadKeys:
 .noup
 %ifdef __LINUX__
    cmp al,96
-    je  .yesdown
+    je .yesdown
    cmp dword[numlockptr],1
-    je  .nodown
+    je .nodown
    cmp al,80
    jne .nodown
 .yesdown
@@ -2744,9 +2744,9 @@ GUILoadKeys:
 .nodown
 %ifdef __LINUX__
    cmp al,91
-    je  .yespageup
+    je .yespageup
    cmp dword[numlockptr],1
-    je  .nopageup
+    je .nopageup
    cmp al,73
    jne .nopageup
 .yespageup
@@ -2768,9 +2768,9 @@ GUILoadKeys:
 .nopageup
 %ifdef __LINUX__
    cmp al,97
-    je  .yespagedn
+    je .yespagedn
    cmp dword[numlockptr],1
-    je  .nopagedown
+    je .nopagedown
    cmp al,81
    jne .nopagedown
 .yespagedn
@@ -2955,9 +2955,9 @@ SECTION .text
 .dirwin
 %ifdef __LINUX__
    cmp al,89
-    je  .yeshome2
+    je .yeshome2
    cmp dword[numlockptr],1
-    je  .nohome2
+    je .nohome2
    cmp al,71
    jne .nohome2
 .yeshome2
@@ -2972,9 +2972,9 @@ SECTION .text
 .nohome2
 %ifdef __LINUX__
    cmp al,95
-    je  .yesendp2
+    je .yesendp2
    cmp dword[numlockptr],1
-    je  .noendp2
+    je .noendp2
    cmp al,79
    jne .noendp2
 .yesendp2
@@ -2996,9 +2996,9 @@ SECTION .text
 .noendp2
 %ifdef __LINUX__
    cmp al,90
-    je  .yesup2
+    je .yesup2
    cmp dword[numlockptr],1
-    je  .noup2
+    je .noup2
    cmp al,72
    jne .noup2
 .yesup2
@@ -3018,9 +3018,9 @@ SECTION .text
 .noup2
 %ifdef __LINUX__
    cmp al,96
-    je  .yesdown2
+    je .yesdown2
    cmp dword[numlockptr],1
-    je  .nodown2
+    je .nodown2
    cmp al,80
    jne .nodown2
 .yesdown2
@@ -3042,9 +3042,9 @@ SECTION .text
 .nodown2
 %ifdef __LINUX__
    cmp al,91
-    je  .yespgup2
+    je .yespgup2
    cmp dword[numlockptr],1
-    je  .nopageup2
+    je .nopageup2
    cmp al,73
    jne .nopageup2
 .yespgup2
@@ -3066,9 +3066,9 @@ SECTION .text
 .nopageup2
 %ifdef __LINUX__
    cmp al,97
-    je  .yespgdn2
+    je .yespgdn2
    cmp dword[numlockptr],1
-    je  .nopagedown2
+    je .nopagedown2
    cmp al,81
    jne .nopagedown2
 .yespgdn2
--- a/zsnes/src/gui/guiload.inc
+++ b/zsnes/src/gui/guiload.inc
@@ -483,9 +483,9 @@ GetNormalEntries2:
    GUIGetEntry2 GUIfigfind
    GUIGetEntry2 GUImgdfind
    GUIGetEntry2 GUIufofind
-    %ifndef __MSDOS__
+%ifndef __MSDOS__
    GUIGetEntry2 GUIfindGZIP
-    %endif
+%endif
    GUIGetEntry2 GUIfind058
    GUIGetEntry2 GUIfind078
    GUIGetEntry2 GUIfindUSA
@@ -511,9 +511,9 @@ GetNormalEntries:
    GUIGetEntry GUImgdfind
    GUIGetEntry GUIufofind
    GUIGetEntry GUIgd3find
-    %ifndef __MSDOS__
+%ifndef __MSDOS__
    GUIGetEntry GUIfindGZIP
-    %endif
+%endif
    GUIGetEntry GUIfind058
    GUIGetEntry GUIfind078
    GUIGetEntry GUIfindUSA
@@ -675,9 +675,9 @@ GetLoadLfn:
    GUIGetEntryLFN GUIfigfind
    GUIGetEntryLFN GUImgdfind
    GUIGetEntryLFN GUIufofind
-    %ifndef __MSDOS__
+%ifndef __MSDOS__
    GUIGetEntryLFN GUIfindGZIP
-    %endif
+%endif
    GUIGetEntryLFN GUIfind058
    GUIGetEntryLFN GUIfind078
    GUIGetEntryLFN GUIfindUSA
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -225,9 +225,9 @@ ProcessMouseButtons:
    jb near .noclickedw
    cmp word[GUImouseposx],242
    ja .notfound7
-    %ifdef __LINUX__
+%ifdef __LINUX__
    jmp .clickawn
-    %endif
+%endif
    cmp word[GUImouseposy],8
    jb .clickawn
    cmp word[GUImouseposy],8
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -2566,7 +2566,7 @@ Cheatmodeadd:                                 ; Add Window
    shr dword[curvaluecs],8
    inc dword[curaddrvalcs]
    jmp .cspardispagain
-    .cspardisploop                               ; Max Value Display?
+.cspardisploop                               ; Max Value Display?
    push ecx
    mov esi,GUICSrcTextG1
    mov ecx,3
@@ -3055,7 +3055,7 @@ DisplayGUIAbout:          ; Displays the About Box
    DrawGUIButton 11,90,30,175,40,GUIGUIAboutTextE,65,0,0
    ret

-    .eegg                                ;Playground
+.eegg                                ;Playground
    GUIDisplayText 11,42,36,GUIGUIAboutTextF
    GUIDisplayText 11,30,96,GUIGUIAboutTextFa
    GUIDisplayText 11,39,106,GUIGUIAboutTextFb
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -22,7 +22,7 @@

 %include "macros.mac"

-EXTSYM PrintStr,WaitForKey,PrintChar,ram7fa,wramdataa,malloc,free,MMXSupport
+EXTSYM PrintStr,WaitForKey,PrintChar,ram7fa,wramdataa,malloc,MMXSupport
 EXTSYM MMXextSupport,statefileloc,LatestSave,firstsaveinc,Open_File
 EXTSYM Get_File_Date,Close_File,Change_Dir,Get_Dir,romloadskip,cfgloadgdir
 EXTSYM cfgloadsdir,init18_2hz,OSExit,SRAMDirCurDir,SRAMChdir,SRAMChdirFail
@@ -528,14 +528,14 @@ NEWSYM printnum
    xor edx,edx           ; clear high byte
    xor cx,cx             ; clear counter variable
    mov ebx,10
-  .loopa
+.loopa
    div ebx              ; get quotent and remainder
    push edx              ; store number to stack
    inc cl
    xor edx,edx
    test eax,0FFFFFFFFh
    jnz .loopa
-  .loopb
+.loopb
    pop edx              ; get number back from stack
    add dl,30h          ; adjust to ASCII value
    call PrintChar
@@ -556,14 +556,14 @@ NEWSYM convertnum
    xor edx,edx           ; clear high byte
    xor cx,cx             ; clear counter variable
    mov ebx,10
-  .loopa
+.loopa
    div ebx              ; get quotent and remainder
    push edx              ; store number to stack
    inc cl
    xor edx,edx
    test eax,0FFFFFFFFh
    jnz .loopa
-  .loopb
+.loopb
    pop edx              ; get number back from stack
    add dl,30h          ; adjust to ASCII value
    mov [esi],dl
@@ -754,7 +754,7 @@ DetermineNewest:
 ;*******************************************************

 NEWSYM tparms
-  .donestring
+.donestring
    test byte[.numparam],0FFh
    jz .nochars
    mov al,byte[filefound]
@@ -762,7 +762,7 @@ NEWSYM tparms
    jz .nostring
    ret

-  .nostring
+.nostring
    cmp byte[guioff],0
    je .yesgui

@@ -770,7 +770,7 @@ NEWSYM tparms
    call PrintStr
    jmp DosExit

-  .nochars
+.nochars
    cmp byte[guioff],0
    je .yesgui
    cmp byte[fname],0
@@ -885,20 +885,6 @@ NEWSYM DosExit ; Terminate Program
 %elifdef __LINUX__
 	call LinuxExit
 %elifdef __MSDOS__
-	jmp .nodeallocate
-	mov ebx,memfreearray
-	.nextdeallocate
-	mov eax,[ebx]
-	or eax,eax
-	jz .nodeallocate
-	push ebx
-	push eax
-	call free
-	pop eax
-	pop ebx
-	add ebx,4
-	jmp .nextdeallocate
-.nodeallocate
 	call init18_2hz
 	mov    ax,4c00h            ;terminate
 	int    21h
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -26,8 +26,8 @@ EXTSYM MessageOn,MsgCount,Msgptr,Voice0Disable,Voice0Status,Voice1Disable
 EXTSYM Voice1Status,Voice2Disable,Voice2Status,Voice3Disable,Voice3Status
 EXTSYM Voice4Disable,Voice4Status,Voice5Disable,Voice5Status,Voice6Disable
 EXTSYM Voice6Status,Voice7Disable,Voice7Status,bgcmsung,bgmode,cbackofsaddr
-EXTSYM cbitmode,cgmod,debuggeron,disableeffects,frameskip,frskipper,newgfxerror2
-EXTSYM maxbr,modeused,mousexloc,mouseyloc,newengen,newgfx16b,newgfxerror
+EXTSYM cgmod,debuggeron,disableeffects,frameskip,frskipper
+EXTSYM maxbr,modeused,mousexloc,mouseyloc,newengen
 EXTSYM nextdrawallng,oamaddr,pal16b,pal16bxcl,pressed,prevbright,prevpal
 EXTSYM scaddsngb,scaddtngb,scaddtngbx,scfbl,scrndis,snesmouse,sprprdrn,t1cc
 EXTSYM vidbright,vidbuffer,vidbufferm,vidbufferofsa,vidbufferofsb,vidmemch2
@@ -570,23 +570,6 @@ NEWSYM cachevideo
    test byte[pressed+eax],1
    je near .nodis8
    mov byte[pressed+eax],2
-    cmp byte[cbitmode],1
-    jne .no16bng
-    cmp byte[newgfx16b],1
-    je .no16bng
-    jmp .no16bng
-    mov dword[Msgptr],newgfxerror
-.msgstuff
-    mov eax,[MsgCount]
-    mov [MessageOn],eax
-    cmp byte[newengen],0
-    je near .nodis8
-    mov byte[newengen],0
-    jmp .disng
-.nores
-    mov dword[Msgptr],newgfxerror2
-    jmp .msgstuff
-.no16bng
    mov byte[prevbright],16
    xor byte[newengen],1
    mov dword[Msgptr],ngena
@@ -891,22 +874,6 @@ NEWSYM docache

 .nosprites
    ; fill background with 0's unless 16-bit/new graphics engine mode is on
-    jmp .skipbgclear
-    cmp byte[cbitmode],1
-    je .skipbgclear
-    cmp byte[newengen],1
-    jne .skipbgclear
-    mov edi,[vidbuffer]
-    xor eax,eax
-    add edi,16
-    mov dl,[resolutn]
-.loopa
-    mov ecx,64
-    rep stosd
-    add edi,32
-    dec dl
-    jnz .loopa
-.skipbgclear
    xor ecx,ecx
    pop es
 NEWSYM yesblank