Fix up sections variables are created in, major code cleanup, remove protection removal. - Round 3

zsnes/src/gui/gui.asm

@@ -180,8 +180,6 @@ EXTSYM deinitipx, IPXSearchval, ipxlookforconnect, initipx
 EXTSYM PreparePacketIPX,SendPacketIPX,ipxgetchar,ipxsendchar
 %endif
 
-NEWSYM GuiAsmStart
-
 %include "gui/guitools.inc"
 %include "gui/guimisc.inc"
 %include "gui/guimouse.inc"
@@ -777,7 +775,6 @@ NEWSYM GUICTimer,   resd 1
 NEWSYM GUIOn,       resb 1
 NEWSYM GUIOn2,      resb 1
 NEWSYM GUIReset,    resb 0
-;GOSPort db 0
 NEWSYM CurPalSelect, resb 1
 NEWSYM MotionBlur, resb 1
 
@@ -1916,12 +1913,6 @@ NEWSYM StartGUI
     mov byte[NetNewNick],0
 .nonewnick
 
-;NEWSYM NetChatFirst, db 0
-;NEWSYM NetServer, db 0
-;NEWSYM NetQuitAfter, db 0
-;NEWSYM NetNewNick, times 16 db 0
-;NEWSYM NetFilename, times 512 db 0
-
     cmp byte[CNetType],20
     je near .noautostate
     cmp byte[AutoState],0
@@ -4444,7 +4435,7 @@ GUISetPal:
     jnz .next
     ret
 
-SECTION .bss ;ALIGN=32
+SECTION .bss
 NEWSYM GUICPC, resw 256
 SECTION .text
 
@@ -5664,7 +5655,3 @@ db 137,176,166,37,192,241,169,84,32,85,112,168,154,7,247,146,183,225,246,173
 db 57,103,110,236,113,118,203,200,22,87,251,7,138,37,12,84,221,171,51,209
 db 242,37,89,73,151,162,139,189,131,209,221,96,107,144,175,79,199,123,98,138
 db 226,86,221,254,72,14,126,180,200,171,85,94,120,124,196,225,150,57,219,158
-
-SECTION .text
-
-NEWSYM GuiAsmEnd

zsnes/src/gui/guicheat.inc

@@ -187,7 +187,6 @@ CheatCodeSearchProcess:
     inc esi
     dec ecx
     jnz .exactloop
-; CSCurValue  dd 0
     mov byte[CopyRamToggle],1
     mov byte[CheatSearchStatus],1
 .nodisplay

zsnes/src/gui/guikeys.inc

@@ -650,9 +650,6 @@ GUIgetcurrentinput:
     ret
 
 GUITCPIPKeys:
-;GUINetTextk2 db '  0.  0.  0.  0',0
-;GUINetTextl2 db '7845',0
-;GUINetTextm2 db 0,0,0
     cmp byte[GUINetTextm2],1
     je near .section2
     mov edi,TCPIPAddress

zsnes/src/gui/guiload.inc

@@ -189,7 +189,6 @@ GUIloadfilename:
     cmp byte[CNetType],20
     jne near .nocnettype
     mov byte[netlastloaded],1
-; FileNameMod times 29 db 0
     cmp byte[GUIcmenupos],1
     jne .nomenuout
     mov byte[GUIcmenupos],0

zsnes/src/gui/guinetpl.inc

@@ -1385,7 +1385,6 @@ ProcessRemoteCommand:
     call RemoteSendChar
     jmp .finsend2
 .nolatencych
-; FileNameMod times 29 db 0
     cmp al,10
     jne .nosendfn
     xor ebx,ebx

zsnes/src/gui/guiwindp.inc

@@ -3523,9 +3523,6 @@ Cheatmodeadd:
 .nodisplay
     ret
 
-;CheatSrcByteSize db 0
-;CheatSrcByteBase db 0
-;CheatSrcSearchType db 0
 SECTION .bss
 CheatWinMode resb 1
 CheatSearchStatus resb 1
@@ -4474,18 +4471,6 @@ DisplayNetOptnsChatWindow:
 .zero
     GUIOuttextwin2 8,6,130,GUINetTextV
     GUIOuttextwin2 8,110,130,GUINetTexta
