Version 3.8a with slight tweak to the sound core to help improve scra…

…tchy sounds.
wavemotion-dave · Jan 12, 2024 · 3c7d789 · 3c7d789
1 parent 109d182
commit 3c7d789
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/A8DS.nds b/A8DS.nds
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 #DEVKITPPC=/opt/devkitpro/devkitPPC
 #DEVKITPRO=/opt/devkitpro
 
-VERSION=3.8
+VERSION=3.8a
 
 #---------------------------------------------------------------------------------
 .SUFFIXES:

diff --git a/arm9/source/a8ds.c b/arm9/source/a8ds.c
@@ -70,7 +70,7 @@ bool bShowKeyboard = false;                 // set to true when the virtual keyb
 // These are the sound buffer vars which we use to pass along to the ARM7 core.
 // This buffer cannot be in .dtcm fast memory because the ARM7 core wouldn't see it.
 // ----------------------------------------------------------------------------------
-u8 sound_buffer[SNDLENGTH]  __attribute__((aligned (4))) = {0};
+u8 sound_buffer[32]         __attribute__((aligned (2))) = {0};
 u16* aptr                   __attribute__((section(".dtcm"))) = (u16*) ((u32)&sound_buffer[0] + 0xA000000); 
 u16* bptr                   __attribute__((section(".dtcm"))) = (u16*) ((u32)&sound_buffer[2] + 0xA000000);
 u16 sound_idx               __attribute__((section(".dtcm"))) = 0;
@@ -101,7 +101,7 @@ u8 bFirstLoad = true;
 // Useful to help debug the emulator - this goes out approximately once
 // per second. Caller just needs to stuff values into the debug[] array.
 // ---------------------------------------------------------------------------
-static void DumpDebugData(void)
+ITCM_CODE static void DumpDebugData(void)
 {
     if (DEBUG_DUMP)
     {
@@ -838,7 +838,7 @@ void dsLoadGame(char *filename, int disk_num, bool bRestart, bool bReadOnly)
       // In case we switched PAL/NTSC
       dsInstallSoundEmuFIFO();
 
-      TIMER2_DATA = TIMER_FREQ(SOUND_FREQ+5);   // Very slightly faster to ensure we always swallow all samples produced by the Pokey
+      TIMER2_DATA = TIMER_FREQ(SOUND_FREQ+10);   // Very slightly faster to ensure we always swallow all samples produced by the Pokey
       TIMER2_CR = TIMER_DIV_1 | TIMER_IRQ_REQ | TIMER_ENABLE;
       irqSet(IRQ_TIMER2, VsoundHandler);
 

diff --git a/arm9/source/emu/antic.c b/arm9/source/emu/antic.c
@@ -2133,8 +2133,8 @@ void ANTIC_UpdateArtifacting(void)
         return;
     }
 
-  draw_antic_table[0][2] = draw_antic_table[0][3] = draw_antic_2_artif;
-  draw_antic_table[0][0xf] = draw_antic_f_artif;
+    draw_antic_table[0][2] = draw_antic_table[0][3] = draw_antic_2_artif;
+    draw_antic_table[0][0xf] = draw_antic_f_artif;
 
     art_colours = (myConfig.artifacting <= 4 ? art_colour_table[myConfig.artifacting - 1] : art_colour_table[2]);
 

diff --git a/arm9/source/emu/pokeysnd.c b/arm9/source/emu/pokeysnd.c
@@ -97,8 +97,8 @@ uint32 Samp_n_cnt[2]    __attribute__ ((aligned (4)));     /* Sample cnt. */
 
 extern int sound_quality;
 /* Volume only emulations declarations */
-static uint32 snd_freq17 = FREQ_17_EXACT;
-int32 snd_playback_freq = 44100;
+static uint32 snd_freq17 = FREQ_17_APPROX;
+int32 snd_playback_freq = 22050;
 uint8 snd_num_pokeys = 1;
 static int snd_flags = 0;