Optimized some stuff in the renderer.

src/GBA-arm.cpp

@@ -27,7 +27,6 @@
 #include "GBAcpu.h"
 #include "GBAinline.h"
 #include "Globals.h"
-#include "Gfx.h"
 #include "EEprom.h"
 #include "Flash.h"
 #include "Sound.h"

src/GBA-thumb.cpp

@@ -27,7 +27,6 @@
 #include "GBAcpu.h"
 #include "GBAinline.h"
 #include "Globals.h"
-#include "Gfx.h"
 #include "EEprom.h"
 #include "Flash.h"
 #include "Sound.h"

src/Gfx.h

@@ -159,7 +159,7 @@ static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
 
   if(mosaicOn) {
     if((VCOUNT % mosaicY) != 0) {
-      mosaicY = (VCOUNT / mosaicY) * mosaicY;
+      mosaicY = VCOUNT - (VCOUNT % mosaicY);
       yyy = (vofs + mosaicY) & maskY;
     }
   }
@@ -181,6 +181,9 @@ static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
       int tileX = (xxx & 7);
       int tileY = yyy & 7;
 
+      if(tileX == 7)
+        screenSource++;
+
       if(data & 0x0400)
         tileX = 7 - tileX;
       if(data & 0x0800)
@@ -190,11 +193,6 @@ static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
 
       line[x] = color ? (READ16LE(&palette[color]) | prio): 0x80000000;
 
-      if(data & 0x0400) {
-        if(tileX == 0)
-          screenSource++;
-      } else if(tileX == 7)
-        screenSource++;
       xxx++;
       if(xxx == 256) {
         if(sizeX > 256)
@@ -218,6 +216,9 @@ static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
       int tileX = (xxx & 7);
       int tileY = yyy & 7;
 
+      if(tileX == 7)
+        screenSource++;
+
       if(data & 0x0400)
         tileX = 7 - tileX;
       if(data & 0x0800)
@@ -231,14 +232,9 @@ static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
         color &= 0x0F;
       }
 
-      int pal = (READ16LE(screenSource)>>8) & 0xF0;
+      int pal = (data>>8) & 0xF0;
       line[x] = color ? (READ16LE(&palette[pal + color])|prio): 0x80000000;
 
