continuation of stuff

IodineGBA/core/Memory.js

@@ -2102,7 +2102,7 @@ GameBoyAdvanceMemory.prototype.writeOBJ16 = function (address, data) {
     data = data | 0;
     this.IOCore.updateGraphicsClocking();
     this.wait.OAMAccess();
-    this.gfxRenderer.writeOAM16(address & 0x3FE, data & 0xFFFF);
+    this.gfxRenderer.writeOAM16(address | 0, data | 0);
 }
 GameBoyAdvanceMemory.prototype.writePalette32 = function (address, data) {
     address = address | 0;
@@ -2123,7 +2123,7 @@ GameBoyAdvanceMemory.prototype.writeOBJ32 = function (address, data) {
     data = data | 0;
     this.IOCore.updateGraphicsClocking();
     this.wait.OAMAccess();
-    this.gfxRenderer.writeOAM32(address & 0x3FC, data | 0);
+    this.gfxRenderer.writeOAM32(address | 0, data | 0);
 }
 GameBoyAdvanceMemory.prototype.writeROM8 = function (address, data) {
     address = address | 0;

IodineGBA/core/graphics/OBJ.js

@@ -1,11 +1,11 @@
 "use strict";
 /*
  Copyright (C) 2012-2015 Grant Galitz
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 function GameBoyAdvanceOBJRenderer(gfx) {
@@ -293,7 +293,7 @@ GameBoyAdvanceOBJRenderer.prototype.computeCycles = function (cycles, matrix2D,
         cyclesToSubtract = cyclesToSubtract << 1;
         cyclesToSubtract = ((cyclesToSubtract | 0) + 10) | 0;
         cycles = ((cycles | 0) - (cyclesToSubtract | 0)) | 0;
-        
+
     }
     else {
         //Regular Scrolling:
@@ -896,7 +896,7 @@ if (__LITTLE_ENDIAN__) {
             default:
                 this.OBJMatrixParameters[address >> 2] = (data << 16) >> 16;
         }
-        this.OAMRAM16[address | 0] = data | 0;
+        this.OAMRAM16[address | 0] = data & 0xFFFF;
     }
     GameBoyAdvanceOBJRenderer.prototype.writeOAM32 = function (address, data) {
         address = address | 0;
@@ -930,17 +930,18 @@ if (__LITTLE_ENDIAN__) {
     }
     GameBoyAdvanceOBJRenderer.prototype.readOAM16 = function (address) {
         address = address | 0;
-        return this.OAMRAM16[(address >> 1) & 0x1FF] | 0;
+        return this.OAMRAM16[address & 0x1FF] | 0;
     }
     GameBoyAdvanceOBJRenderer.prototype.readOAM32 = function (address) {
         address = address | 0;
-        return this.OAMRAM32[(address >> 2) & 0xFF] | 0;
+        return this.OAMRAM32[address & 0xFF] | 0;
     }
 }
 else {
     GameBoyAdvanceOBJRenderer.prototype.writeOAM16 = function (address, data) {
         address = address | 0;
         data = data | 0;
+        address = address & 0x1FF;
         var OAMTable = this.OAMTable[address >> 2];
         switch (address & 0x3) {
                 //Attrib 0:
@@ -978,6 +979,7 @@ else {
     GameBoyAdvanceOBJRenderer.prototype.writeOAM32 = function (address, data) {
         address = address | 0;
         data = data | 0;
+        address = address & 0xFF;
         var OAMTable = this.OAMTable[address >> 1];
         if ((address & 0x1) == 0) {
             //Attrib 0:
@@ -1010,11 +1012,13 @@ else {
         this.OAMRAM[address | 3] = data >>> 24;
     }
     GameBoyAdvanceOBJRenderer.prototype.readOAM16 = function (address) {
-        address &= 0x3FE;
+        address &= 0x1FF;
+        address <<= 1;
         return this.OAMRAM[address] | (this.OAMRAM[address | 1] << 8);
     }
     GameBoyAdvanceOBJRenderer.prototype.readOAM32 = function (address) {
-        address &= 0x3FC;
+        address &= 0xFF;
+        address <<= 2;
         return this.OAMRAM[address] | (this.OAMRAM[address | 1] << 8) | (this.OAMRAM[address | 2] << 16)  | (this.OAMRAM[address | 3] << 24);
     }
-}
+}

IodineGBA/core/graphics/Renderer.js

@@ -1209,68 +1209,42 @@ GameBoyAdvanceGraphicsRenderer.prototype.writeBLDY8 = function (data) {
     this.colorEffectsRenderer.writeBLDY8(data | 0);
 }
 if (__LITTLE_ENDIAN__) {
-    if (typeof Math.imul == "function") {
-        //Math.imul found, insert the optimized path in:
-        GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM8 = function (address, data) {
-            address = address | 0;
-            data = data | 0;
-            if ((address & 0x10000) == 0 || ((address & 0x17FFF) < 0x14000 && (this.displayControl & 0x7) >= 3)) {
-                this.graphicsJIT();
-                address = address & (((address & 0x10000) >> 1) ^ address);
-                this.VRAM16[(address >> 1) & 0xFFFF] = Math.imul(data & 0xFF, 0x101) | 0;
-            }
-        }
-    }
-    else {
-        //Math.imul not found, use the compatibility method:
-        GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM8 = function (address, data) {
-            address = address | 0;
-            data = data | 0;
-            if ((address & 0x10000) == 0 || ((address & 0x17FFF) < 0x14000 && (this.displayControl & 0x7) >= 3)) {
-                this.graphicsJIT();
-                address = address & (((address & 0x10000) >> 1) ^ address);
-                this.VRAM16[(address >> 1) & 0xFFFF] = (data & 0xFF) * 0x101;
-            }
-        }
-    }
+    GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM8 =
     GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM16 = function (address, data) {
         address = address | 0;
         data = data | 0;
         this.graphicsJIT();
-        address = address & (((address & 0x10000) >> 1) ^ address);
-        this.VRAM16[(address >> 1) & 0xFFFF] = data & 0xFFFF;
+        this.VRAM16[address & 0xFFFF] = data & 0xFFFF;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM32 = function (address, data) {
         address = address | 0;
         data = data | 0;
         this.graphicsJIT();
-        address = address & (((address & 0x10000) >> 1) ^ address);
-        this.VRAM32[(address >> 2) & 0x7FFF] = data | 0;
+        this.VRAM32[address & 0x7FFF] = data | 0;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readVRAM16 = function (address) {
         address = address | 0;
-        address = address & (((address & 0x10000) >> 1) ^ address);
-        return this.VRAM16[(address >> 1) & 0xFFFF] | 0;
+        return this.VRAM16[address & 0xFFFF] | 0;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readVRAM32 = function (address) {
         address = address | 0;
-        address = address & (((address & 0x10000) >> 1) ^ address);
-        return this.VRAM32[(address >> 2) & 0x7FFF] | 0;
+        return this.VRAM32[address & 0x7FFF] | 0;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writePalette16 = function (address, data) {
         data = data | 0;
-        address = address >> 1;
+        address = address | 0;
         this.graphicsJIT();
-        this.paletteRAM16[address & 0x1FF] = data | 0;
+        this.paletteRAM16[address & 0x1FF] = data & 0xFFFF;
         data = data & 0x7FFF;
         this.writePalette256Color(address | 0, data | 0);
         this.writePalette16Color(address | 0, data | 0);
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writePalette32 = function (address, data) {
         data = data | 0;
-        address = address >> 1;
+        address = address | 0;
         this.graphicsJIT();
-        this.paletteRAM32[(address >> 1) & 0xFF] = data | 0;
+        this.paletteRAM32[address & 0xFF] = data | 0;
+        address = address << 1;
         var palette = data & 0x7FFF;
         this.writePalette256Color(address | 0, palette | 0);
         this.writePalette16Color(address | 0, palette | 0);
@@ -1280,46 +1254,44 @@ if (__LITTLE_ENDIAN__) {
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readPalette16 = function (address) {
         address = address | 0;
-        return this.paletteRAM16[(address >> 1) & 0x1FF] | 0;
+        return this.paletteRAM16[address & 0x1FF] | 0;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readPalette32 = function (address) {
         address = address | 0;
-        return this.paletteRAM32[(address >> 2) & 0xFF] | 0;
+        return this.paletteRAM32[address & 0xFF] | 0;
     }
 }
 else {
-    GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM8 = function (address, data) {
-        address &= 0x1FFFE & (((address & 0x10000) >> 1) ^ address);
-        if (address < 0x10000 || ((address & 0x17FFF) < 0x14000 && (this.displayControl & 0x7) >= 3)) {
-            this.graphicsJIT();
-            this.VRAM[address++] = data & 0xFF;
-            this.VRAM[address] = data & 0xFF;
-        }
-    }
+    GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM8 =
     GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM16 = function (address, data) {
-        address &= 0x1FFFE & (((address & 0x10000) >> 1) ^ address);
+        address <<= 1;
+        address &= 0x1FFFE;
         this.graphicsJIT();
         this.VRAM[address++] = data & 0xFF;
         this.VRAM[address] = (data >> 8) & 0xFF;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writeVRAM32 = function (address, data) {
-        address &= 0x1FFFC & (((address & 0x10000) >> 1) ^ address);
+        address <<= 2;
+        address &= 0x1FFFC;
         this.graphicsJIT();
         this.VRAM[address++] = data & 0xFF;
         this.VRAM[address++] = (data >> 8) & 0xFF;
         this.VRAM[address++] = (data >> 16) & 0xFF;
         this.VRAM[address] = data >>> 24;
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readVRAM16 = function (address) {
-        address &= 0x1FFFE & (((address & 0x10000) >> 1) ^ address);
+        address <<= 1;
+        address &= 0x1FFFE;
         return this.VRAM[address] | (this.VRAM[address + 1] << 8);
     }
     GameBoyAdvanceGraphicsRenderer.prototype.readVRAM32 = function (address) {
-        address &= 0x1FFFC & (((address & 0x10000) >> 1) ^ address);
+        address <<= 2;
+        address &= 0x1FFFC;
         return this.VRAM[address] | (this.VRAM[address + 1] << 8) | (this.VRAM[address + 2] << 16) | (this.VRAM[address + 3] << 24);
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writePalette16 = function (address, data) {
         this.graphicsJIT();
+        address <<= 1;
         this.paletteRAM[address] = data & 0xFF;
         this.paletteRAM[address | 1] = data >> 8;
         data &= 0x7FFF;
@@ -1329,6 +1301,7 @@ else {
     }
     GameBoyAdvanceGraphicsRenderer.prototype.writePalette32 = function (address, data) {
         this.graphicsJIT();
+        address <<= 2;
         this.paletteRAM[address] = data & 0xFF;
         this.paletteRAM[address | 1] = (data >> 8) & 0xFF;
         this.paletteRAM[address | 2] = (data >> 16) & 0xFF;
@@ -1353,20 +1326,19 @@ else {
 }
 GameBoyAdvanceGraphicsRenderer.prototype.readVRAM8 = function (address) {
     address = address | 0;
-    address = address & (((address & 0x10000) >> 1) ^ address);
     return this.VRAM[address & 0x1FFFF] | 0;
 }
 GameBoyAdvanceGraphicsRenderer.prototype.writeOAM16 = function (address, data) {
     address = address | 0;
     data = data | 0;
     this.graphicsJIT();
-    this.objRenderer.writeOAM16(address >> 1, data | 0);
+    this.objRenderer.writeOAM16(address & 0x1FF, data & 0xFFFF);
 }
 GameBoyAdvanceGraphicsRenderer.prototype.writeOAM32 = function (address, data) {
     address = address | 0;
     data = data | 0;
     this.graphicsJIT();
-    this.objRenderer.writeOAM32(address >> 2, data | 0);
+    this.objRenderer.writeOAM32(address & 0xFF, data | 0);
 }
 GameBoyAdvanceGraphicsRenderer.prototype.readOAM = function (address) {
     address = address | 0;

IodineGBA/core/graphics/RendererProxy.js

@@ -1145,42 +1145,65 @@ GameBoyAdvanceRendererProxy.prototype.writeBLDY8 = function (data) {
     this.IOCore.updateGraphicsClocking();
     this.renderer.writeBLDY8(data | 0);
 }
-GameBoyAdvanceRendererProxy.prototype.writeVRAM8 = function (address, data) {
-    address = address | 0;
-    data = data | 0;
-    //if ((address & 0x10000) == 0 || ((address & 0x17FFF) < 0x14000 && (this.IOData8[0] & 0x7) >= 3)) {
-        this.renderer.writeVRAM8(address | 0, data | 0);
-    //}
+if (typeof Math.imul == "function") {
+    //Math.imul found, insert the optimized path in:
+    GameBoyAdvanceRendererProxy.prototype.writeVRAM8 = function (address, data) {
+        address = address | 0;
+        data = data | 0;
+        if ((address & 0x10000) == 0 || ((address & 0x17FFF) < 0x14000 && (this.IOData8[0] & 0x7) >= 3)) {
+            address = address & (((address & 0x10000) >> 1) ^ address);
+            address = address >> 1;
+            data = Math.imul(data & 0xFF, 0x101) | 0;
+            this.renderer.writeVRAM8(address | 0, data | 0);
+        }
+    }
+}
+else {
+    //Math.imul not found, use the compatibility method:
+    GameBoyAdvanceRendererProxy.prototype.writeVRAM8 = function (address, data) {
+        address = address | 0;
+        data = data | 0;
+        if ((address & 0x10000) == 0 || ((address & 0x17FFF) < 0x14000 && (this.IOData8[0] & 0x7) >= 3)) {
+            address = address & (((address & 0x10000) >> 1) ^ address);
+            address = address >> 1;
+            data = (data & 0xFF) * 0x101;
+            this.renderer.writeVRAM8(address | 0, data | 0);
+        }
+    }
 }
 GameBoyAdvanceRendererProxy.prototype.writeVRAM16 = function (address, data) {
     address = address | 0;
     data = data | 0;
-    this.renderer.writeVRAM16(address | 0, data | 0);
+    address = address & (((address & 0x10000) >> 1) ^ address);
+    this.renderer.writeVRAM16(address >> 1, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.writeVRAM32 = function (address, data) {
     address = address | 0;
     data = data | 0;
-    this.renderer.writeVRAM32(address | 0, data | 0);
+    address = address & (((address & 0x10000) >> 1) ^ address);
+    this.renderer.writeVRAM32(address >> 2, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.readVRAM16 = function (address) {
     address = address | 0;
-    var data = this.renderer.readVRAM16(address | 0) | 0;
+    address = address & (((address & 0x10000) >> 1) ^ address);
+    var data = this.renderer.readVRAM16(address >> 1) | 0;
     return data | 0;
 }
 GameBoyAdvanceRendererProxy.prototype.readVRAM32 = function (address) {
     address = address | 0;
-    var data = this.renderer.readVRAM32(address | 0) | 0;
+    address = address & (((address & 0x10000) >> 1) ^ address);
+    var data = this.renderer.readVRAM32(address >> 2) | 0;
     return data | 0;
 }
 GameBoyAdvanceRendererProxy.prototype.writePalette16 = function (address, data) {
     data = data | 0;
     address = address | 0;
-    this.renderer.writePalette16(address | 0, data | 0);
+    this.renderer.writePalette16(address >> 1, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.writePalette32 = function (address, data) {
     data = data | 0;
     address = address | 0;
-    this.renderer.writePalette32(address | 0, data | 0);
+    this.renderer.writePalette32(address >> 2, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.readPalette16 = function (address) {
     address = address | 0;
@@ -1194,18 +1217,19 @@ GameBoyAdvanceRendererProxy.prototype.readPalette32 = function (address) {
 }
 GameBoyAdvanceRendererProxy.prototype.readVRAM8 = function (address) {
     address = address | 0;
+    address = address & (((address & 0x10000) >> 1) ^ address);
     var data = this.renderer.readVRAM8(address | 0) | 0;
     return data | 0;
 }
 GameBoyAdvanceRendererProxy.prototype.writeOAM16 = function (address, data) {
     address = address | 0;
     data = data | 0;
-    this.renderer.writeOAM16(address | 0, data | 0);
+    this.renderer.writeOAM16(address >> 1, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.writeOAM32 = function (address, data) {
     address = address | 0;
     data = data | 0;
-    this.renderer.writeOAM32(address | 0, data | 0);
+    this.renderer.writeOAM32(address >> 2, data | 0);
 }
 GameBoyAdvanceRendererProxy.prototype.readOAM = function (address) {
     address = address | 0;
@@ -1214,12 +1238,12 @@ GameBoyAdvanceRendererProxy.prototype.readOAM = function (address) {
 }
 GameBoyAdvanceRendererProxy.prototype.readOAM16 = function (address) {
     address = address | 0;
-    var data = this.renderer.readOAM16(address | 0) | 0;
+    var data = this.renderer.readOAM16(address >> 1) | 0;
     return data | 0;
 }
 GameBoyAdvanceRendererProxy.prototype.readOAM32 = function (address) {
     address = address | 0;
-    var data = this.renderer.readOAM32(address | 0) | 0;
+    var data = this.renderer.readOAM32(address >> 2) | 0;
     return data | 0;
 }
 GameBoyAdvanceRendererProxy.prototype.readPalette8 = function (address) {