diff --git a/zsnes/src/video/newg162.mac b/zsnes/src/video/newg162.mac index f2cbb416..95b89efb 100644 --- a/zsnes/src/video/newg162.mac +++ b/zsnes/src/video/newg162.mac @@ -395,7 +395,7 @@ %%notflipypart add ecx,[yposng] %%yesflipypart - add ecx,[yposng] + test word[vrama+eax],4000h jnz near %%flipxpart push eax @@ -504,7 +504,6 @@ jmp %%next %endmacro - %macro drawlinengom16b 10 ; tile value : bit 15 = flipy, bit 14 = flipx, bit 13 = priority value ; bit 10-12 = palette, 0-9=tile# diff --git a/zsnes/src/video/newgfx.asm b/zsnes/src/video/newgfx.asm index 2c736078..ab756253 100644 --- a/zsnes/src/video/newgfx.asm +++ b/zsnes/src/video/newgfx.asm @@ -47,8 +47,6 @@ EXTSYM winlogicb EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr EXTSYM WindowRedraw -NEWSYM BGPT3B, times 256 dw 0 - NEWSYM NewGfxAsmStart %include "video/vidmacro.mac" diff --git a/zsnes/src/video/newgfx.mac b/zsnes/src/video/newgfx.mac index 11560b4e..4ace5852 100644 --- a/zsnes/src/video/newgfx.mac +++ b/zsnes/src/video/newgfx.mac @@ -2909,7 +2909,6 @@ EXTSYM drawmode7ngextbg,drawmode7ngextbg2 ;.offsetm4 mov edx,eax and edx,0FFFFFFC0h - mov word[BGPT3B+ebx*2],dx add edx,[vram] mov [ofsmcptr],edx and eax,3Fh diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm index 836a7b66..22007e5d 100644 --- a/zsnes/src/video/newgfx16.asm +++ b/zsnes/src/video/newgfx16.asm @@ -675,8 +675,11 @@ NEWSYM newengine16b mov bl,[bgmode] and bl,07h mov [BGMA+eax],bl + cmp bl,4 + je .changedmode4 cmp [BGMA+eax-1],bl je .nobgma +.changedmode4 mov byte[bgallchange+eax],1 .nobgma diff --git a/zsnes/src/video/newgfx16.mac b/zsnes/src/video/newgfx16.mac index ed421965..486d68e8 100644 --- a/zsnes/src/video/newgfx16.mac +++ b/zsnes/src/video/newgfx16.mac @@ -2832,8 +2832,8 @@ EXTSYM osm2dis je near .offsetm cmp byte[t16x161+ebx+%1*256],1 je near .tiles16x16 -; cmp byte[BGMA+ebx],4 -; je near .offsetm + cmp byte[BGMA+ebx],4 + je near .offsetm .nooffsetm mov eax,[BGPT1+ebx*2+%1*512] test ecx,100h @@ -3299,8 +3299,8 @@ EXTSYM osm2dis shr dx,5 add ax,dx .nooma - cmp byte[BGMA+ebx],4 - je .offsetm4 +; cmp byte[BGMA+ebx],4 +; je .offsetm4 add eax,40h .offsetm4 mov edx,eax @@ -3687,8 +3687,8 @@ EXTSYM osm2dis add ax,dx .nooma mov edx,eax - cmp byte[BGMA+ebx],4 - je .offsetm4 +; cmp byte[BGMA+ebx],4 +; je .offsetm4 add edx,40h .offsetm4 and edx,0FFC0h