2.4 beta 11 implements non-returning INIT with Y=$80/$81

bbbradsmith · Mar 5, 2019 · c1c0993 · c1c0993
1 parent 49333d3
commit c1c0993
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/distribute/nsfplay.txt b/distribute/nsfplay.txt
@@ -160,7 +160,7 @@ loopcount - number of times to loop, 0 default
 Versions
 ========
 
-NSFPlay 2.4 beta 11 - ?
+NSFPlay 2.4 beta 11 - 3/04/2019
 - Fixed incorrect bytes per second in stereo WAV output.
 - Fixed NSFe track title display when using playlist.
 - Fixed crash issue with 1MB NSF files. (Bank counting was incorrect.)

diff --git a/xgm/devices/CPU/nes_cpu.cpp b/xgm/devices/CPU/nes_cpu.cpp
@@ -117,11 +117,11 @@ UINT32 NES_CPU::Exec (UINT32 clock)
 			if (extra_init)
 			{
 				enable_nmi = true;
-				run_from(init_addr);
 				extra_init = false;
 				context.A = song;
 				context.X = region;
-				context.Y = 1;
+				context.Y = 0x81;
+				run_from(init_addr);
 			}
 
 			if (enable_irq && !(context.P & K6502_I_FLAG) && context.iRequest)
@@ -313,7 +313,7 @@ void NES_CPU::Start (
 
 	context.A = song;
 	context.X = region;
-	context.Y = 0;
+	context.Y = extra_init ? 0x80 : 0;
 	context.P = 0x26; // VIZ
 
 	run_from (init_addr);

diff --git a/xgm/version.h b/xgm/version.h
@@ -1,5 +1,5 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-#define NSFPLAY_TITLE "NSFPlay 2.4 beta (unofficial)"
-#define NSFPLAY_VERSION "2.4 beta (unofficial)"
+#define NSFPLAY_TITLE "NSFPlay 2.4 beta 11"
+#define NSFPLAY_VERSION "2.4 beta 11"
 #endif