diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index bf82f5cb..74986164 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -774,7 +774,6 @@ clearsram:
 .loop
     mov byte[eax],0FFh
     inc eax
-;    loop .loop
     dec ecx
     jnz .loop
     cmp byte[SFXSRAM],0
@@ -784,7 +783,6 @@ clearsram:
 .loop2
     mov byte[eax],0FFh
     inc eax
-;    loop .loop2
     dec ecx
     jnz .loop2
 .nosfxsram
@@ -795,7 +793,6 @@ clearsram:
 .loop3
     mov byte[eax],0FFh
     inc eax
-;    loop .loop3
     dec ecx
     jnz .loop3
 .nosa1
@@ -892,7 +889,6 @@ CalcChecksum:
     mov bl,[eax]
     add edx,ebx
     inc eax
-;    loop .loop
     dec ecx
     jnz .loop
     mov ebx,edx
@@ -1028,7 +1024,6 @@ NEWSYM ExecGUISaveVars
 .loopa
     mov [esi],al
     inc esi
-;    loop .loopa
     dec ecx
     jnz .loopa
 %endmacro
@@ -1298,7 +1293,6 @@ DrawSnow:
 .transp
     inc esi
     inc edx
-;    loop .sloop
     dec ecx
     jnz .sloop
     add esi,272
@@ -1327,7 +1321,6 @@ DrawSnow:
     mov byte[esi+eax],bl
 .nosnow
     inc edx
-;    loop .loop
     dec ecx
     jnz .loop
     ; Change Snow Displacement Values
@@ -1391,7 +1384,6 @@ ProcessSnowVelocity:
     or byte[SnowVelDist+edx*2],8
 .nosdata
     inc edx
-;    loop .loop
     dec ecx
     jnz .loop
     ret
@@ -1546,7 +1538,6 @@ NEWSYM StartGUI
 .slloop
     mov dword[eax],0
     add eax,4
-;    loop .slloop
     dec ecx
     jnz .slloop
     cmp byte[OldWinPos],0
@@ -1559,7 +1550,6 @@ NEWSYM StartGUI
     mov eax,[GUIwinposy2+esi*4]
     mov [GUIwinposy+esi*4],eax
     inc esi
-;    loop .nextow
     dec ecx
     jnz .nextow
     mov byte[OldWinPos],1
@@ -1608,9 +1598,8 @@ NEWSYM StartGUI
     inc eax
     dec bl
     jnz .convlfnlp2b
-;    loop .convlfnlp
     dec ecx
-    loop .convlfnlp
+    jnz .convlfnlp
 .noconvertlfqm
 
     mov byte[GUIOn],1
@@ -1665,7 +1654,6 @@ NEWSYM StartGUI
 .loop
     mov dword[eax],0
     add eax,4
-;    loop .loop
     dec ecx
     jnz .loop
 .nong
@@ -1724,7 +1712,6 @@ NEWSYM StartGUI
 .pclear
     mov dword[esi],0
     add esi,4
-;    loop .pclear
     dec ecx
     jnz .pclear
     mov byte[pressed+1],2
@@ -2304,7 +2291,6 @@ NEWSYM StartGUI
 .loop20
     mov byte[eax],0
     inc eax
-;    loop .loop20
     dec ecx
     jnz .loop20
     mov al,[Latency]
@@ -2325,7 +2311,6 @@ NEWSYM StartGUI
     add al,[ebx]
     adc ah,0
     inc ebx
-;    loop .csumloop
     dec ecx
     jnz .csumloop
 .nocsumloop
@@ -2436,7 +2421,6 @@ NEWSYM StartGUI
     mov [eax],edx
     add ebx,4
     add eax,4
-;    loop .loopcr
     dec ecx
     jnz .loopcr
 .nocopyram
@@ -2470,7 +2454,6 @@ NEWSYM StartGUI
 .loopcl
     mov dword[eax],0
     add eax,4
-;    loop .loopcl
     dec ecx
     jnz .loopcl
 
@@ -2522,7 +2505,6 @@ guifirsttimemsg:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     mov byte[pressed+2Ch],0
@@ -2591,7 +2573,6 @@ guimustrestartmsg:
     mov byte[pressed+ebx],2
 .npr1
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     mov byte[pressed+2Ch],0
@@ -2626,7 +2607,6 @@ guimustrestartmsg:
     cmp byte[pressed+ebx],1
     je .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     jmp .again
