diff --git a/zsnes/src/video/copyvid.inc b/zsnes/src/video/copyvid.inc
index 8d3fe60d..55cd9b17 100644
--- a/zsnes/src/video/copyvid.inc
+++ b/zsnes/src/video/copyvid.inc
@@ -1620,7 +1620,6 @@ NEWSYM draweagle
     mov [es:edi],eax
     add edx,4
     add edi,4
-;    loop .copyloop
     dec ecx
     jnz .copyloop
     xor eax,eax
@@ -1696,7 +1695,6 @@ NEWSYM draweagle
     mov [es:edi],eax
     add edx,4
     add edi,4
-;    loop .copyloop2
     dec ecx
     jnz .copyloop2
     xor eax,eax
@@ -2299,7 +2297,6 @@ NEWSYM ConvertToAFormat
     or ebx,eax
     mov [esi],ebx
     add esi,4
-;    loop .crgbloop2
     dec ecx
     jnz .crgbloop2
     add esi,64
@@ -2320,7 +2317,6 @@ NEWSYM ConvertToAFormat
     por mm0,mm1
     movq [esi],mm0
     add esi,8
-;    loop .crgbloop2m
     dec ecx
     loop .crgbloop2m
     add esi,64
@@ -2347,7 +2343,6 @@ NEWSYM UnConvertToAFormat
     or ebx,eax
     mov [esi],ebx
     add esi,4
-;    loop .crgbloop2
     dec ecx
     jnz .crgbloop2
     add esi,64
@@ -3881,9 +3876,8 @@ Process2xSaI:
 .nextb
     mov dword[ebx],0FFFFFFFFh
     add ebx,4
-;    loop .nextb
     dec ecx
-    loop .nextb
+    jnz .nextb
     pop ebx
     jmp .returninterp
 .ignorehr
@@ -3947,7 +3941,6 @@ Process2xSaI:
     movq [es:eax],mm0
     add edx,8
     add eax,8
-;    loop .s2xsailoop
     dec ecx
     jnz .s2xsailoop
     mov edx,[spritetablea]
@@ -3959,7 +3952,6 @@ Process2xSaI:
     movq [es:eax],mm0
     add edx,8
     add eax,8
-;    loop .s2xsailoop2
     dec ecx
     jnz .s2xsailoop2
     jmp .dones2xsai
@@ -3980,7 +3972,6 @@ Process2xSaI:
 .loop
     mov dword[es:edi],0
     add edi,4
-;    loop .loop
     dec ecx
     jnz .loop
     emms
@@ -4700,7 +4691,6 @@ NEWSYM interpolate640x480x16b
     add esi,2
     add edi,4
     add edx,4
-;    loop .a
     dec ecx
     jnz .a
     add esi,66
@@ -4733,7 +4723,6 @@ NEWSYM interpolate640x480x16b
     add esi,2
     add edi,4
     add edx,4
-;    loop .c
     dec ecx
     jnz .c
     add edi,130*2
@@ -4744,7 +4733,6 @@ NEWSYM interpolate640x480x16b
     mov [es:edi],eax
     add edx,4
     add edi,4
-;    loop .d
     dec ecx
     jnz .d
     inc dword[InterPtr]
@@ -5732,7 +5720,6 @@ NEWSYM getcopyvesa2320x240x16b
     mov [esi],ax
     add edi,2
     add esi,2
-;   loop .loop
     dec ecx
     jnz .loop
     add edi,128
@@ -5763,7 +5750,6 @@ ConvertImageDatared10:
     or ax,dx
     mov [esi],ax
     add esi,2
-;    loop .loop
     dec ecx
     jnz .loop
     add esi,64
diff --git a/zsnes/src/video/m716text.asm b/zsnes/src/video/m716text.asm
index b4a3ad32..201de5c5 100644
--- a/zsnes/src/video/m716text.asm
+++ b/zsnes/src/video/m716text.asm
@@ -830,7 +830,8 @@ NEWSYM drawmode716textbg2
 .nopr2
     add esi,2
     add edi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -863,7 +864,8 @@ NEWSYM drawmode716textbg2
     add esi,2
     add edi,2
     inc ebp
-    loop .loop2
+    dec ecx
+    jnz .loop2
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -893,7 +895,8 @@ extbg2add:
 .nopr2
     add esi,2
     add edi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -923,7 +926,8 @@ extbg2add:
     add esi,2
     add edi,2
     inc ebp
-    loop .loop2
+    dec ecx
+    jnz .loop2
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -954,7 +958,8 @@ extbg2sub:
 .nopr2
     add esi,2
     add edi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -985,7 +990,8 @@ extbg2sub:
     add esi,2
     add edi,2
     inc ebp
-    loop .loop2
+    dec ecx
+    jnz .loop2
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
diff --git a/zsnes/src/video/mode716.asm b/zsnes/src/video/mode716.asm
index 83244eb3..aeee0a22 100644
--- a/zsnes/src/video/mode716.asm
+++ b/zsnes/src/video/mode716.asm
@@ -406,7 +406,8 @@ NEWSYM drawmode7ngextbg16b
 .loop
     mov byte[esi+75036*8],0
     add esi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     pop ecx
 
     cmp byte[mode7hr+ebx],1
@@ -473,7 +474,8 @@ drawmode7w16bsnte
     %1
 .nopr2
     add esi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     ret
 %endmacro