-      if(data & 0x0400) {
-        if(tileX == 0)
-          screenSource++;
-      } else if(tileX == 7)
-        screenSource++;
       xxx++;
       if(xxx == 256) {
         if(sizeX > 256)
@@ -345,16 +341,28 @@ static inline void gfxDrawRotScreen(u16 control,
     realY -= y*dmy;
   }
 
+  if(control & 0x2000) {
+    for(int x = 0; x < 240; x++) {
+      int xxx = (realX >> 8) & maskX;
+      int yyy = (realY >> 8) & maskY;
+
+      int tile = screenBase[(xxx>>3) + ((yyy>>3)<<yshift)];
+
+      int tileX = (xxx & 7);
+      int tileY = yyy & 7;
+
+      u8 color = charBase[(tile<<6) + (tileY<<3) + tileX];
+
+      line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000;
+
+      realX += dx;
+      realY += dy;
+    }
+  } else {
+    for(int x = 0; x < 240; x++) {
       int xxx = (realX >> 8);
       int yyy = (realY >> 8);
 
-  if(control & 0x2000) {
-    xxx &= maskX;
-    yyy &= maskY;
-  }
-
-  if(control & 0x80) {
-    for(int x = 0; x < 240; x++) {
       if(xxx < 0 ||
          yyy < 0 ||
          xxx >= sizeX ||
@@ -372,42 +380,6 @@ static inline void gfxDrawRotScreen(u16 control,
       }
       realX += dx;
       realY += dy;
-
-      xxx = (realX >> 8);
-      yyy = (realY >> 8);
-
-      if(control & 0x2000) {
-        xxx &= maskX;
-        yyy &= maskY;
-      }
-    }
-  } else {
-    for(int x = 0; x < 240; x++) {
-      if(xxx < 0 ||
-         yyy < 0 ||
-         xxx >= sizeX ||
-         yyy >= sizeY) {
-        line[x] = 0x80000000;
-      } else {
-        int tile = screenBase[(xxx>>3) + ((yyy>>3)<<yshift)];
-
-        int tileX = (xxx & 7);
-        int tileY = yyy & 7;
-
-        u8 color = charBase[(tile<<6) + (tileY<<3) + tileX];
-
-        line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000;
-      }
-      realX += dx;
-      realY += dy;
-
-      xxx = (realX >> 8);
-      yyy = (realY >> 8);
-
-      if(control & 0x2000) {
-        xxx &= maskX;
-        yyy &= maskY;
-      }
     }
   }
 
@@ -583,7 +555,7 @@ static inline void gfxDrawRotScreen256(u16 control,
 
   if(control & 0x40) {
     int mosaicY = ((MOSAIC & 0xF0)>>4) + 1;
-    int y = (VCOUNT / mosaicY) * mosaicY;
+    int y = VCOUNT - (VCOUNT % mosaicY);
     realX = startX + y*dmx;
     realY = startY + y*dmy;
   }
@@ -684,7 +656,7 @@ static inline void gfxDrawRotScreen16Bit160(u16 control,
 
   if(control & 0x40) {
     int mosaicY = ((MOSAIC & 0xF0)>>4) + 1;
-    int y = (VCOUNT / mosaicY) * mosaicY;
+    int y = VCOUNT - (VCOUNT % mosaicY);
     realX = startX + y*dmx;
     realY = startY + y*dmy;
   }
@@ -1508,21 +1480,13 @@ static inline void gfxDrawOBJWin(u32 *lineOBJWin)
 
 static inline u32 gfxIncreaseBrightness(u32 color, int coeff)
 {
-  int r = (color & 0x1F);
+  color &= 0xffff;
-  int g = ((color >> 5) & 0x1F);
+  color = ((color << 16) | color) & 0x3E07C1F;
-  int b = ((color >> 10) & 0x1F);
 
-  r = r + (((31 - r) * coeff) >> 4);
+  color = color + (((0x3E07C1F - color) * coeff) >> 4);
-  g = g + (((31 - g) * coeff) >> 4);
+  color &= 0x3E07C1F;
-  b = b + (((31 - b) * coeff) >> 4);
+
-  if(r > 31)
+  return (color >> 16) | color;
-    r = 31;
-  if(g > 31)
-    g = 31;
-  if(b > 31)
-    b = 31;
-  color = (color & 0xFFFF0000) | (b << 10) | (g << 5) | r;
-  return color;
 }
 
 static inline void gfxIncreaseBrightness(u32 *line, int coeff)
@@ -1548,22 +1512,12 @@ static inline void gfxIncreaseBrightness(u32 *line, int coeff)
 
 static inline u32 gfxDecreaseBrightness(u32 color, int coeff)
 {
-  int r = (color & 0x1F);
+  color &= 0xffff;
-  int g = ((color >> 5) & 0x1F);
+  color = ((color << 16) | color) & 0x3E07C1F;
-  int b = ((color >> 10) & 0x1F);
 
-  r = r - ((r * coeff) >> 4);
+  color = color - (((color * coeff) >> 4) & 0x3E07C1F);
-  g = g - ((g * coeff) >> 4);
-  b = b - ((b * coeff) >> 4);
-  if(r < 0)
-    r = 0;
-  if(g < 0)
-    g = 0;
-  if(b < 0)
-    b = 0;
-  color = (color & 0xFFFF0000) | (b << 10) | (g << 5) | r;
 
-  return color;
+  return (color >> 16) | color;
 }
 
 static inline void gfxDecreaseBrightness(u32 *line, int coeff)
@@ -1590,25 +1544,25 @@ static inline void gfxDecreaseBrightness(u32 *line, int coeff)
 static inline u32 gfxAlphaBlend(u32 color, u32 color2, int ca, int cb)
 {
   if(color < 0x80000000) {
-    int r = (color & 0x1F);
+    color&=0xffff;
-    int g = ((color >> 5) & 0x1F);
+    color2&=0xffff;
-    int b = ((color >> 10) & 0x1F);
-    int r0 = (color2 & 0x1F);
-    int g0 = ((color2 >> 5) & 0x1F);
-    int b0 = ((color2 >> 10) & 0x1F);
 
-    r = ((r * ca) + (r0 * cb)) >> 4;
+    color = ((color << 16) | color) & 0x03E07C1F;
-    g = ((g * ca) + (g0 * cb)) >> 4;
+    color2 = ((color2 << 16) | color2) & 0x03E07C1F;
-    b = ((b * ca) + (b0 * cb)) >> 4;
+    color = ((color * ca) + (color2 * cb)) >> 4;
 
-    if(r > 31)
+    if ((ca + cb)>16)
-      r = 31;
+    {
-    if(g > 31)
+      if (color & 0x20)
-      g = 31;
+        color |= 0x1f;
-    if(b > 31)
+      if (color & 0x8000)
-      b = 31;
+        color |= 0x7C00;
+      if (color & 0x4000000)
+        color |= 0x03E00000;
+    }
 
-    return (color & 0xFFFF0000) | (b << 10) | (g << 5) | r;
+    color &= 0x03E07C1F;
+    color = (color >> 16) | color;
   }
   return color;
 }

src/Mode0.cpp

@@ -400,9 +400,49 @@ void mode0RenderLineAll()
       top = 0x10;
     }
 
+    if(color & 0x00010000) {
+      // semi-transparent OBJ
+      u32 back = backdrop;
+      u8 top2 = 0x20;
+
+      if((mask & 1) && ((u8)(line0[x]>>24) < (u8)(back >> 24))) {
+        back = line0[x];
+        top2 = 0x01;
+      }
+
+      if((mask & 2) && ((u8)(line1[x]>>24) < (u8)(back >> 24))) {
+        back = line1[x];
+        top2 = 0x02;
+      }
+
+      if((mask & 4) && ((u8)(line2[x]>>24) < (u8)(back >> 24))) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if((mask & 8) && ((u8)(line3[x]>>24) < (u8)(back >> 24))) {
+        back = line3[x];
+        top2 = 0x08;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
       // special FX on in the window
-    if(mask & 32) {
-      if(!(color & 0x00010000)) {
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -462,89 +502,6 @@ void mode0RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = backdrop;
-        u8 top2 = 0x20;
-
-        if((mask & 1) && ((u8)(line0[x]>>24) < (u8)(back >> 24))) {
-          back = line0[x];
-          top2 = 0x01;
-        }
-
-        if((mask & 2) && ((u8)(line1[x]>>24) < (u8)(back >> 24))) {
-          back = line1[x];
-          top2 = 0x02;
-        }
-
-        if((mask & 4) && ((u8)(line2[x]>>24) < (u8)(back >> 24))) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if((mask & 8) && ((u8)(line3[x]>>24) < (u8)(back >> 24))) {
-          back = line3[x];
-          top2 = 0x08;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-          coeff[COLEV & 0x1F],
-          coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = backdrop;
-      u8 top2 = 0x20;
-
-      if((mask & 1) && ((u8)(line0[x]>>24) < (u8)(back >> 24))) {
-        back = line0[x];
-        top2 = 0x01;
-      }
-
-      if((mask & 2) && ((u8)(line1[x]>>24) < (u8)(back >> 24))) {
-        back = line1[x];
-        top2 = 0x02;
-      }
-
-      if((mask & 4) && ((u8)(line2[x]>>24) < (u8)(back >> 24))) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if((mask & 8) && ((u8)(line3[x]>>24) < (u8)(back >> 24))) {
-        back = line3[x];
-        top2 = 0x08;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-        coeff[COLEV & 0x1F],
-        coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;

src/Mode1.cpp

@@ -376,9 +376,44 @@ void mode1RenderLineAll()
       top = 0x10;
     }
 
+    if(color & 0x00010000) {
+      // semi-transparent OBJ
+      u32 back = backdrop;
+      u8 top2 = 0x20;
+
+      if((mask & 1) && (u8)(line0[x]>>24) < (u8)(back >> 24)) {
+        back = line0[x];
+        top2 = 0x01;
+      }
+
+      if((mask & 2) && (u8)(line1[x]>>24) < (u8)(back >> 24)) {
+        back = line1[x];
+        top2 = 0x02;
+      }
+
+      if((mask & 4) && (u8)(line2[x]>>24) < (u8)(back >> 24)) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
       // special FX on the window
-    if(mask & 32) {
-      if(!(color & 0x00010000)) {
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -387,6 +422,7 @@ void mode1RenderLineAll()
           if(top & BLDMOD) {
             u32 back = backdrop;
             u8 top2 = 0x20;
+
             if((mask & 1) && (u8)(line0[x]>>24) < (u8)(back >> 24)) {
               if(top != 0x01) {
                 back = line0[x];
@@ -431,79 +467,6 @@ void mode1RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = backdrop;
-        u8 top2 = 0x20;
-
-        if((mask & 1) && (u8)(line0[x]>>24) < (u8)(back >> 24)) {
-          back = line0[x];
-          top2 = 0x01;
-        }
-
-        if((mask & 2) && (u8)(line1[x]>>24) < (u8)(back >> 24)) {
-          back = line1[x];
-          top2 = 0x02;
-        }
-
-        if((mask & 4) && (u8)(line2[x]>>24) < (u8)(back >> 24)) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-                                coeff[COLEV & 0x1F],
-                                coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = backdrop;
-      u8 top2 = 0x20;
-
-      if((mask & 1) && (u8)(line0[x]>>24) < (u8)(back >> 24)) {
-        back = line0[x];
-        top2 = 0x01;
-      }
-
-      if((mask & 2) && (u8)(line1[x]>>24) < (u8)(back >> 24)) {
-        back = line1[x];
-        top2 = 0x02;
-      }
-
-      if((mask & 4) && (u8)(line2[x]>>24) < (u8)(back >> 24)) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-                              coeff[COLEV & 0x1F],
-                              coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;

src/Mode2.cpp

@@ -357,8 +357,39 @@ void mode2RenderLineAll()
       top = 0x10;
     }
 
-    if(mask & 32) {
+    if(color & 0x00010000) {
-      if(!(color & 0x00010000)) {
+      // semi-transparent OBJ
+      u32 back = backdrop;
+      u8 top2 = 0x20;
+
+      if((mask & 4) && line2[x] < back) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if((mask & 8) && (u8)(line3[x]>>24) < (u8)(back >> 24)) {
+        back = line3[x];
+        top2 = 0x08;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
+      // special FX on the window
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -405,69 +436,6 @@ void mode2RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = backdrop;
-        u8 top2 = 0x20;
-
-        if((mask & 4) && line2[x] < back) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if((mask & 8) && (u8)(line3[x]>>24) < (u8)(back >> 24)) {
-          back = line3[x];
-          top2 = 0x08;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-          coeff[COLEV & 0x1F],
-          coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = backdrop;
-      u8 top2 = 0x20;
-
-      if((mask & 4) && line2[x] < back) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if((mask & 8) && (u8)(line3[x]>>24) < (u8)(back >> 24)) {
-        back = line3[x];
-        top2 = 0x08;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-        coeff[COLEV & 0x1F],
-        coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;

src/Mode3.cpp

@@ -301,8 +301,33 @@ void mode3RenderLineAll()
       top = 0x10;
     }
 
-    if(mask & 32) {
+    if(color & 0x00010000) {
-      if(!(color & 0x00010000)) {
+      // semi-transparent OBJ
+      u32 back = background;
+      u8 top2 = 0x20;
+
+      if((mask & 4) && line2[x] < back) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -343,59 +368,6 @@ void mode3RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = background;
-        u8 top2 = 0x20;
-
-        if((mask & 4) && line2[x] < back) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-                                coeff[COLEV & 0x1F],
-                                coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = background;
-      u8 top2 = 0x20;
-
-      if((mask & 4) && line2[x] < back) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-                              coeff[COLEV & 0x1F],
-                              coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;

src/Mode4.cpp

@@ -298,8 +298,33 @@ void mode4RenderLineAll()
       top = 0x10;
     }
 
-    if(mask & 32) {
+    if(color & 0x00010000) {
-      if(!(color & 0x00010000)) {
+      // semi-transparent OBJ
+      u32 back = backdrop;
+      u8 top2 = 0x20;
+
+      if((mask & 4) && line2[x] < back) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -340,59 +365,6 @@ void mode4RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = backdrop;
-        u8 top2 = 0x20;
-
-        if((mask & 4) && line2[x] < back) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-                                coeff[COLEV & 0x1F],
-                                coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = backdrop;
-      u8 top2 = 0x20;
-
-      if((mask & 4) && line2[x] < back) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-                              coeff[COLEV & 0x1F],
-                              coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;

src/Mode5.cpp

@@ -301,8 +301,33 @@ void mode5RenderLineAll()
       top = 0x10;
     }
 
-    if(mask & 32) {
+    if(color & 0x00010000) {
-      if(!(color & 0x00010000)) {
+      // semi-transparent OBJ
+      u32 back = background;
+      u8 top2 = 0x20;
+
+      if((mask & 4) && line2[x] < back) {
+        back = line2[x];
+        top2 = 0x04;
+      }
+
+      if(top2 & (BLDMOD>>8))
+        color = gfxAlphaBlend(color, back,
+                              coeff[COLEV & 0x1F],
+                              coeff[(COLEV >> 8) & 0x1F]);
+      else {
+        switch((BLDMOD >> 6) & 3) {
+        case 2:
+          if(BLDMOD & top)
+            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        case 3:
+          if(BLDMOD & top)
+            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
+          break;
+        }
+      }
+    } else if(mask & 32) {
       switch((BLDMOD >> 6) & 3) {
       case 0:
         break;
@@ -343,59 +368,6 @@ void mode5RenderLineAll()
           color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
         break;
       }
-      } else {
-        // semi-transparent OBJ
-        u32 back = background;
-        u8 top2 = 0x20;
-
-        if((mask & 4) && line2[x] < back) {
-          back = line2[x];
-          top2 = 0x04;
-        }
-
-        if(top2 & (BLDMOD>>8))
-          color = gfxAlphaBlend(color, back,
-                                coeff[COLEV & 0x1F],
-                                coeff[(COLEV >> 8) & 0x1F]);
-        else {
-          switch((BLDMOD >> 6) & 3) {
-          case 2:
-            if(BLDMOD & top)
-              color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          case 3:
-            if(BLDMOD & top)
-              color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-            break;
-          }
-        }
-      }
-    } else if(color & 0x00010000) {
-      // semi-transparent OBJ
-      u32 back = background;
-      u8 top2 = 0x20;
-
-      if((mask & 4) && line2[x] < back) {
-        back = line2[x];
-        top2 = 0x04;
-      }
-
-      if(top2 & (BLDMOD>>8))
-        color = gfxAlphaBlend(color, back,
-                              coeff[COLEV & 0x1F],
-                              coeff[(COLEV >> 8) & 0x1F]);
-      else {
-        switch((BLDMOD >> 6) & 3) {
-        case 2:
-          if(BLDMOD & top)
-            color = gfxIncreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        case 3:
-          if(BLDMOD & top)
-            color = gfxDecreaseBrightness(color, coeff[COLY & 0x1F]);
-          break;
-        }
-      }
     }
 
     lineMix[x] = color;