@@ -2660,7 +2640,6 @@ guiprevideo:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     call GUIUnBuffer
@@ -2695,7 +2674,6 @@ guiprevideo:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     cmp byte[MouseDis],1
@@ -2736,7 +2714,6 @@ guipostvideo:
 .loop
     mov dword[eax],0FFFFFFFFh
     add eax,4
-;    loop .loop
     dec ecx
     jnz .loop
 
@@ -2745,7 +2722,6 @@ guipostvideo:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     mov dword[GUIkeydelay],36*10
@@ -2773,7 +2749,6 @@ guipostvideo:
     cmp byte[pressed+ebx],0
     jne near .pressedfail
     inc ebx
-;    loop .b2
     dec ecx
     jnz .b2
     cmp byte[MouseDis],1
@@ -2791,7 +2766,6 @@ guipostvideo:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     cmp byte[MouseDis],1
@@ -2882,7 +2856,6 @@ guipostvideofail:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     call GUIUnBuffer
diff --git a/zsnes/src/gui/guicheat.inc b/zsnes/src/gui/guicheat.inc
index a07c554b..ed5b62fc 100644
--- a/zsnes/src/gui/guicheat.inc
+++ b/zsnes/src/gui/guicheat.inc
@@ -185,7 +185,6 @@ CheatCodeSearchProcess:
     rol bl,1
     rol bh,1
     inc esi
-;    loop .exactloop
     dec ecx
     jnz .exactloop
 ; CSCurValue  dd 0
@@ -243,7 +242,6 @@ CheatCodeSearchInit:
     mov [eax],edx
     add ebx,4
     add eax,4
-;    loop .loop
     dec ecx
     jnz .loop
     ; fill searched buffer with 0xFF
@@ -253,7 +251,6 @@ CheatCodeSearchInit:
 .loop2
     mov dword[eax],0FFFFFFFFh
     add eax,4
-;    loop .loop2
     dec ecx
     jnz .loop2
     cmp byte[CheatSrcSearchType],1
@@ -678,7 +675,6 @@ AddCheatCode:
     mov [eax+18*2+2],dl
     inc ebx
     inc eax
-;    loop .dloop
     dec ecx
     jnz .dloop
     pop edx
@@ -737,7 +733,6 @@ ProcessCheatCode:
     mov [eax+18*2+2],dl
     inc ebx
     inc eax
-;    loop .dloop
     dec ecx
     jnz .dloop
     ; determine whether it is gamegenie, par, or GF
@@ -754,7 +749,6 @@ ProcessCheatCode:
     mov [eax],bl
 .nolower
     inc eax
-;    loop .loop
     dec ecx
     jnz .loop
     mov byte[guicheatvalrep],0
@@ -790,7 +784,6 @@ ProcessCheatCode:
     ja .invalidpar
 .okaypar
     inc eax
-;    loop .looppar
     dec ecx
     jnz .looppar
     jmp decodepar
@@ -819,7 +812,6 @@ ProcessCheatCode:
     ja .invalidgg
 .okaygg
     inc eax
-;    loop .loopgg
     dec ecx
     jnz .loopgg
     jmp decodegg
@@ -842,7 +834,6 @@ ProcessCheatCode:
     ja .invalidgf
 .okaygf
     inc eax
-;    loop .loopgf
     dec ecx
     jnz .loopgf
     mov eax,GUICheatText9+5
@@ -861,7 +852,6 @@ ProcessCheatCode:
     ja near .invalidgf
 .okaygf2
     inc eax
-;    loop .loopgf2
     dec ecx
     jnz .loopgf2
     mov bl,[GUICheatText9+13]
@@ -1298,7 +1288,6 @@ guicheaterror:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
 .again
@@ -1328,7 +1317,6 @@ guicheaterror:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     cmp byte[MouseDis],1
diff --git a/zsnes/src/gui/guicombo.inc b/zsnes/src/gui/guicombo.inc
index 5ce9a49a..ab1fc134 100644
--- a/zsnes/src/gui/guicombo.inc
+++ b/zsnes/src/gui/guicombo.inc
@@ -59,7 +59,6 @@ ComboAdder:
     mov [eax],dl
     inc ebx
     inc eax
-;    loop .loop
     dec ecx
     jnz .loop
     mov ecx,42  ; copy combination code
@@ -69,7 +68,6 @@ ComboAdder:
     mov [eax],dl
     inc ebx
     inc eax
-;    loop .loop2
     dec ecx
     jnz .loop2
     mov dx,[GUIComboKey]
@@ -122,7 +120,6 @@ ComboReplace:
     mov [eax],dl
     inc ebx
     inc eax