diff --git a/zsnes/src/video/mode716e.asm b/zsnes/src/video/mode716e.asm
index 4c4553ad..d312081e 100644
--- a/zsnes/src/video/mode716e.asm
+++ b/zsnes/src/video/mode716e.asm
@@ -1228,7 +1228,8 @@ NEWSYM drawmode716extbg2
     mov [esi],bx
 .nopr2
     add esi,2
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -1252,7 +1253,8 @@ NEWSYM drawmode716extbg2
 .nopr2b
     add esi,2
     inc ebp
-    loop .loop2
+    dec ecx
+    jnz .loop2
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
diff --git a/zsnes/src/video/mode7ext.asm b/zsnes/src/video/mode7ext.asm
index ae8d2113..11cfabfd 100644
--- a/zsnes/src/video/mode7ext.asm
+++ b/zsnes/src/video/mode7ext.asm
@@ -1117,7 +1117,8 @@ NEWSYM drawmode7extbg2
     mov [esi],al
 .nopr2
     inc esi
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -1139,7 +1140,8 @@ NEWSYM drawmode7extbg2
 .nopr2b
     inc esi
     inc ebp
-    loop .loop2
+    dec ecx
+    jnz .loop2
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
@@ -1309,7 +1311,8 @@ NEWSYM drawmode7ngextbg2
     mov [esi],al
 .nopr2
     inc esi
-    loop .loop
+    dec ecx
+    jnz .loop
     xor eax,eax
     mov dh,byte[curmosaicsz]
     cmp dh,1
diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm
index dab9d0cc..fac41df1 100644
--- a/zsnes/src/video/newgfx16.asm
+++ b/zsnes/src/video/newgfx16.asm
@@ -543,7 +543,8 @@ NEWSYM newengine16b
 .loopcc
     mov dword[ebx],eax
     add ebx,4
-    loop .loopcc
+    dec ecx
+    jnz .loopcc
     pop ecx
     pop eax
     mov dword[startlinet],0
@@ -2815,7 +2816,8 @@ ProcessTransparencies:
     shr eax,1
     mov [esi],ax
     add esi,2
-    loop .next2
+    dec ecx
+    jnz .next2
 .done
     pop ebx
     pop esi
@@ -2844,7 +2846,8 @@ ProcessTransparencies:
     shr eax,1
     mov [esi],ax
     add esi,2
-    loop .next2c
+    dec ecx
+    jnz .next2c
 .donec
     pop ebx
     pop esi
@@ -2857,7 +2860,8 @@ ProcessTransparencies:
     mov ax,[fulladdtab+eax*2]
     mov [esi],ax
     add esi,2
-    loop .next2c
+    dec ecx
+    jnz .next2c
     pop ebx
     pop esi
     jmp .donetransp
@@ -2890,7 +2894,8 @@ ProcessTransparencies:
     mov [esi],dx
 .notranspfshs
     add esi,2
-    loop .nextfshs
+    dec ecx
+    jnz .nextfshs
     pop esi
     pop ebx
     jmp .donetransp
@@ -2917,7 +2922,8 @@ ProcessTransparencies:
     mov [esi],dx
 .notranspfa
     add esi,2
-    loop .nextfa
+    dec ecx
+    jnz .nextfa
     pop esi
     pop ebx
     jmp .donetransp
@@ -2945,7 +2951,8 @@ ProcessTransparencies:
     mov [esi],dx
 .notranspfs
     add esi,2
-    loop .nextfs
+    dec ecx
+    jnz .nextfs
     pop esi
     pop ebx
 .donetransp
@@ -2991,7 +2998,8 @@ ProcessTransparencies:
     test dword[esi+4],eax
     jnz near .faddloopbh
     add esi,8
-    loop .faddl2h
+    dec ecx
+    jnz .faddl2h
     jmp .faddloopdoneh
 .prochalfadd
     test dword[esi+75036*2],eax
@@ -3016,7 +3024,8 @@ ProcessTransparencies:
     paddw mm0,mm1
     movq [esi],mm0
     add esi,8
-    loop .prochalfadd
+    dec ecx
+    jnz .prochalfadd
     jmp .faddloopdoneh
 .procfulladd
     mov ebx,[esi]
@@ -3168,7 +3177,8 @@ ProcessTransparencies:
     test dword[esi+4],eax
     jnz .fsubloopbh
     add esi,8
-    loop .fsubl2h
+    dec ecx
+    jnz .fsubl2h
     jmp .fsubloopdoneh
 .fsublooph
     test dword[esi],eax
@@ -3245,7 +3255,8 @@ ProcessTransparencies:
     test dword[esi+4],eax
     jnz .faddloopb
     add esi,8
-    loop .faddl2
+    dec ecx
+    jnz .faddl2
     jmp .faddloopdone
 .faddloop
     test dword[esi],eax
@@ -3306,7 +3317,8 @@ ProcessTransparencies:
     test dword[esi+4],eax
     jnz .fsubloopb
     add esi,8
-    loop .fsubl2
+    dec ecx
+    jnz .fsubl2
     jmp .fsubloopdone
 .fsubloop
     test dword[esi],eax
@@ -3565,7 +3577,8 @@ NEWSYM NewGfx16AsmEnd
 .loopclipfull
     %4
     add esi,4
-    loop .loopclipfull
+    dec ecx
+    jnz .loopclipfull
 .finclipping
     pop ebx
     pop esi