aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds/arm9/source/blitters.cpp
diff options
context:
space:
mode:
authorNeil Millstone2007-04-06 18:34:53 +0000
committerNeil Millstone2007-04-06 18:34:53 +0000
commitc6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe (patch)
treed53d35422e0d3d700a48d4f1bca587eb1b7af79d /backends/platform/ds/arm9/source/blitters.cpp
parent40245fe4504ecc7cb26ccfc5b5c7d5d2b15cbbe7 (diff)
downloadscummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.tar.gz
scummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.tar.bz2
scummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.zip
Updating DS port for changes in main codebase. Code changes for DevkitArm r20 and latest libnds.
svn-id: r26394
Diffstat (limited to 'backends/platform/ds/arm9/source/blitters.cpp')
-rw-r--r--backends/platform/ds/arm9/source/blitters.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 105578e97a..7d1e0e4402 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
-
+
#include "stdafx.h"
#define CHARSET_MASK_TRANSPARENCY 253
@@ -298,8 +298,8 @@ static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const
void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride)
{
- u32* fastRam = (u32 *) (0x37F8000 + 16384);
-
+ u32 fastRam[768];
+
// Palette lookup -> 0_888
for(size_t i=0; i<256; ++i)
{