-;    loop .loop
     dec ecx
     jnz .loop
     mov ecx,42  ; copy combination code
@@ -132,7 +129,6 @@ ComboReplace:
     mov [eax],dl
     inc ebx
     inc eax
-;    loop .loop2
     dec ecx
     jnz .loop2
     mov dx,[GUIComboKey]
@@ -169,7 +165,6 @@ ComboRemoval:
     inc eax
     dec ebx
     jnz .loop
-;    loop .loop2
     dec ecx
     jnz .loop2
 .nomove
diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index ebcb86e0..c01a63aa 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -1109,7 +1109,6 @@ GUIVideoKeys:
 .fsloop
     mov dword[eax],0
     add eax,4
-;    loop .fsloop
     dec ecx
     jnz .fsloop
     pop ecx
@@ -1132,7 +1131,6 @@ GUIVideoKeys:
 .ssloop
     mov dword[eax],0
     add eax,4
-;    loop .ssloop
     dec ecx
     jnz .ssloop
     pop ecx
@@ -2936,7 +2934,6 @@ WaitForKey:
     cmp byte[pressed+ebx],0
     jne near .again3
     inc ebx
-;    loop .b2
     dec ecx
     jnz .b2
     dec edx
@@ -2961,7 +2958,6 @@ WaitForKey:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     jmp .again
diff --git a/zsnes/src/gui/guiload.inc b/zsnes/src/gui/guiload.inc
index c061b19c..85398fd4 100644
--- a/zsnes/src/gui/guiload.inc
+++ b/zsnes/src/gui/guiload.inc
@@ -359,7 +359,6 @@ GUIloadfilename:
     mov [ebx],dl
     inc ebx
     inc eax
-;    loop .rbackupl
     dec ecx
     jnz .rbackupl
     cmp byte[yesoutofmemory],1
@@ -516,7 +515,6 @@ GUILoadData:
     mov [ebx],al
     inc edx
     inc ebx
-;    loop .loopfnc
     dec ecx
     jnz .loopfnc
 
@@ -1002,7 +1000,6 @@ GetLoadHeader:
     sub al,'a'-'A'
 .nocap
     mov [edi],al
-;    loop .loop4
     dec ecx
     jnz .loop4
     pop ecx
diff --git a/zsnes/src/gui/guimisc.inc b/zsnes/src/gui/guimisc.inc
index 36ef4733..006a8dcd 100644
--- a/zsnes/src/gui/guimisc.inc
+++ b/zsnes/src/gui/guimisc.inc
@@ -146,7 +146,6 @@ CalibrateDispA:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     call GUIUnBuffer
@@ -173,7 +172,6 @@ CalibrateDispB:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     call GUIUnBuffer
@@ -211,7 +209,6 @@ SetAllKeys:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
 
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 7103b801..336fae0a 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -858,7 +858,6 @@ NEWSYM SwitchFullScreen
 .loop
     mov dword[eax],0FEFEFEFEh
     add eax,4
-;    loop .loop
     dec ecx
     jnz .loop
 
@@ -2529,7 +2528,6 @@ guipresstest:
 .a
     mov byte[pressed+ebx],0
     inc ebx
-;    loop .a
     dec ecx
     jnz .a
     call GUIUnBuffer
@@ -2559,7 +2557,6 @@ guipresstest:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     jmp .again
@@ -2573,7 +2570,6 @@ guipresstest:
     mov byte[pressed+ebx],2
 .pressedokayb
     inc ebx
-;    loop .a2
     dec ecx
     jnz .a2
     pop ebx
@@ -2624,7 +2620,6 @@ guipresstestb:
     cmp byte[pressed+ebx],0
     jne .tryagain
     inc ebx
-;    loop .b2
     dec ecx
     jnz .b2
 
@@ -2641,7 +2636,6 @@ guipresstestb:
     cmp byte[pressed+ebx],0
     jne .pressedokay
     inc ebx
-;    loop .b
     dec ecx
     jnz .b
     jmp .again
diff --git a/zsnes/src/gui/guinetpl.inc b/zsnes/src/gui/guinetpl.inc
index d8f70d62..88a5209e 100644
--- a/zsnes/src/gui/guinetpl.inc
+++ b/zsnes/src/gui/guinetpl.inc
@@ -38,7 +38,6 @@ ProcessModem:
 .clooptcpip
     mov byte[eax],0
     inc eax
-;    loop .clooptcpip
     dec ecx
     jnz .clooptcpip
     mov dword[CCursLoc],0
