V2.3 : 6-Jan-2021 by wavemotion-dave

* Fixed large cart support so 512kb games run fine. * Fixed voice in Frenzy/Berzerk. * Fixed graphical glitches in Alien Brigade. * Optmized bank switching so more big games run smoothly. * Added default difficulty switches for the few games that need them. * Lots of cleanups as time permitted.
wavemotion-dave · Jan 6, 2021 · effed71 · effed71
1 parent 9aacbc3
commit effed71
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 157 deletions.
diff --git a/A7800DS.nds b/A7800DS.nds
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.2
+VERSION=2.3
 TARGNAME=A7800DS
 
 #---------------------------------------------------------------------------------

diff --git a/arm9/gfx/pdev_bg0.png b/arm9/gfx/pdev_bg0.png
diff --git a/arm9/source/a7800utils.c b/arm9/source/a7800utils.c
@@ -41,10 +41,6 @@ int debug[MAX_DEBUG]={0};
 
 #define SOUND_FREQ  (31440/2)           // Be careful if you change this - this matches the frequency of the POKEY update and if we are TIA-only, we will double it.
 
-// Difficulty switches... 
-#define DIFF_A      0
-#define DIFF_B      1
-
 static unsigned char lastPokeySample    __attribute__((section(".dtcm"))) = 0;
 static unsigned char lastTiaSample      __attribute__((section(".dtcm"))) = 0;
 static unsigned char lastSample         __attribute__((section(".dtcm"))) = 0;
@@ -417,8 +413,8 @@ void dsLoadGame(char *filename)
 
     // Left difficulty switch defaults to DIFF_A
     // Right difficulty swtich defaults to DIFF_A
-    keyboard_data[15] = DIFF_A;
-    keyboard_data[16] = DIFF_A;
+    keyboard_data[15] = cartridge_diff1;
+    keyboard_data[16] = cartridge_diff2;
     GameConf.DS_Pad[ 0] = 3;   GameConf.DS_Pad[ 1] = 2;
     GameConf.DS_Pad[ 2] = 1;   GameConf.DS_Pad[ 3] = 0;
     GameConf.DS_Pad[ 4] = 4;   GameConf.DS_Pad[ 5] = 5;

diff --git a/arm9/source/emu/Cartridge.c b/arm9/source/emu/Cartridge.c
@@ -24,6 +24,7 @@
 // ----------------------------------------------------------------------------
 #include "Cartridge.h"
 #include "HighScore.h"
+#include "ProSystem.h"
 
 char cartridge_title[128];
 char cartridge_description[128];
@@ -43,6 +44,8 @@ int  cartridge_xOffset = 0;
 int  cartridge_yOffset = 22;
 int  cartridge_xScale  = 256;
 int  cartridge_yScale  = 220;
+uint cartridge_diff1 = DIFF_A;
+uint cartridge_diff2 = DIFF_A;
 
 extern int debug[];  
 static byte* cartridge_buffer = NULL;

diff --git a/arm9/source/emu/Cartridge.h b/arm9/source/emu/Cartridge.h
@@ -110,6 +110,9 @@ extern int  cartridge_xScale;
 extern int  cartridge_yScale;
 extern bool cartridge_steals_cycles;
 extern bool cartridge_uses_wsync;
+extern uint cartridge_diff1;
+extern uint cartridge_diff2;
+
 
 
 #endif
diff --git a/arm9/source/emu/Database.c b/arm9/source/emu/Database.c
diff --git a/arm9/source/emu/ProSystem.h b/arm9/source/emu/ProSystem.h
@@ -50,6 +50,10 @@ extern int debug[];
 // The number of cycles per scan line
 #define CYCLES_PER_SCANLINE 454
 
+// Difficulty switches... 
+#define DIFF_A      0
+#define DIFF_B      1
+
 extern void prosystem_Reset( );
 extern void prosystem_ExecuteFrame(const byte* input);
 extern void prosystem_Pause(bool pause);

diff --git a/readme.txt b/readme.txt
@@ -33,6 +33,14 @@ Philosophy :
 --------------------------------------------------------------------------------
 History :
 --------------------------------------------------------------------------------
+V2.3 : 6-Jan-2021 by wavemotion-dave
+  * Fixed large cart support so 512kb games run fine. 
+  * Fixed voice in Frenzy/Berzerk.
+  * Fixed graphical glitches in Alien Brigade.
+  * Optmized bank switching so more big games run smoothly.
+  * Added default difficulty switches for the few games that need them.
+  * Lots of cleanups as time permitted.
+
 V2.2 : 5-Jan-2021 by wavemotion-dave
   * More memory tweaks - faster processing of memory for another 5% speedup.