diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm index d0f7b225..b899053f 100644 --- a/zsnes/src/cfgload.asm +++ b/zsnes/src/cfgload.asm @@ -34,13 +34,6 @@ EXTSYM Create_File,Write_File,Close_File EXTSYM TextFile, InitDir, InitDrive, Change_Dir %endif -NEWSYM CfgLoadAsmStart - - - -; [BITS 32] -; [ORG 0] - ; .CFG variables SECTION .data NEWSYM cfgsoundon, db 0 @@ -1955,7 +1948,3 @@ section .data .str3 dd 10 db 'REINITTIME' .usespace db 0 - -SECTION .text - -NEWSYM CfgLoadAsmEnd diff --git a/zsnes/src/chips/dsp2proc.asm b/zsnes/src/chips/dsp2proc.asm index 23d5b1c9..0fd1b857 100644 --- a/zsnes/src/chips/dsp2proc.asm +++ b/zsnes/src/chips/dsp2proc.asm @@ -29,10 +29,6 @@ EXTSYM regaccessbankr8,regaccessbankr16,regaccessbankw8,regaccessbankw16 -NEWSYM Dsp2ProcAsmStart - -;%define _USE_DEVDSP2 - DSP2F_HALT equ 1 DSP2F_AUTO_BUFFER_SHIFT equ 2 DSP2F_NO_ADDR_CHK equ 4 @@ -610,5 +606,3 @@ NEWSYM DSP2Write16b xor eax,eax .leave ret - -NEWSYM Dsp2ProcAsmEnd diff --git a/zsnes/src/chips/fxemu2b.asm b/zsnes/src/chips/fxemu2b.asm index 9460ef2f..d0dc9086 100644 --- a/zsnes/src/chips/fxemu2b.asm +++ b/zsnes/src/chips/fxemu2b.asm @@ -20,8 +20,6 @@ EXTSYM FxTable,FxTableb,FxTablec,SfxB,SfxCPB,SfxCROM,SfxCarry,SfxOverflow EXTSYM SfxR0,SfxR14,SfxR15,SfxRomBuffer,SfxSignZero,withr15sk -NEWSYM FxEmu2BAsmStart - %include "chips/fxemu2.mac" %include "chips/fxemu2b.mac" @@ -613,5 +611,3 @@ NEWSYM FxOpcBF ; FROM rn set source register mov byte[SfxOverflow],al CLRFLAGS ret - -NEWSYM FxEmu2BAsmEnd diff --git a/zsnes/src/chips/fxemu2c.asm b/zsnes/src/chips/fxemu2c.asm index 5efd95d0..e22f4f17 100644 --- a/zsnes/src/chips/fxemu2c.asm +++ b/zsnes/src/chips/fxemu2c.asm @@ -30,8 +30,6 @@ EXTSYM fxbit01,fxbit23,fxbit45,fxbit67 EXTSYM fxxand EXTSYM PLOTJmpa,PLOTJmpb -NEWSYM FxEmu2CAsmStart - %include "chips/fxemu2.mac" %include "chips/fxemu2b.mac" %include "chips/fxemu2c.mac" @@ -2553,5 +2551,3 @@ NEWSYM FxOpdFFA2 ; SM (XX),RN store word in RAM mov [eax+ebx],dh CLRFLAGS FXReturn - -NEWSYM FxEmu2CAsmEnd diff --git a/zsnes/src/chips/sfxproc.asm b/zsnes/src/chips/sfxproc.asm index fed9f4fb..d2cbda25 100644 --- a/zsnes/src/chips/sfxproc.asm +++ b/zsnes/src/chips/sfxproc.asm @@ -25,16 +25,9 @@ EXTSYM SfxSignZero,SfxnRamBanks,StartSFX,regptr,regptw,sfxramdata,ChangeOps EXTSYM SfxPOR,sfxclineloc,UpdatePORSCMR,UpdateCLSR,UpdateSCBRCOLR,SfxAC EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,SFXProc -NEWSYM SfxProcAsmStart - %include "cpu/regs.mac" %include "cpu/regsw.mac" - - - - - %macro AssembleSFXFlags 0 and word[SfxSFR],8F60h test byte[SfxCarry],1 @@ -672,5 +665,3 @@ NEWSYM sfxaccessbankw16d mov [ebx+ecx+65536*3],ax xor ebx,ebx ret - -NEWSYM SfxProcAsmEnd diff --git a/zsnes/src/cpu/irq.asm b/zsnes/src/cpu/irq.asm index 4a35c68e..0f9fb408 100644 --- a/zsnes/src/cpu/irq.asm +++ b/zsnes/src/cpu/irq.asm @@ -27,12 +27,6 @@ EXTSYM execloopdeb EXTSYM nmiv8 EXTSYM membank0r8,membank0w8 -NEWSYM IrqAsmStart - - - - - ; NMI Hardware 00FFFA,B 00FFEA,B 3 -> 000108 ; RES Hardware 00FFFC.D 00FFFC,D 1 ; BRK Software 00FFFE,F 00FFE6,7 N/A @@ -556,4 +550,3 @@ NEWSYM NMIemulmodedeb add esi,eax jmp execloopdeb -NEWSYM IrqAsmEnd diff --git a/zsnes/src/cpu/stable.asm b/zsnes/src/cpu/stable.asm index bcc66de0..bac9389c 100644 --- a/zsnes/src/cpu/stable.asm +++ b/zsnes/src/cpu/stable.asm @@ -21,18 +21,11 @@ EXTSYM SA1tableA,SA1tableB,SA1tableC,SA1tableD,SA1tableE EXTSYM SA1tableF,SA1tableG,SA1tableH,SA1tablead EXTSYM cpucycle, SA1UpdateDPage, intrset -NEWSYM StableAsmStart %include "cpu/s65816d.inc" %include "cpu/saddress.inc" %include "cpu/saddrni.inc" %include "cpu/se65816.inc" - - - - - - ; global variables ;tableA times 256 ; Table addresses (M:0,X:0,D:0) ;tableB times 256 ; Table addresses (M:1,X:0,D:0) diff --git a/zsnes/src/cpu/table.asm b/zsnes/src/cpu/table.asm index 302af36b..5b628587 100644 --- a/zsnes/src/cpu/table.asm +++ b/zsnes/src/cpu/table.asm @@ -54,7 +54,6 @@ EXTSYM DPageR8,DPageW8,DPageR16,DPageW16 EXTSYM SDD1Enable EXTSYM JoyAOrig,JoyANow,JoyBOrig,JoyBNow,JoyCOrig,JoyCNow,JoyDOrig,JoyDNow -NEWSYM TableAsmStart %include "cpu/65816d.inc" %include "cpu/address.inc" %include "cpu/addrni.inc" @@ -64,10 +63,6 @@ NEWSYM TableAsmStart %include "cpu/regs.inc" ; start problem here %include "cpu/regsw.inc" - - - - section .data ; global variables @@ -1195,5 +1190,3 @@ NEWSYM settableDm16 mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FFh*4],COpFFm16d ret - -NEWSYM TableAsmEnd diff --git a/zsnes/src/cpu/tableb.asm b/zsnes/src/cpu/tableb.asm index 94e3b9cd..1ba3a690 100644 --- a/zsnes/src/cpu/tableb.asm +++ b/zsnes/src/cpu/tableb.asm @@ -30,18 +30,11 @@ EXTSYM sramaccessbankw8,tableAb,tableBb,tableCb,tableDb,tableEb EXTSYM tableFb,tableGb,tableHb,wramaccessbankr16 EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadb -NEWSYM TableBAsmStart %include "cpu/65816db.inc" %include "cpu/address.inc" %include "cpu/addrni.inc" %include "cpu/e65816b.inc" - - - - - - ; global variables ;******************************************************* @@ -721,5 +714,3 @@ settableDm16: mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FFh*4],COpFFm16d ret - -NEWSYM TableBAsmEnd diff --git a/zsnes/src/cpu/tablec.asm b/zsnes/src/cpu/tablec.asm index 5d0a5151..189e9877 100644 --- a/zsnes/src/cpu/tablec.asm +++ b/zsnes/src/cpu/tablec.asm @@ -30,18 +30,11 @@ EXTSYM sramaccessbankw8,tableAc,tableBc,tableCc,tableDc,tableEc EXTSYM tableFc,tableGc,tableHc,wramaccessbankr16 EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadc -NEWSYM TableCAsmStart %include "cpu/65816dc.inc" %include "cpu/address.inc" %include "cpu/addrni.inc" %include "cpu/e65816c.inc" - - - - - - ; global variables ;******************************************************* @@ -721,5 +714,3 @@ settableDm16: mov dword[edi+0FDh*4],COpFDm16d mov dword[edi+0FFh*4],COpFFm16d ret - -NEWSYM TableCAsmEnd diff --git a/zsnes/src/endmem.asm b/zsnes/src/endmem.asm index cd176275..3803e446 100644 --- a/zsnes/src/endmem.asm +++ b/zsnes/src/endmem.asm @@ -251,4 +251,3 @@ NEWSYM bg4change, resb 256 NEWSYM bgwinchange, resb 256 NEWSYM PrevPicture, resb 64*56*2 -NEWSYM EndMemAsmEnd diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm index 42e2ad6f..a6d03481 100644 --- a/zsnes/src/init.asm +++ b/zsnes/src/init.asm @@ -135,12 +135,6 @@ EXTSYM DSP2Read8b,DSP2Read16b,DSP2Write8b,DSP2Write16b,InitDSP2 %ifdef __LINUX__ EXTSYM LoadDir, popdir, pushdir %endif -;EXTSYM InitDSP4 -NEWSYM InitAsmStart - - - - ; Initiation @@ -3808,9 +3802,6 @@ NEWSYM yesoutofmemory, resb 1 SECTION .data NEWSYM outofmemoryerror, db 'OUT OF MEMORY.',0 NEWSYM outofmemoryerror2, db 'ROM IS TOO BIG.',0 -SECTION .text - -NEWSYM InitAsmEnd diff --git a/zsnes/src/linux/protect.c b/zsnes/src/linux/protect.c index 28ca317f..c8d0f7e7 100644 --- a/zsnes/src/linux/protect.c +++ b/zsnes/src/linux/protect.c @@ -17,34 +17,14 @@ #include "gblhdr.h" -extern void SfxProcAsmStart(); -extern void SfxProcAsmEnd(); -extern void FxEmu2AsmStart(); -extern void FxEmu2AsmEnd(); -extern void FxEmu2CAsmStart(); -extern void FxEmu2CAsmEnd(); -extern void WinIntRFAsmStart(); -extern void WinIntRFAsmEnd(); extern void CfgLoadAsmStart(); extern void CfgLoadAsmEnd(); -extern void IrqAsmStart(); -extern void IrqAsmEnd(); -extern void TableAsmStart(); -extern void TableAsmEnd(); -extern void TableBAsmStart(); -extern void TableBAsmEnd(); -extern void TableCAsmStart(); -extern void TableCAsmEnd(); extern void CopyVWinAsmStart(); extern void CopyVWinAsmEnd(); extern void DebugAsmStart(); extern void DebugAsmEnd(); extern void JoyAsmStart(); extern void JoyAsmEnd(); -extern void InitAsmStart(); -extern void InitAsmEnd(); -extern void UIAsmStart(); -extern void UIAsmEnd(); extern void DosModemRTNAsmStart(); extern void DosModemRTNAsmEnd(); extern void Vesa2AsmStart(); @@ -57,24 +37,6 @@ extern void GPProAsmStart(); extern void GPProAsmEnd(); extern void Vesa12AsmStart(); extern void Vesa12AsmEnd(); -extern void MakeV16TAsmStart(); -extern void MakeV16TAsmEnd(); -extern void Mode716BAsmStart(); -extern void Mode716BAsmEnd(); -extern void Mode716DAsmStart(); -extern void Mode716DAsmEnd(); -extern void Mode716EAsmStart(); -extern void Mode716EAsmEnd(); -extern void Mode7ExtAsmStart(); -extern void Mode7ExtAsmEnd(); -extern void MV16TMSAsmStart(); -extern void MV16TMSAsmEnd(); -extern void NewG162AsmStart(); -extern void NewG162AsmEnd(); -extern void NewGfx2AsmStart(); -extern void NewGfx2AsmEnd(); -extern void VCacheAsmStart(); -extern void VCacheAsmEnd(); #define MakeCodeWriteable(a, b) MakeCodeWriteable_f (a, b, #a) @@ -99,32 +61,13 @@ void MakeCodeWriteable_f (unsigned long startaddr, unsigned long length, const c void UnProtectMemory(void) { - MakeCodeWriteable((long) SfxProcAsmStart, (long) SfxProcAsmEnd - (long) SfxProcAsmStart); - MakeCodeWriteable((long) FxEmu2CAsmStart, (long) FxEmu2CAsmEnd - (long) FxEmu2CAsmStart); - MakeCodeWriteable((long) WinIntRFAsmStart, (long) WinIntRFAsmEnd - (long) WinIntRFAsmStart); - MakeCodeWriteable((long) CfgLoadAsmStart, (long) CfgLoadAsmEnd - (long) CfgLoadAsmStart); - MakeCodeWriteable((long) IrqAsmStart, (long) IrqAsmEnd - (long) IrqAsmStart); - MakeCodeWriteable((long) TableAsmStart, (long) TableAsmEnd - (long) TableAsmStart); - MakeCodeWriteable((long) TableBAsmStart, (long) TableBAsmEnd - (long) TableBAsmStart); - MakeCodeWriteable((long) TableCAsmStart, (long) TableCAsmEnd - (long) TableCAsmStart); MakeCodeWriteable((long) CopyVWinAsmStart, (long) CopyVWinAsmEnd - (long) CopyVWinAsmStart); MakeCodeWriteable((long) DebugAsmStart, (long) DebugAsmEnd - (long) DebugAsmStart); MakeCodeWriteable((long) JoyAsmStart, (long) JoyAsmEnd - (long) JoyAsmStart); - MakeCodeWriteable((long) InitAsmStart, (long) InitAsmEnd - (long) InitAsmStart); - MakeCodeWriteable((long) UIAsmStart, (long) UIAsmEnd - (long) UIAsmStart); MakeCodeWriteable((long) DosModemRTNAsmStart, (long) DosModemRTNAsmEnd - (long) DosModemRTNAsmStart); MakeCodeWriteable((long) Vesa2AsmStart, (long) Vesa2AsmEnd - (long) Vesa2AsmStart); MakeCodeWriteable((long) InitVidAsmStart, (long) InitVidAsmEnd - (long) InitVidAsmStart); MakeCodeWriteable((long) SWAsmStart, (long) SWAsmEnd - (long) SWAsmStart); MakeCodeWriteable((long) GPProAsmStart, (long) GPProAsmEnd - (long) GPProAsmStart); MakeCodeWriteable((long) Vesa12AsmStart, (long) Vesa12AsmEnd - (long) Vesa12AsmStart); - MakeCodeWriteable((long) MakeV16TAsmStart, (long) MakeV16TAsmEnd - (long) MakeV16TAsmStart); - MakeCodeWriteable((long) Mode716BAsmStart, (long) Mode716BAsmEnd - (long) Mode716BAsmStart); - MakeCodeWriteable((long) Mode716DAsmStart, (long) Mode716DAsmEnd - (long) Mode716DAsmStart); - MakeCodeWriteable((long) Mode716EAsmStart, (long) Mode716EAsmEnd - (long) Mode716EAsmStart); - MakeCodeWriteable((long) Mode7ExtAsmStart, (long) Mode7ExtAsmEnd - (long) Mode7ExtAsmStart); - MakeCodeWriteable((long) MV16TMSAsmStart, (long) MV16TMSAsmEnd - (long) MV16TMSAsmStart); - MakeCodeWriteable((long) NewG162AsmStart, (long) NewG162AsmEnd - (long) NewG162AsmStart); - MakeCodeWriteable((long) NewGfx2AsmStart, (long) NewGfx2AsmEnd - (long) NewGfx2AsmStart); - MakeCodeWriteable((long) VCacheAsmStart, (long) VCacheAsmEnd - (long) VCacheAsmStart); } diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm index ed73a74c..aa688213 100644 --- a/zsnes/src/linux/sdlintrf.asm +++ b/zsnes/src/linux/sdlintrf.asm @@ -121,8 +121,6 @@ EXTSYM V8Mode,GrayscaleMode EXTSYM PrevWinMode,PrevFSMode EXTSYM sem_sleep -NEWSYM WinIntRFAsmStart - ; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending ; on romispal) after a call to InitPreGame and before DeInitPostGame are ; made. GUI36hzcall should be called at 36hz after a call GUIInit and @@ -273,7 +271,7 @@ NEWSYM OsExit NEWSYM OSExit jmp DosExit -SECTION .data +SECTION .data NEWSYM TempHandle, dd 0 SECTION .text @@ -514,12 +512,12 @@ RefreshKeybBuffer: mov [Keybtail],al .none ret + +SECTION .data Keybhead db 0 Keybtail db 0 HoldKey dd 0 PKeyBuf times 100h db 0 - -SECTION .data NEWSYM CurKeyPos, dd 0 NEWSYM CurKeyReadPos, dd 0 NEWSYM KeyBuffer, times 16 dd 0 @@ -1118,7 +1116,7 @@ NEWSYM Init_Mouse mov eax,01h ret -SECTION .data +SECTION .data NEWSYM WMouseX, dd 0 NEWSYM WMouseY, dd 0 NEWSYM WMouseMoveX, dd 0 @@ -1257,13 +1255,14 @@ NEWSYM Check60hz popad ret +SECTION .data BitPosR db 11 BitPosG db 5 BitPosB db 0 BitSizeR db 5 BitSizeG db 6 BitSizeB db 5 - +SECTION .text InitializeGfxStuff: ; Process Red Stuff @@ -1490,7 +1489,9 @@ NEWSYM TCPIPWaitForConnection popad mov eax,-1 ret +SECTION .data .temp dd 0 +SECTION .text NEWSYM TCPIPInitConnectToServer pushad @@ -1543,7 +1544,9 @@ NEWSYM TCPIPConnectToServer popad mov eax,[.temp] ret +SECTION .data .temp dd 0 +SECTION .text NEWSYM TCPIPConnectToServerW ; int ConnectServer(char *servername, unsigned short port) @@ -1561,7 +1564,9 @@ NEWSYM TCPIPConnectToServerW popad mov eax,[.temp] ret +SECTION .data .temp dd 0 +SECTION .text NEWSYM TCPIPStoreByte ; Store al into the array @@ -1743,5 +1748,3 @@ NEWSYM GetTimeInSeconds movzx ebx,word[SystemTimewSecond] add eax,ebx ret - -NEWSYM WinIntRFAsmEnd diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm index 8ea96a12..176ef7a4 100644 --- a/zsnes/src/ui.asm +++ b/zsnes/src/ui.asm @@ -45,13 +45,6 @@ EXTSYM GetFilename EXTSYM OSPC_Init %endif -NEWSYM UIAsmStart - - - - - - ; Function 0501h ; User Interface @@ -1311,5 +1304,3 @@ NEWSYM MMXCheck .noprintstr .nommx ret - -NEWSYM UIAsmEnd diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm index 462c7e47..29657804 100644 --- a/zsnes/src/vcache.asm +++ b/zsnes/src/vcache.asm @@ -57,10 +57,6 @@ EXTSYM tltype2b EXTSYM tltype8b,objwlrpos EXTSYM snesinputdefault,cycleinputdevice - -NEWSYM VCacheAsmStart - - ; Process stuff & Cache sprites SECTION .bss @@ -3917,4 +3913,3 @@ NEWSYM cachesingle8bng pop edi pop esi ret -NEWSYM VCacheAsmEnd diff --git a/zsnes/src/video/hq2x16.asm b/zsnes/src/video/hq2x16.asm index 71c53fd4..56cf9dc1 100644 --- a/zsnes/src/video/hq2x16.asm +++ b/zsnes/src/video/hq2x16.asm @@ -33,10 +33,6 @@ EXTSYM WinVidMemStart EXTSYM BitConv32Ptr EXTSYM RGBtoYUVPtr -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .bss NEWSYM prevline, resd 1 NEWSYM nextline, resd 1 @@ -2166,7 +2162,3 @@ FuncTable2 SECTION .bss InterPtr resd 1 SECTION .text - -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/hq2x32.asm b/zsnes/src/video/hq2x32.asm index eb3d2812..c81c8250 100644 --- a/zsnes/src/video/hq2x32.asm +++ b/zsnes/src/video/hq2x32.asm @@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM reg_blank, const3, const5, const6, const14, cross, threshold -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .bss NEWSYM c1, resd 1 NEWSYM c2, resd 1 @@ -2139,7 +2135,3 @@ FuncTable2 SECTION .bss InterPtr resd 1 SECTION .text - -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/hq3x16.asm b/zsnes/src/video/hq3x16.asm index df7c895c..72ddd7c3 100644 --- a/zsnes/src/video/hq3x16.asm +++ b/zsnes/src/video/hq3x16.asm @@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM reg_blank, const7, cross, threshold -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .text %macro TestDiff 2 @@ -2755,7 +2751,3 @@ FuncTable2 SECTION .bss InterPtr resd 1 SECTION .text - -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/hq3x32.asm b/zsnes/src/video/hq3x32.asm index bb41e2bf..3d85fc70 100644 --- a/zsnes/src/video/hq3x32.asm +++ b/zsnes/src/video/hq3x32.asm @@ -37,10 +37,6 @@ EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9 EXTSYM reg_blank, const7, cross, threshold -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .text %macro TestDiff 2 @@ -2818,7 +2814,3 @@ FuncTable2 SECTION .bss InterPtr resd 1 SECTION .text - -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/hq4x16.asm b/zsnes/src/video/hq4x16.asm index e5619ac4..f565adb3 100644 --- a/zsnes/src/video/hq4x16.asm +++ b/zsnes/src/video/hq4x16.asm @@ -36,10 +36,6 @@ EXTSYM prevline, nextline, deltaptr, xcounter EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .text %macro AUXADDRESS 0 @@ -4282,7 +4278,3 @@ FuncTable SECTION .bss InterPtr resd 1 SECTION .text - -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/hq4x32.asm b/zsnes/src/video/hq4x32.asm index 796ee167..aaff9f04 100644 --- a/zsnes/src/video/hq4x32.asm +++ b/zsnes/src/video/hq4x32.asm @@ -37,10 +37,6 @@ EXTSYM w1, w2, w3, w4, w5, w6, w7, w8, w9 EXTSYM c1, c2, c3, c4, c5, c6, c7, c8, c9 EXTSYM reg_blank, const3, const5, const6, const7, cross, threshold -%ifdef __MINGW__ -NEWSYM CopyVWinAsmStart -%endif - SECTION .text %macro AUXADDRESS 0 @@ -4207,6 +4203,3 @@ SECTION .bss InterPtr resd 1 SECTION .text -%ifdef __MINGW__ -NEWSYM CopyVWinAsmEnd -%endif diff --git a/zsnes/src/video/makev16t.asm b/zsnes/src/video/makev16t.asm index 4bb98721..9d7f660a 100644 --- a/zsnes/src/video/makev16t.asm +++ b/zsnes/src/video/makev16t.asm @@ -60,13 +60,8 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry EXTSYM a16x16xinc,a16x16yinc -NEWSYM MakeV16TAsmStart %include "video/vidmacro.mac" - - - - ; clearback16bts clearback16bdual ;******************************************************* @@ -5322,4 +5317,3 @@ NEWSYM draw16x1616tswinon dec byte[tileleft16b] jnz near .loopa ret -NEWSYM MakeV16TAsmEnd diff --git a/zsnes/src/video/mode716.asm b/zsnes/src/video/mode716.asm index 3c5d3dea..7b1f962c 100644 --- a/zsnes/src/video/mode716.asm +++ b/zsnes/src/video/mode716.asm @@ -27,16 +27,10 @@ EXTSYM scrndis EXTSYM vidbright,prevbrightdc,Gendcolortable EXTSYM mode7ab,mode7cd,BGMA EXTSYM BG1SXl,BG1SYl - EXTSYM processmode7hires +EXTSYM processmode7hires -NEWSYM Mode716AsmStart %include "video/mode716.mac" - - - - - ;******************************************************* ; Processes & Draws Mode 7 ;******************************************************* @@ -690,5 +684,3 @@ NEWSYM processmode7hires16bd pop esi .nogo ret - -NEWSYM Mode716AsmEnd diff --git a/zsnes/src/video/mode716b.asm b/zsnes/src/video/mode716b.asm index 39df249e..5e9277b4 100644 --- a/zsnes/src/video/mode716b.asm +++ b/zsnes/src/video/mode716b.asm @@ -22,13 +22,8 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor EXTSYM cwinptr -NEWSYM Mode716BAsmStart %include "video/mode7.mac" - - - - ;******************************************************* ; Processes & Draws Mode 7 ;******************************************************* @@ -189,4 +184,3 @@ SECTION .text Mode7Process Mode7Window, domosaic16b, 2 .nextval3w Mode7ProcessB Mode7Window, domosaic16b, 2 -NEWSYM Mode716BAsmEnd diff --git a/zsnes/src/video/mode716d.asm b/zsnes/src/video/mode716d.asm index c4ded3e1..36e4fa9c 100644 --- a/zsnes/src/video/mode716d.asm +++ b/zsnes/src/video/mode716d.asm @@ -21,14 +21,8 @@ EXTSYM curmosaicsz,curvidoffset,domosaic16b,winptrref,scaddset EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set,cwinptr EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,dcolortab,vidbright -NEWSYM Mode716DAsmStart %include "video/mode7.mac" - - - - - NEWSYM Gendcolortable ; generate Direct Color Table push eax @@ -235,4 +229,3 @@ SECTION .text Mode7Process Mode7Window, domosaic16b, 2 .nextval3w Mode7ProcessB Mode7Window, domosaic16b, 2 -NEWSYM Mode716DAsmEnd diff --git a/zsnes/src/video/mode716e.asm b/zsnes/src/video/mode716e.asm index 1278e53c..dbc72756 100644 --- a/zsnes/src/video/mode716e.asm +++ b/zsnes/src/video/mode716e.asm @@ -22,11 +22,6 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor EXTSYM cwinptr - -NEWSYM Mode716EAsmStart - - - ;******************************************************* ; Processes & Draws Mode 7 ;******************************************************* @@ -1264,4 +1259,3 @@ NEWSYM drawmode716extbg2 cmp dh,1 jne near domosaic16b ret -NEWSYM Mode716EAsmEnd diff --git a/zsnes/src/video/mode7ext.asm b/zsnes/src/video/mode7ext.asm index 53bcff33..68c81b48 100644 --- a/zsnes/src/video/mode7ext.asm +++ b/zsnes/src/video/mode7ext.asm @@ -26,7 +26,6 @@ EXTSYM nglogicval,winlogicaval,ProcessMode7ngwinD,ProcessMode7ngwinC EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr EXTSYM ProcessMode7ngwin,ProcessMode7ngwinB -NEWSYM Mode7ExtAsmStart %include "video/mode7.mac" @@ -1322,5 +1321,3 @@ NEWSYM drawmode7ngextbg2 cmp dh,1 jne near domosaic ret - -NEWSYM Mode7ExtAsmEnd diff --git a/zsnes/src/video/mv16tms.asm b/zsnes/src/video/mv16tms.asm index 5b2640c2..818beea4 100644 --- a/zsnes/src/video/mv16tms.asm +++ b/zsnes/src/video/mv16tms.asm @@ -28,8 +28,6 @@ EXTSYM pal16bxcl EXTSYM coadder16 EXTSYM a16x16xinc,a16x16yinc,curypos,yflipadd - -NEWSYM MV16TMSAsmStart %include "video/vidmacro.mac" @@ -1501,4 +1499,3 @@ NEWSYM draw16x1616tswinonms dec byte[tileleft16b] jnz near .loopa ret -NEWSYM MV16TMSAsmEnd diff --git a/zsnes/src/video/newg162.asm b/zsnes/src/video/newg162.asm index a25b5c07..fb77e958 100644 --- a/zsnes/src/video/newg162.asm +++ b/zsnes/src/video/newg162.asm @@ -31,8 +31,6 @@ EXTSYM vidmemch2s,vidmemch4s,vidmemch8s EXTSYM cpalval,bgtxadd2 EXTSYM SpecialLine -NEWSYM NewG162AsmStart - %include "video/vidmacro.mac" %include "video/newg162.mac" %include "video/newgfx16.mac" @@ -1402,5 +1400,3 @@ drawlineng4b16bmsom16x16: drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmst,procpixelstmst drawlineng4b16bmsntom16x16 drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt - -NEWSYM NewG162AsmEnd diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm index c9f50ca0..45e0bb95 100644 --- a/zsnes/src/video/newgfx16.asm +++ b/zsnes/src/video/newgfx16.asm @@ -3465,7 +3465,6 @@ NEWSYM HalfTransB, dd 00001000010000010000100001000001b,000010000100000100001000 NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b NEWSYM NGNoTransp, dd 0 section .text -NEWSYM NewGfx16AsmEnd %macro SCMainA 0 %endmacro diff --git a/zsnes/src/video/newgfx2.asm b/zsnes/src/video/newgfx2.asm index 4bc2b5f9..37158702 100644 --- a/zsnes/src/video/newgfx2.asm +++ b/zsnes/src/video/newgfx2.asm @@ -26,21 +26,12 @@ EXTSYM ngpalcon2b,tleftnb,tltype2b,tltype4b,tltype8b,yposng,flipyposng EXTSYM ofsmcptr,ofsmtptr,ofsmmptr,ofsmcyps,ofsmady,ofsmadx EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram,bgtxadd2 -NEWSYM NewGfx2AsmStart - %include "video/vidmacro.mac" %include "video/newgfx2.mac" %include "video/newgfx.mac" %include "video/newgfxwn.mac" - - - - - - - ;****************************************** ; 8x8 tiles - tile engine ;****************************************** @@ -673,4 +664,3 @@ Processwinclipom4b: cmp dword[ngcwinmode],1 je near drawlinengom4bwin.winclipped jmp drawlinengom4bwin.loop -NEWSYM NewGfx2AsmEnd