@@ -98,7 +97,6 @@ ProcessModem:
 .clooptcpip2
     mov byte[eax],0
     inc eax
-;    loop .clooptcpip2
     dec ecx
     jnz .clooptcpip2
     mov dword[CCursLoc],0
@@ -239,7 +237,6 @@ ProcessModem:
 .cloopipx
     mov byte[eax],0
     inc eax
-;    loop .cloopipx
     dec ecx
     jnz .cloopipx
     mov dword[CCursLoc],0
@@ -313,7 +310,6 @@ ProcessModem:
 .cloop
     mov byte[eax],0
     inc eax
-;    loop .cloop
     dec ecx
     jnz .cloop
     mov dword[CCursLoc],0
@@ -696,7 +692,6 @@ ProcessModem:
 .cloop2
     mov byte[eax],0
     inc eax
-;    loop .cloop2
     dec ecx
     jnz .cloop2
     mov dword[CCursLoc],0
@@ -1455,7 +1450,6 @@ transfersram:
     pop ebx
     inc esi
     inc ebx
-;    loop .loop
     dec ecx
     jnz .loop
     mov byte[sramsavedis],0
@@ -1489,7 +1483,6 @@ transfersram:
     je .getnext
     mov [ebx],dl
     inc ebx
-;    loop .loopb
     dec ecx
     jnz .loopb
     ret
@@ -1695,7 +1688,6 @@ loadstatesend:
     pop ecx
     pop edx
     inc edx
-;    loop .loop
     dec ecx
     jnz .loop
     call SendPacket
@@ -1764,7 +1756,6 @@ loadstaterecv:
     pop edx
     mov [edx],al
     inc edx
-;    loop .loop
     dec ecx
     jnz .loop
     pop ecx
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index a5b6b7f8..5d86a17b 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -2428,7 +2428,6 @@ DisplayGUICheatConv:
     mov [edx],bl
     add edx,2
     dec eax
-;    loop .loop
     dec ecx
     jnz .loop
     mov eax,[ccheatnpos]
@@ -2489,7 +2488,6 @@ DisplayGUICheatConv:
     mov [edx],bl
     inc eax
     inc edx
-;    loop .loop2
     dec ecx
     jnz .loop2
     ret
@@ -2997,7 +2995,6 @@ FindChtSrcRes:
     dec dh
     jnz .sloop2
     inc eax
-;    loop .searchloop
     dec ecx
     jnz .searchloop
     mov eax,ebx
@@ -5494,7 +5491,6 @@ DisplayGUICombo:
     jz .donecomp
     inc esi
     inc edi
-;    loop .comploop
     dec ecx
     jnz .comploop
 .donecomp
diff --git a/zsnes/src/gui/menu.asm b/zsnes/src/gui/menu.asm
index 33742441..faf7edf1 100644
--- a/zsnes/src/gui/menu.asm
+++ b/zsnes/src/gui/menu.asm
@@ -411,7 +411,6 @@ NEWSYM showmenu
     mov byte[eax],2
 .notpr
     inc eax
-;    loop .looppr
     dec ecx
     jnz .looppr
 ;    mov byte[pressed+1],2
@@ -449,7 +448,6 @@ NEWSYM menudrawbox8b
 .loop
     mov byte[esi],144
     inc esi
-;    loop .loop
     dec ecx
     jnz .loop
     add esi,288-150
@@ -566,7 +564,6 @@ NEWSYM menudrawcursor8b
 .loop
     mov byte[esi],160
     inc esi
-;    loop .loop
     dec ecx
     jnz .loop
     add esi,288-148
@@ -595,7 +592,6 @@ NEWSYM menudrawbox16b
     shr dx,1
     mov [esi],dx
     add esi,2
-;    loop .loop16b2
     dec ecx
     jnz .loop16b2
     add esi,288*2-150*2
@@ -631,7 +627,6 @@ NEWSYM menudrawbox16b
 .loop16b
     mov [esi],dx
     add esi,2
-;    loop .loop16b
     dec ecx
     jnz .loop16b
     add esi,288*2-150*2
@@ -749,7 +744,6 @@ NEWSYM menudrawcursor16b
 .loop
     mov [esi],bx
     add esi,2
-;    loop .loop
     dec ecx
     jnz .loop
     add esi,288*2-148*2
@@ -850,7 +844,6 @@ NEWSYM savespcdata
     mov [edi],al
     inc esi
     inc edi
-;    loop .romloop
     dec ecx
     jnz .romloop
     ; Copy Date of spc dumped