-
-    ; #############
-;    mov eax,[CViewLoc]
-;    shr eax,5
-;    add eax,12
-;    mov [TViewLoc],eax
-;    181,112,167
-;CViewLoc dd 0
-;NViewLoc dd 0
-;TViewLoc dd 0
-;    15,181,112
-;    DrawSlideBarWin 8,181,15,[NViewLoc],[TViewLoc],12,97,GUINCStA
     ret
 
 SECTION .bss
@@ -5232,10 +5217,10 @@ DisplayGUIOptns:
     mov byte[GUItextcolor],223
     ret
 
-;mousewrap db 0          ; 0 = mouse boundries, 1 = mouse wrap
+;mousewrap   0      ; 0 = mouse boundries, 1 = mouse wrap
-;mouseshad db 1          ; 0 = no mouse shadow, 1 = mouse shadow
+;mouseshad   1      ; 0 = no mouse shadow, 1 = mouse shadow
-;lastcursres db 0        ; 0 = go to load, 1 = go to previous menu, 2 = no menu
+;lastcursres 0      ; 0 = go to load, 1 = go to previous menu, 2 = no menu
-;resetposn   db 1        ; 0 = no window reset, 1 = window reset
+;resetposn   1      ; 0 = no window reset, 1 = window reset
 
 SECTION .data
 GUIGUIOptnsText1 db 'COLOR:',0
@@ -6153,10 +6138,6 @@ GUIComboData resb 50
 GUIScrolBufA resb 21
 GUIScrolBufB resb 10
 
-
-;CombinDataGlob times 3300 db 0 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff
-;CombinDataLocl times 3300 db 0
-
 SECTION .data
 GUIComboText1 db 'DESCRIPTION',0
 GUIComboText2 db 'KEY P# LH',0

zsnes/src/linux/protect.c

@@ -17,8 +17,6 @@
 
 #include "gblhdr.h"
 
-extern void GuiAsmStart();
-extern void GuiAsmEnd();
 extern void SfxProcAsmStart();
 extern void SfxProcAsmEnd();
 extern void FxEmu2AsmStart();
@@ -59,8 +57,6 @@ extern void GPProAsmStart();
 extern void GPProAsmEnd();
 extern void Vesa12AsmStart();
 extern void Vesa12AsmEnd();
-extern void MenuAsmStart();
-extern void MenuAsmEnd();
 extern void MakeV16TAsmStart();
 extern void MakeV16TAsmEnd();
 extern void Mode716BAsmStart();
@@ -106,7 +102,6 @@ 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) GuiAsmStart, (long) GuiAsmEnd - (long) GuiAsmStart);
 	MakeCodeWriteable((long) CfgLoadAsmStart, (long) CfgLoadAsmEnd - (long) CfgLoadAsmStart);
 	MakeCodeWriteable((long) IrqAsmStart, (long) IrqAsmEnd - (long) IrqAsmStart);
 	MakeCodeWriteable((long) TableAsmStart, (long) TableAsmEnd - (long) TableAsmStart);
@@ -123,7 +118,6 @@ void UnProtectMemory(void)
 	MakeCodeWriteable((long) SWAsmStart, (long) SWAsmEnd - (long) SWAsmStart);
 	MakeCodeWriteable((long) GPProAsmStart, (long) GPProAsmEnd - (long) GPProAsmStart);
 	MakeCodeWriteable((long) Vesa12AsmStart, (long) Vesa12AsmEnd - (long) Vesa12AsmStart);
-	MakeCodeWriteable((long) MenuAsmStart, (long) MenuAsmEnd - (long) MenuAsmStart);
 	MakeCodeWriteable((long) MakeV16TAsmStart, (long) MakeV16TAsmEnd - (long) MakeV16TAsmStart);
 	MakeCodeWriteable((long) Mode716BAsmStart, (long) Mode716BAsmEnd - (long) Mode716BAsmStart);
 	MakeCodeWriteable((long) Mode716DAsmStart, (long) Mode716DAsmEnd - (long) Mode716DAsmStart);