DS: Port changes from 1.2.0 branch to trunk

svn-id: r54325

5 files changed, 19 insertions, 8 deletions

diff --git a/backends/platform/ds/arm9/dist/readme_ds.txt b/backends/platform/ds/arm9/dist/readme_ds.txt
index c4f1263452..ee1db719f4 100644
--- a/backends/platform/ds/arm9/dist/readme_ds.txt
+++ b/backends/platform/ds/arm9/dist/readme_ds.txt
@@ -41,6 +41,10 @@ Visit the main ScummVM website <http://www.scummvm.org>
       What's New?
       ------------------------------------------------------------------------
 
+ScummVM DS 1.2.0
+
+ * New game supported: Fascination
+
 ScummVM DS 1.1.1
 
  * Bugfix release: no new features
@@ -323,7 +327,7 @@ CANNOT DO THIS.
       ------------------------------------------------------------------------
 
 I'm glad you asked. Here is a list of the compatible games in version
-1.1.1. Demo versions of the games listed should work too.
+1.2.0. Demo versions of the games listed should work too.
 
 Flight of the Amazon Queen, Beneath a Steel Sky, and Lure of the
 Temptress have generously been released as freeware by the original
@@ -392,6 +396,8 @@ Gobliins 2                                D
 
 Goblins 3                                 D
 
+Fascination 				  D     This game is untested on the DS
+
 Ween: The Prophecy                        D
 
 Bargon Attack                             D
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index bf9fc1d826..781738265c 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -104,6 +104,10 @@ vpath %.s $(srcdir)
 # I actually had to use
 # ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' LDFLAGS='C:/Progra~1/devkitpro/libnds/lib/libnds9.a' --disable-shared --disable-debugging
 
+
+# handy command to find where the big symbols are in the ELF:
+# arm-eabi-nm -S --radix=d --demangle scummvm.elf |sort -n -r --key=2 |less
+
 ARM = 1
 USE_ARM_SOUND_ASM = 1
 USE_ARM_COSTUME_ASM = 1
@@ -241,7 +245,7 @@ ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
 
-DEFINES += -DREDUCE_MEMORY_USAGE
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU
 
 LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
 
@@ -345,7 +349,7 @@ MODULE_DIRS += .
 
 ndsall:
 	@[ -d $(BUILD) ] || mkdir -p $(BUILD)
-	make -C ./$(BUILD) -f ../makefile scummvm.nds scummvm.ds.gba
+	$(MAKE) -C ./$(BUILD) -f ../makefile scummvm.nds scummvm.ds.gba
 
 include $(srcdir)/Makefile.common
 
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 8820fc8b35..303e504873 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -2788,7 +2788,7 @@ bool getIndyFightState() {
 // Fast Ram
 ///////////////////
 
-#define FAST_RAM_SIZE (24000)
+#define FAST_RAM_SIZE (22500)
 #define ITCM_DATA	__attribute__((section(".itcm")))
 
 u8 *fastRamPointer;
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
index 07affd8839..7f0757ef53 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
@@ -194,7 +194,8 @@ const char lfn_offset_table[13]={0x01,0x03,0x05,0x07,0x09,0x0E,0x10,0x12,0x14,0x
 // available: IWRAM on NDS ARM7, EWRAM on NDS ARM9 and GBA
 
 // Files
-_VARS_IN_RAM FAT_FILE openFiles[MAX_FILES_OPEN];
+FAT_FILE openFiles[MAX_FILES_OPEN] __attribute__((section(".itcm")));
+//_VARS_IN_RAM
 
 // Long File names
 _VARS_IN_RAM char lfnName[MAX_FILENAME_LENGTH];
diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp
index 43a16486c5..a4fc2aed77 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.cpp
+++ b/backends/platform/ds/arm9/source/wordcompletion.cpp
@@ -30,11 +30,11 @@
 #ifdef ENABLE_AGI
 
 namespace DS {
-// Default dictionary is about 64Kb, so 128Kb should be enough for future expansion
-#define WORD_BUFFER_SIZE (128 * 1024)
+// Default dictionary is about 64Kb, so 96Kb should be enough for future expansion
+#define WORD_BUFFER_SIZE (96 * 1024)
 
 // Default dictionary has ~8000 words
-#define MAX_WORD_COUNT 16000
+#define MAX_WORD_COUNT 12000
 
 char wordBuffer[WORD_BUFFER_SIZE];
 int wordBufferPos = 0;